still working to deploy

ThomasConnolly · Nov 27, 2023 · bcb343b · bcb343b
1 parent 2c010d6
commit bcb343b
Show file tree

Hide file tree

Showing 19 changed files with 447 additions and 115 deletions.
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.19.7-f4cf76f770-8.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.19.7-f4cf76f770-8.zip
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.19.8-231d24e5e4-8.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.19.8-231d24e5e4-8.zip
diff --git a/.yarn/cache/esbuild-npm-0.19.7-b3b0b2fa14-a5d979224d.zip b/.yarn/cache/esbuild-npm-0.19.7-b3b0b2fa14-a5d979224d.zip
diff --git a/.yarn/cache/esbuild-npm-0.19.8-209f9c6f87-1dff99482e.zip b/.yarn/cache/esbuild-npm-0.19.8-209f9c6f87-1dff99482e.zip
diff --git a/Procfile.dev b/Procfile.dev
@@ -1,2 +1,3 @@
 web: bundle exec puma -C config/puma.rb
-
+css: yarn build:css --watch
+js: yarn build --watch
diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,6 +1,3 @@
 //= link_tree ../images
 //= link_tree ../builds
-//= link application.css
-//= link actiontext.css
-//= link application.js
-//= link_directory ../stylesheets .css
+
diff --git a/app/javascript/application.js b/app/javascript/application.js
@@ -1,3 +1,5 @@
 // Entry point for the build script in your package.json
-import "bootstrap";
-import { Application } from "./application";
+import "@hotwired/turbo-rails"
+//import "./controllers"
+import * as bootstrap from "bootstrap"
+
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
@@ -0,0 +1 @@
+import { application } from "./application"
diff --git a/app/models/agenda.rb b/app/models/agenda.rb
@@ -12,15 +12,10 @@
 #  draft        :boolean
 #
 class Agenda < ApplicationRecord
-  has_many :agenda_items, inverse_of: :agenda, -> { order(position: :asc) },dependent: :destroy
+  has_many :agenda_items, inverse_of: :agenda, dependent: :destroy
   accepts_nested_attributes_for :agenda_items, allow_destroy: true,
                                                reject_if: :all_blank
   belongs_to :user
   validates :meeting_date, presence: true
   validates :draft, inclusion: { in: [true, false] }
-
-  # def agenda_items_attributes=(attributes)
-  #   agenda_items.build(attributes) if attributes['title'].present?
-  #   super
-  # end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -11,10 +11,7 @@
   <%= csp_meta_tag %>
   <script src="https://js.stripe.com/v3/"></script>
   <%= stylesheet_link_tag "application.css", "data-turbo-track": "reload" %>
-  <%= stylesheet_link_tag "actiontext", "data-turbo-track": "reload"  %>
   <%= javascript_include_tag "application", type: "module", "data-turbo-track": "reload", defer: true %>
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
 </head>
 
 <body class="<%= controller_name %>  <%= action_name %>">

diff --git a/bin/dev b/bin/dev
@@ -5,4 +5,7 @@ if ! gem list foreman -i --silent; then
   gem install foreman
 fi
 
+# Default to port 3000 if not specified
+export PORT="${PORT:-3000}"
+
 exec foreman start -f Procfile.dev "$@"
diff --git a/config/application.rb b/config/application.rb
@@ -15,7 +15,7 @@ class Application < Rails::Application
     config.assets.configure do |env|
       env.export_concurrent = false
     end
-    Rails.application.config.default_url_options = { host: "localhost", port: 5000 }
+    Rails.application.config.default_url_options = { host: "localhost", port: 3000 }
     # Rails.application.default_url_options = { host: "localhost", port: 5000 }
     # Configuration for the application, engines, and railties goes here.
     # config/application.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -32,7 +32,7 @@
   config.sass.inline_source_maps = true 
 
   ####
-  Rails.application.config.default_url_options = { host: 'localhost', port: 5000 }
+  Rails.application.config.default_url_options = { host: 'localhost', port: 3000 }
   Rails.application.default_url_options = { host: 'localhost', port: 5000 }
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -6,7 +6,7 @@
 Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path
-
+Rails.application.config.assets.paths << Rails.root.join('node_modules/bootstrap-icons/font')
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.

diff --git a/config/puma.rb b/config/puma.rb
@@ -17,7 +17,7 @@
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port ENV.fetch('PORT', 5000)
+port ENV.fetch('PORT', 3000)
 
 # Specifies the `environment` that Puma will run in.
 #

diff --git a/log/development.log b/log/development.log
diff --git a/package.json b/package.json
@@ -12,10 +12,10 @@
     "@hotwired/turbo-rails": "^8.0.0-beta.1",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.2",
-    "esbuild": "^0.19.7"
+    "esbuild": "^0.19.8"
   },
   "scripts": {
     "build:css": "sass app/javascript/stylesheets/application.scss app/assets/builds/application.css --no-source-map --load-path=node_modules",
-    "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds"
+    "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=/assets"
   }
 }