From 0df9330ee72c5d0f837641067a69f45efbe5190f Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Wed, 2 Nov 2022 17:47:28 -0400 Subject: [PATCH 1/9] hm --- render.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 render.yaml diff --git a/render.yaml b/render.yaml new file mode 100644 index 0000000..ebf9efc --- /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 + property: connectionString + - key: RAILS_MASTER_KEY + sync: false From b39ddc50426bd2bba2f0a2357ac2eee721549af3 Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Wed, 2 Nov 2022 18:00:30 -0400 Subject: [PATCH 2/9] fuck render --- bin/render-build.sh | 1 + render.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/render-build.sh b/bin/render-build.sh index 00700a0..63b469d 100755 --- a/bin/render-build.sh +++ b/bin/render-build.sh @@ -2,6 +2,7 @@ # exit on error set -o errexit +bundle lock --add-platform x86_64-linux bundle install bundle exec rake assets:precompile bundle exec rake assets:clean diff --git a/render.yaml b/render.yaml index ebf9efc..6685c7d 100644 --- a/render.yaml +++ b/render.yaml @@ -13,7 +13,7 @@ services: envVars: - key: DATABASE_URL fromDatabase: - name: boca-chondor + name: boca_chondor_production property: connectionString - key: RAILS_MASTER_KEY sync: false From 4a4060e152b7fad0254b42e60dddbba206dcab99 Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Wed, 2 Nov 2022 18:03:46 -0400 Subject: [PATCH 3/9] Fix bundle stuff --- Gemfile.lock | 3 +++ bin/render-build.sh | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) 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/bin/render-build.sh b/bin/render-build.sh index 63b469d..00700a0 100755 --- a/bin/render-build.sh +++ b/bin/render-build.sh @@ -2,7 +2,6 @@ # exit on error set -o errexit -bundle lock --add-platform x86_64-linux bundle install bundle exec rake assets:precompile bundle exec rake assets:clean From 718c6e73809b3cc7e48505c1e840c5c094f7fbab Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Wed, 2 Nov 2022 18:08:22 -0400 Subject: [PATCH 4/9] require secret --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From 9504d5d37d6478c8fc5b864e503835fe08c8a521 Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Wed, 2 Nov 2022 18:45:01 -0400 Subject: [PATCH 5/9] build js/css --- bin/render-build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/render-build.sh b/bin/render-build.sh index 00700a0..0982ddf 100755 --- a/bin/render-build.sh +++ b/bin/render-build.sh @@ -6,3 +6,5 @@ bundle install bundle exec rake assets:precompile bundle exec rake assets:clean bundle exec rake db:migrate +yarn build +yarn build:css From 94266cc78c8071a7e5d448e2fe7cb4eaf24b6605 Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Wed, 2 Nov 2022 21:58:27 -0400 Subject: [PATCH 6/9] idk remove tailwind --- app/views/layouts/application.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 95e089d..06dafc1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,7 +6,6 @@ <%= 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 %> From 8723ef739d00e354d4b87ef72a4695b7b70e8cbf Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Wed, 2 Nov 2022 21:59:24 -0400 Subject: [PATCH 7/9] margin --- app/javascript/react/src/components/Names.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} From c53c9d1889f0c48b8c16a2143f36c3e756218d16 Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Wed, 2 Nov 2022 22:02:26 -0400 Subject: [PATCH 8/9] title --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 06dafc1..69a92d8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - + <%= csrf_meta_tags %> <%= csp_meta_tag %> From e06fb479f81e58daec4cc1ad3bb939f6a10747ed Mon Sep 17 00:00:00 2001 From: Aaron Baker Date: Thu, 3 Nov 2022 12:08:44 -0400 Subject: [PATCH 9/9] cmon tars --- bin/render-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/render-build.sh b/bin/render-build.sh index 0982ddf..d248549 100755 --- a/bin/render-build.sh +++ b/bin/render-build.sh @@ -3,8 +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 -yarn build -yarn build:css