diff --git a/Gemfile.lock b/Gemfile.lock index fbb423d..cb29ca7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,6 +125,8 @@ GEM nio4r (2.5.8) nokogiri (1.13.9-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.9-x86_64-linux) + racc (~> 1.4) pg (1.4.4) pry (0.14.1) coderay (~> 1.1) @@ -210,6 +212,7 @@ GEM PLATFORMS arm64-darwin-21 + x86_64-linux DEPENDENCIES bootsnap diff --git a/app/javascript/react/src/components/Names.jsx b/app/javascript/react/src/components/Names.jsx index 04cc138..0d2e21c 100644 --- a/app/javascript/react/src/components/Names.jsx +++ b/app/javascript/react/src/components/Names.jsx @@ -70,7 +70,7 @@ const Names = () => { - + {pretty_name} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 95e089d..69a92d8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,12 +1,11 @@ - + <%= csrf_meta_tags %> <%= csp_meta_tag %> - <%= stylesheet_link_tag "application.tailwind", "data-turbo-track": "reload" %> <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %> diff --git a/bin/render-build.sh b/bin/render-build.sh index 00700a0..d248549 100755 --- a/bin/render-build.sh +++ b/bin/render-build.sh @@ -3,6 +3,8 @@ set -o errexit bundle install +yarn build +yarn build:css bundle exec rake assets:precompile bundle exec rake assets:clean bundle exec rake db:migrate diff --git a/config/environments/production.rb b/config/environments/production.rb index f0f92f3..8e37e6f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -18,7 +18,7 @@ # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). - # config.require_master_key = true + config.require_master_key = true # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. diff --git a/render.yaml b/render.yaml new file mode 100644 index 0000000..6685c7d --- /dev/null +++ b/render.yaml @@ -0,0 +1,19 @@ +databases: + - name: boca-chondor + databaseName: boca_chondor_production + user: scssquatch + +services: + - type: web + name: boca-chondor + env: ruby + plan: free + buildCommand: "./bin/render-build.sh" + startCommand: "bundle exec puma -C config/puma.rb" + envVars: + - key: DATABASE_URL + fromDatabase: + name: boca_chondor_production + property: connectionString + - key: RAILS_MASTER_KEY + sync: false