.gitattributes

@@ -1,10 +1,10 @@
 # See https://git-scm.com/docs/gitattributes for more about git attribute files.
+
 # Mark the database schema as having been generated.
 db/schema.rb linguist-generated
+
 # Mark the yarn lockfile as having been generated.
 yarn.lock linguist-generated
+
 # Mark any vendored files as having been vendored.
 vendor/* linguist-vendored
-public/** filter=lfs diff=lfs merge=lfs -text
-public/assets/** filter=lfs diff=lfs merge=lfs -text
-public/packs/** filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -19,11 +19,13 @@
 !/tmp/pids/.keep
 
 
+/public/assets
 .byebug_history
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
 
+/public/packs
 /public/packs-test
 /node_modules
 /yarn-error.log

Gemfile

@@ -11,6 +11,8 @@ gem 'rails', '~> 6.1.4'
 gem 'pg', '~> 1.1'
 # Use Puma as the app server
 gem 'puma', '~> 5.0'
+# Use SCSS for stylesheets
+gem 'sass-rails', '>= 6'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
 gem 'webpacker', '~> 5.0'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
@@ -27,14 +29,10 @@ gem 'ssh_data'
 
 gem 'anomaly_detection'
 
+gem 'bootstrap'
 gem 'rails-i18n'
 gem 'hamlit'
 
-if ENV['RAILS_GROUPS']&.split(',')&.include? 'assets'
-  puts 'Loading assets'
-  gem 'sass-rails', '>= 6'
-end
-
 group :development, :test do
   gem 'pry'
 end

Gemfile.lock

@@ -63,6 +63,8 @@ GEM
     anomaly_detection (0.1.4-x86_64-linux-musl)
       rice (>= 4.0.2)
     ast (2.4.2)
+    autoprefixer-rails (10.4.2.0)
+      execjs (~> 2)
     bcrypt (3.1.17-x86_64-linux-musl)
     bindex (0.8.1-x86_64-linux-musl)
     blazer (2.6.3)
@@ -72,6 +74,10 @@ GEM
       safely_block (>= 0.1.1)
     bootsnap (1.11.1-x86_64-linux-musl)
       msgpack (~> 1.2)
+    bootstrap (5.1.3)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.9.3, < 3)
+      sassc-rails (>= 2.0.0)
     brakeman (5.2.3)
     builder (3.2.4)
     chartkick (4.1.3)
@@ -97,6 +103,7 @@ GEM
     exception_notification (4.5.0)
       actionmailer (>= 5.2, < 8)
       activesupport (>= 5.2, < 8)
+    execjs (2.8.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     ffi (1.15.5-x86_64-linux-musl)
@@ -139,6 +146,7 @@ GEM
     parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.3.5-x86_64-linux-musl)
+    popper_js (2.9.3)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -262,6 +270,7 @@ DEPENDENCIES
   anomaly_detection
   blazer
   bootsnap (>= 1.4.4)
+  bootstrap
   brakeman
   database_cleaner
   devise

Makefile

@@ -84,7 +84,7 @@ save: ## Subir la imagen Docker al nodo delegado
 # los assets que luego se suben al nodo delegado.
 assets := package.json yarn.lock $(shell find app/assets/ app/javascript/ -type f)
 public/packs/manifest.json.br: $(assets)
-	$(hain) 'RAILS_GROUPS=assets RAILS_ENV=production NODE_ENV=production bundle exec rake assets:precompile assets:clean'
+	$(hain) 'RAILS_ENV=production NODE_ENV=production bundle exec rake assets:precompile assets:clean'
 
 # Correr un test en particular por ejemplo
 # `make test/models/usuarie_test.rb`

app/assets/stylesheets/main.scss

@@ -1 +1 @@
-@import "bootstrap/scss/bootstrap";
+@import "bootstrap";

config/routes.rb

@@ -3,10 +3,8 @@ Rails.application.routes.draw do
 
   root 'application#index'
 
-  mount Blazer::Engine, at: '/blazer'
+  mount Blazer::Engine, at: 'blazer'
 
   resources :readings, only: %i[create]
-
   resources :sites, only: %i[show create update]
-  resources :users, only: %i[index create destroy]
 end

package.json

@@ -4,7 +4,6 @@
   "dependencies": {
     "@rails/ujs": "^6.0.0",
     "@rails/webpacker": "5.4.0",
-    "bootstrap": "~5.1",
     "turbolinks": "^5.2.0",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12"

yarn.lock

@@ -1479,11 +1479,6 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bootstrap@~5.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"
-  integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"