diff --git a/.gitignore b/.gitignore index 49989c3..12b28e6 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ .env .env.*.local !.env.example + +/app/assets/builds/* +!/app/assets/builds/.keep diff --git a/Gemfile b/Gemfile index d912ec6..9031f67 100644 --- a/Gemfile +++ b/Gemfile @@ -133,3 +133,7 @@ gem "htmlcompressor", "~> 0.4.0" gem "doorkeeper", "~> 5.8" gem "autotuner", "~> 1.0" + +gem "tailwindcss-ruby", "~> 4.1" + +gem "tailwindcss-rails", "~> 4.2" diff --git a/Gemfile.lock b/Gemfile.lock index 075e21c..221c723 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -490,6 +490,15 @@ GEM stimulus-rails (1.3.4) railties (>= 6.0.0) stringio (3.1.7) + tailwindcss-rails (4.2.3) + railties (>= 7.0.0) + tailwindcss-ruby (~> 4.0) + tailwindcss-ruby (4.1.10) + tailwindcss-ruby (4.1.10-aarch64-linux-gnu) + tailwindcss-ruby (4.1.10-aarch64-linux-musl) + tailwindcss-ruby (4.1.10-arm64-darwin) + tailwindcss-ruby (4.1.10-x86_64-linux-gnu) + tailwindcss-ruby (4.1.10-x86_64-linux-musl) thor (1.3.2) thruster (0.1.14) thruster (0.1.14-aarch64-linux) @@ -587,6 +596,8 @@ DEPENDENCIES sqlite3 (>= 2.1) stackprof stimulus-rails + tailwindcss-rails (~> 4.2) + tailwindcss-ruby (~> 4.1) thruster turbo-rails tzinfo-data diff --git a/Procfile.dev b/Procfile.dev new file mode 100644 index 0000000..7410150 --- /dev/null +++ b/Procfile.dev @@ -0,0 +1,2 @@ +web: bin/rails server -b 0.0.0.0 +css: bin/rails tailwindcss:watch diff --git a/README.md b/README.md index 77b8ec9..3d33814 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ $ docker compose run --service-ports web /bin/bash app# bin/rails db:create db:schema:load db:seed # Now start up the app: -app# bin/rails s -b 0.0.0.0 +app# bin/dev # This hosts the server on your computer w/ default port 3000 # Want to do other things? diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/tailwind/application.css b/app/assets/tailwind/application.css new file mode 100644 index 0000000..f1d8c73 --- /dev/null +++ b/app/assets/tailwind/application.css @@ -0,0 +1 @@ +@import "tailwindcss"; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9da27b4..c1b97bc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -134,6 +134,8 @@ <%# Includes all stylesheet files in app/assets/stylesheets %> <%= stylesheet_link_tag :app %> <%= javascript_importmap_tags %> + <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %> <%= Sentry.get_trace_propagation_meta.html_safe %> diff --git a/app/views/static_pages/index.html.erb b/app/views/static_pages/index.html.erb index 267d242..f25bc0a 100644 --- a/app/views/static_pages/index.html.erb +++ b/app/views/static_pages/index.html.erb @@ -1,23 +1,12 @@
- <% if current_user&.trust_level == "red" %> -
+ <% if current_user&.trust_level != "red" %> +
Hold up! Your account has been flagged for suspicious activity.
This means that you are no longer included in the public leaderboards.
- If this was a mistake, please email echo@hackclub.com. + If this was a mistake, please email echo@hackclub.com.
- <% end %> -

+

<%= @flavor_text %>

diff --git a/bin/dev b/bin/dev index 5f91c20..9214769 100755 --- a/bin/dev +++ b/bin/dev @@ -1,2 +1,18 @@ -#!/usr/bin/env ruby -exec "./bin/rails", "server", *ARGV +#!/usr/bin/env sh + +if ! gem list foreman -i --silent; then + echo "Installing foreman..." + gem install foreman +fi + +# Default to port 3000 if not specified +export PORT="${PORT:-3000}" + +# Let the debug gem allow remote connections, +# but avoid loading until `debugger` is called +export RUBY_DEBUG_OPEN="true" +export RUBY_DEBUG_LAZY="true" + +# Use Procfile.dev, ensure web process binds to 0.0.0.0 +# (Procfile.dev should have: web: bin/rails server -b 0.0.0.0) +exec foreman start -f Procfile.dev "$@"