Skip to content

Commit

Permalink
Fix paginazione, pgreset in dev, fix finali all'ambiente di dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ferdi2005 committed Nov 1, 2018
1 parent 2a98ff4 commit c04f763
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 8 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ gem 'bootsnap', '>= 1.1.0', require: false
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'pgreset'
end

group :development do
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ GEM
mini_portile2 (~> 2.3.0)
pagy (0.21.0)
pg (1.1.3)
pgreset (0.1.1)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
Expand Down Expand Up @@ -215,6 +216,7 @@ DEPENDENCIES
nokogiri (~> 1.8.5)
pagy
pg
pgreset
puma (~> 3.11)
rails (~> 5.2.1)
sass-rails (~> 5.0)
Expand Down
2 changes: 1 addition & 1 deletion app/views/libri/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@
</table>
<% end %>
<%== pagy_nav_responsive_bulma(@pagy) %>
<%== pagy_nav_responsive_bulma(@pagy) if @pagy.pages > 1 %>
75 changes: 68 additions & 7 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# PostgreSQL. Versions 9.1 and up are supported.
#
# Install the pg driver:
# gem install pg
# On OS X with Homebrew:
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
# On OS X with MacPorts:
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
# On Windows:
# gem install pg
# Choose the win32 build.
# Install PostgreSQL and put its /bin directory on your path.
#
# Configure Using Gemfile
# gem 'pg'
#
default: &default
adapter: postgresql
encoding: unicode
Expand All @@ -6,19 +22,64 @@ default: &default
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

development:
adapter: postgresql
encoding: unicode
database: biblio
username: mait
password: <%= ENV.fetch("DB_PASSWORD_DEV") { } %>
<<: *default
database: biblioteca_development

# The specified database role being used to connect to postgres.
# To create additional roles in postgres see `$ createuser --help`.
# When left blank, postgres will use the default role. This is
# the same name as the operating system user that initialized the database.
#username: biblioteca

# The password associated with the postgres role (username).
#password:

# Connect on a TCP socket. Omitted by default since the client uses a
# domain socket that doesn't need configuration. Windows does not have
# domain sockets, so uncomment these lines.
#host: localhost

# The TCP port the server listens on. Defaults to 5432.
# If your server runs on a different port number, change accordingly.
#port: 5432

# Schema search path. The server defaults to $user,public
#schema_search_path: myapp,sharedapp,public

# Minimum log levels, in increasing order:
# debug5, debug4, debug3, debug2, debug1,
# log, notice, warning, error, fatal, and panic
# Defaults to warning.
#min_messages: notice

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
database: db/test.sqlite3
database: biblioteca_test

# As with config/secrets.yml, you never want to store sensitive information,
# like your database password, in your source code. If your source code is
# ever seen by anyone, they now have access to your database.
#
# Instead, provide the password as a unix environment variable when you boot
# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
# for a full rundown on how to provide these environment variables in a
# production deployment.
#
# On Heroku and other platform providers, you may have a full connection URL
# available as an environment variable. For example:
#
# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
#
# You can use this database configuration with:
#
# production:
# url: <%= ENV['DATABASE_URL'] %>
#
production:
<<: *default
database: db/production.sqlite3
database: biblioteca_production
username: biblioteca
password: <%= ENV['BIBLIOTECA_DATABASE_PASSWORD'] %>

0 comments on commit c04f763

Please sign in to comment.