Default setup, fix assets

sayhiben · sayhiben · commit 79df635ad880 · 2025-07-08T19:20:55.000-07:00
diff --git a/Dockerfile b/Dockerfile
@@ -46,6 +46,15 @@ RUN if [ -f "package.json" ]; then \
       yarn install; \
     fi
 
+# Build assets (CSS and JavaScript)
+RUN if [ -f "package.json" ]; then \
+      yarn build:css && \
+      yarn build; \
+    fi
+
+# Precompile assets with Propshaft
+RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
+
 # Precompile bootsnap code for faster boot times
 RUN bundle exec bootsnap precompile app/ lib/
 
diff --git a/Gemfile b/Gemfile
@@ -29,6 +29,9 @@ gem "cssbundling-rails"
 # Bundle and transpile JavaScript
 gem "jsbundling-rails"
 
+# Asset pipeline
+gem "propshaft"
+
 # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
 # gem "kredis"
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -236,6 +236,11 @@ GEM
       prettyprint
     prettyprint (0.2.0)
     prism (1.4.0)
+    propshaft (1.1.0)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+      railties (>= 7.0.0)
     psych (5.2.6)
       date
       stringio
@@ -445,6 +450,7 @@ DEPENDENCIES
   lograge (~> 0.14)
   pagy (~> 6.2)
   pg (~> 1.1)
+  propshaft
   puma (>= 5.0)
   pundit (~> 2.3)
   rack-attack (~> 6.7)
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -0,0 +1 @@
+//= link_tree ../builds
diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb
@@ -1,6 +1,7 @@
 module Admin
-  class SessionsController < ApplicationController
-    protect_from_forgery with: :exception
+  class SessionsController < Admin::BaseController
+    skip_before_action :authenticate_admin!, only: [:new, :create]
+    skip_before_action :check_maintenance_mode, only: [:new, :create]
     layout "admin_login"
 
     def new
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -7,8 +7,8 @@
     <%= csp_meta_tag %>
     <%= action_cable_meta_tag %>
 
-    <%= stylesheet_link_tag "/assets/application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "/assets/application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
   </head>
 
   <body class="bg-gray-50" data-controller="mobile-menu">
diff --git a/app/views/layouts/admin_login.html.erb b/app/views/layouts/admin_login.html.erb
@@ -6,8 +6,8 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     
-    <%= stylesheet_link_tag "/assets/application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "/assets/application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
   </head>
 
   <body class="bg-gray-50">
diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
@@ -2,7 +2,23 @@
 
 # If running the rails server then create or migrate existing database
 if [ "${1}" == "./bin/rails" ] && [ "${2}" == "server" ]; then
-  bundle exec rails db:prepare
+  echo "Setting up database..."
+  
+  # First ensure database exists
+  bundle exec rails db:create 2>/dev/null || true
+  
+  # Check if schema has been loaded (by checking if any tables exist)
+  if bundle exec rails runner "exit ActiveRecord::Base.connection.tables.empty? ? 1 : 0" 2>/dev/null; then
+    # Tables exist, just migrate
+    echo "Database already initialized, running migrations..."
+    bundle exec rails db:migrate
+  else
+    # No tables, need to load schema
+    echo "Loading database schema..."
+    bundle exec rails db:schema:load
+    echo "Seeding database..."
+    bundle exec rails db:seed
+  fi
 fi
 
 # If running rspec, automatically set RAILS_ENV=test
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = "1.0"
+
+# Configure propshaft to use the correct asset path
+Rails.application.config.assets.prefix = '/assets'
+
+# Since we're using jsbundling-rails and cssbundling-rails,
+# we need to ensure the asset helpers use the correct paths
+if Rails.env.development? || Rails.env.test?
+  # In development, assets are served directly from the builds directory
+  Rails.application.config.assets.debug = true
+end
diff --git a/db/migrate/20250617000001_add_location_to_streams.rb b/db/migrate/20250617000001_add_location_to_streams.rb
