From cb7b1b845303e94d98357057f378beb09fa69fe3 Mon Sep 17 00:00:00 2001 From: Yanick Minder Date: Tue, 30 Jan 2024 16:14:01 +0100 Subject: [PATCH 1/3] install cssbundeling --- .gitignore | 3 +++ Gemfile | 4 ++++ Gemfile.lock | 8 ++++++++ Procfile.dev | 2 ++ app/assets/builds/.keep | 0 app/assets/stylesheets/application.bootstrap.scss | 2 ++ bin/dev | 11 +++++++++++ package.json | 14 ++++++++++++++ 8 files changed, 44 insertions(+) create mode 100644 Procfile.dev create mode 100644 app/assets/builds/.keep create mode 100644 app/assets/stylesheets/application.bootstrap.scss create mode 100755 bin/dev create mode 100644 package.json diff --git a/.gitignore b/.gitignore index 45f3d58b3..bfa6e8e28 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,6 @@ config/docker/development/home/rails/.local config/docker/development/home/rails/.yarnrc config/docker/development/home/rails/.irb_history config/docker/development/home/rails/.bash_history + +/app/assets/builds/* +!/app/assets/builds/.keep diff --git a/Gemfile b/Gemfile index 74c33daba..9b85ee245 100644 --- a/Gemfile +++ b/Gemfile @@ -66,3 +66,7 @@ group :test do end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] + + + +gem "cssbundling-rails", "~> 1.4" diff --git a/Gemfile.lock b/Gemfile.lock index 558e4dec7..cb1472d5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -111,6 +111,8 @@ GEM sixarm_ruby_unaccent (~> 1.1) unicode_utils (~> 1.4) crass (1.0.6) + cssbundling-rails (1.4.0) + railties (>= 6.0.0) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) database_cleaner-active_record (2.0.0) @@ -210,6 +212,7 @@ GEM rake mini_magick (4.11.0) mini_mime (1.1.5) + mini_portile2 (2.8.5) minitest (5.20.0) msgpack (1.6.0) multipart-post (2.1.1) @@ -225,6 +228,9 @@ GEM net-protocol netrc (0.11.0) nio4r (2.7.0) + nokogiri (1.14.3) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) nokogiri (1.14.3-x86_64-linux) racc (~> 1.4) odf-report (0.7.3) @@ -372,6 +378,7 @@ GEM zeitwerk (2.6.7) PLATFORMS + ruby x86_64-linux DEPENDENCIES @@ -386,6 +393,7 @@ DEPENDENCIES carrierwave config countries + cssbundling-rails (~> 1.4) database_cleaner faker i18n_data diff --git a/Procfile.dev b/Procfile.dev new file mode 100644 index 000000000..34c16939a --- /dev/null +++ b/Procfile.dev @@ -0,0 +1,2 @@ +web: env RUBY_DEBUG_OPEN=true bin/rails server +css: yarn build:css --watch diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/stylesheets/application.bootstrap.scss b/app/assets/stylesheets/application.bootstrap.scss new file mode 100644 index 000000000..b61b612b7 --- /dev/null +++ b/app/assets/stylesheets/application.bootstrap.scss @@ -0,0 +1,2 @@ +@import 'bootstrap/scss/bootstrap'; +@import 'bootstrap-icons/font/bootstrap-icons'; diff --git a/bin/dev b/bin/dev new file mode 100755 index 000000000..eda330c72 --- /dev/null +++ b/bin/dev @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +if gem list --no-installed --exact --silent foreman; then + echo "Installing foreman..." + gem install foreman +fi + +# Default to port 3000 if not specified +export PORT="${PORT:-3000}" + +exec foreman start -f Procfile.dev "$@" diff --git a/package.json b/package.json new file mode 100644 index 000000000..67aeb762d --- /dev/null +++ b/package.json @@ -0,0 +1,14 @@ +{ + "name": "app", + "private": "true", + "dependencies": { + "@popperjs/core": "^2.11.8", + "autoprefixer": "^10.4.17", + "bootstrap": "^5.3.2", + "bootstrap-icons": "^1.11.3", + "nodemon": "^3.0.3", + "postcss": "^8.4.33", + "postcss-cli": "^11.0.0", + "sass": "^1.70.0" + } +} From 1b2a06e652e1789a92ffb219872049700f7cd1fd Mon Sep 17 00:00:00 2001 From: Yanick Minder Date: Thu, 1 Feb 2024 08:52:52 +0100 Subject: [PATCH 2/3] rearrange dependencies --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9b85ee245..f6eefb895 100644 --- a/Gemfile +++ b/Gemfile @@ -34,6 +34,7 @@ gem 'rails-i18n' gem 'rest-client' gem 'seed-fu' gem 'sentry-raven' +gem "cssbundling-rails", "~> 1.4" group :metrics do gem 'brakeman' @@ -69,4 +70,3 @@ gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] -gem "cssbundling-rails", "~> 1.4" From 81dd29692d609fe37ec5c6af91e5343a1facad31 Mon Sep 17 00:00:00 2001 From: Yanick Minder Date: Thu, 1 Feb 2024 09:34:03 +0100 Subject: [PATCH 3/3] install stuff --- Gemfile | 4 +++- Gemfile.lock | 3 +++ package.json | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f6eefb895..ff071ce75 100644 --- a/Gemfile +++ b/Gemfile @@ -12,9 +12,11 @@ gem 'bootsnap' gem 'carrierwave' gem 'config' gem 'countries' +gem 'cssbundling-rails', '~> 1.4' gem 'database_cleaner' gem 'faker' gem 'i18n_data' +gem 'jsbundling-rails', '~> 1.3' gem 'keycloak-api-rails' gem 'language_list' gem 'mimemagic', '~> 0.3.6' @@ -34,7 +36,6 @@ gem 'rails-i18n' gem 'rest-client' gem 'seed-fu' gem 'sentry-raven' -gem "cssbundling-rails", "~> 1.4" group :metrics do gem 'brakeman' @@ -70,3 +71,4 @@ gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] + diff --git a/Gemfile.lock b/Gemfile.lock index cb1472d5e..19f823de8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,6 +180,8 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) + jsbundling-rails (1.3.0) + railties (>= 6.0.0) json (2.6.3) json-jwt (1.15.3) activesupport (>= 4.2) @@ -397,6 +399,7 @@ DEPENDENCIES database_cleaner faker i18n_data + jsbundling-rails (~> 1.3) keycloak-api-rails language_list listen (~> 3.0.5) diff --git a/package.json b/package.json index 67aeb762d..ea18cdbf8 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,8 @@ "name": "app", "private": "true", "dependencies": { + "@hotwired/stimulus": "^3.2.2", + "@hotwired/turbo-rails": "^7.3.0", "@popperjs/core": "^2.11.8", "autoprefixer": "^10.4.17", "bootstrap": "^5.3.2",