From e47a76d237fc897bbfceee78234ea6e5ff455000 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Mon, 5 Jul 2021 11:15:11 +0930 Subject: [PATCH 1/8] Update userbox toggle for Bootstrap 5 --- app/views/trestle/auth/_userbox.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/trestle/auth/_userbox.html.erb b/app/views/trestle/auth/_userbox.html.erb index 4177730..637a281 100644 --- a/app/views/trestle/auth/_userbox.html.erb +++ b/app/views/trestle/auth/_userbox.html.erb @@ -10,7 +10,7 @@ <% end %> <% if show_dropdown %> - <%= link_to content, "#", data: { toggle: 'dropdown' } %> + <%= link_to content, "#", data: { bs_toggle: 'dropdown', bs_offset: "0,7" } %> <% else %> <%= content %> <% end %> From 216fa61d1bdc3105fc75c079c55c6d639617ac30 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Sat, 25 Sep 2021 13:44:21 +0930 Subject: [PATCH 2/8] Update login form for Bootstrap 5 --- app/assets/bundle/trestle/auth/bundle.css | 2 +- .../trestle/auth/sessions/_form.html.erb | 16 +++++--------- frontend/_form.scss | 22 ++++++++----------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/app/assets/bundle/trestle/auth/bundle.css b/app/assets/bundle/trestle/auth/bundle.css index a6eea5c..09cdd06 100644 --- a/app/assets/bundle/trestle/auth/bundle.css +++ b/app/assets/bundle/trestle/auth/bundle.css @@ -1 +1 @@ -.auth-body{color:#fff;display:flex}.auth-body .container{margin:auto;width:320px}.auth-header{margin-bottom:20px;text-align:center}.auth-header h1{align-items:center;display:flex;font-size:1.75rem;font-weight:500;justify-content:center;padding:.75rem 1rem;text-shadow:rgba(0,0,0,.5) 0 1px 1px}.auth-header img{max-height:100%;max-width:80%}.auth-header span{margin-left:10px}.login-form .form-control,.login-form .input-group-text{background:hsla(0,0%,100%,.1);border:0}.login-form .form-control{color:#fff;font-size:1.1rem;padding:1.75rem .75rem}.login-form .form-control:focus{box-shadow:none;outline-color:transparent;outline-style:none}.login-form .form-control::-webkit-input-placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control:-ms-input-placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control::placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control:-webkit-autofill{-webkit-text-fill-color:#fff}.login-form .form-control:-webkit-autofill,.login-form .form-control:-webkit-autofill:active,.login-form .form-control:-webkit-autofill:focus,.login-form .form-control:-webkit-autofill:hover{-webkit-transition:background-color 9999999s ease-in-out 0s;transition:background-color 9999999s ease-in-out 0s}.login-form .input-group-prepend{margin-right:0}.login-form .input-group-text{color:hsla(0,0%,100%,.5);padding:.375rem .25rem .375rem 1rem}.login-form .btn-primary{box-shadow:0 0 2px rgba(0,0,0,.1);padding-bottom:.75rem;padding-top:.75rem}.login-form .alert-danger{background-color:hsla(2,62%,66%,.75)}.login-form .remember-me{font-size:.95rem;line-height:1.5;padding-left:0}.login-form .remember-me .custom-control-label{background:rgba(0,0,0,.075);border-radius:.25rem;color:hsla(0,0%,100%,.75);cursor:pointer;display:block;padding:.75em 1.5em .75em 3.25em}.login-form .remember-me .custom-control-label:hover{background:rgba(0,0,0,.125)}.login-form .remember-me .custom-control-label:after,.login-form .remember-me .custom-control-label:before{left:1.1em;top:.925em} \ No newline at end of file +.auth-body{color:#fff;display:flex}.auth-body .container{margin:auto;width:320px}.auth-header{margin-bottom:20px;text-align:center}.auth-header h1{align-items:center;display:flex;font-size:1.75rem;font-weight:500;justify-content:center;padding:.75rem 1rem;text-shadow:rgba(0,0,0,.5) 0 1px 1px}.auth-header img{max-height:100%;max-width:80%}.auth-header span{margin-left:10px}.login-form .input-group>*{background:hsla(0,0%,100%,.1);border:0;margin-left:0!important}.login-form .form-control{color:#fff;font-size:1.1rem;padding:1rem .75rem}.login-form .form-control:focus{box-shadow:none;outline-color:transparent;outline-style:none}.login-form .form-control::-webkit-input-placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control:-ms-input-placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control::placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control:-webkit-autofill{-webkit-text-fill-color:#fff}.login-form .form-control:-webkit-autofill,.login-form .form-control:-webkit-autofill:active,.login-form .form-control:-webkit-autofill:focus,.login-form .form-control:-webkit-autofill:hover{-webkit-transition:background-color 9999999s ease-in-out 0s;transition:background-color 9999999s ease-in-out 0s}.login-form .input-group-text{color:hsla(0,0%,100%,.5);padding:.375rem .25rem .375rem 1rem}.login-form .btn-primary{box-shadow:0 0 2px rgba(0,0,0,.1);padding-bottom:.75rem;padding-top:.75rem}.login-form .alert-danger{background-color:hsla(2,62%,66%,.75)}.login-form .remember-me{font-size:.95rem;line-height:1.5;padding-left:0}.login-form .remember-me .form-check-input{margin-left:1em;margin-top:.825em}.login-form .remember-me .form-check-label{background:rgba(0,0,0,.075);border-radius:.25rem;color:hsla(0,0%,100%,.75);cursor:pointer;display:block;padding:.75em 1.5em .75em 3.25em}.login-form .remember-me .form-check-label:hover{background:rgba(0,0,0,.125)} \ No newline at end of file diff --git a/app/views/trestle/auth/sessions/_form.html.erb b/app/views/trestle/auth/sessions/_form.html.erb index 421e550..e64af8b 100644 --- a/app/views/trestle/auth/sessions/_form.html.erb +++ b/app/views/trestle/auth/sessions/_form.html.erb @@ -1,17 +1,13 @@
-
- -
+ <%= f.text_field Trestle.config.auth.authenticate_with, placeholder: Trestle.config.auth.human_attribute_name(Trestle.config.auth.authenticate_with), class: "form-control" %>
-
- -
+ <%= f.password_field :password, placeholder: Trestle.config.auth.human_attribute_name(:password), class: "form-control" %>
@@ -20,13 +16,13 @@ <% if Trestle.config.auth.remember.enabled %>
-
- <%= f.check_box :remember_me, class: "custom-control-input", include_hidden: false %> - <%= f.label :remember_me, t("admin.auth.remember_me", default: "Remember me"), class: "custom-control-label" %> +
+ <%= f.check_box :remember_me, class: "form-check-input", include_hidden: false %> + <%= f.label :remember_me, t("admin.auth.remember_me", default: "Remember me"), class: "form-check-label" %>
<% end %>
- <%= f.submit t("admin.auth.login", default: "Login"), class: "btn btn-primary btn-block btn-lg" %> + <%= f.submit t("admin.auth.login", default: "Login"), class: "btn btn-primary btn-lg d-block w-100" %>
diff --git a/frontend/_form.scss b/frontend/_form.scss index be7a49d..be58abf 100644 --- a/frontend/_form.scss +++ b/frontend/_form.scss @@ -1,14 +1,15 @@ .login-form { - .form-control, .input-group-text { + .input-group > * { background: $auth-form-control-bg; border: $auth-form-control-border; + margin-left: 0 !important; } .form-control { color: $auth-form-control-color; font-size: 1.1rem; - padding: 1.75rem 0.75rem; + padding: 1rem 0.75rem; &:focus { outline-color: transparent; @@ -29,10 +30,6 @@ } } - .input-group-prepend { - margin-right: 0; - } - .input-group-text { color: $auth-form-control-icon-color; padding: 0.375rem 0.25rem 0.375rem 1rem; @@ -55,7 +52,12 @@ padding-left: 0; - .custom-control-label { + .form-check-input { + margin-left: 1em; + margin-top: 0.825em; + } + + .form-check-label { display: block; cursor: pointer; @@ -68,12 +70,6 @@ &:hover { background: opacify($auth-remember-me-bg, 0.05); } - - &::before, - &::after { - top: 0.175em + 0.75em; - left: 1.1em; - } } } } From c504c17ab9a24f1dc3e82124bf7b7d5d9917ce53 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Mon, 21 Aug 2023 16:05:42 +0930 Subject: [PATCH 3/8] Use new theme settings partial instead of old external stylesheet --- app/views/layouts/trestle/auth.html.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/trestle/auth.html.erb b/app/views/layouts/trestle/auth.html.erb index 725cd25..3f23646 100644 --- a/app/views/layouts/trestle/auth.html.erb +++ b/app/views/layouts/trestle/auth.html.erb @@ -14,17 +14,16 @@ <%= Trestle.config.site_title %> <%= stylesheet_link_tag "trestle/admin", 'data-turbolinks-track': 'reload' %> - <%= stylesheet_link_tag "trestle/theme", 'data-turbolinks-track': 'reload' if Trestle.config.theme %> <%= stylesheet_link_tag "trestle/custom", 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag "trestle/auth", 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag "turbolinks" if Trestle.config.turbolinks %> + <%= render "trestle/theme" %> <%= hook "auth.head" %> - +
<%= yield %>
From a6e2e8f0662cb681e95ec7ecd9976c879ab4b671 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Mon, 21 Aug 2023 16:05:52 +0930 Subject: [PATCH 4/8] Fix Bootstrap class on userbox dropdown --- app/views/trestle/auth/_userbox.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/trestle/auth/_userbox.html.erb b/app/views/trestle/auth/_userbox.html.erb index 637a281..3ee2dac 100644 --- a/app/views/trestle/auth/_userbox.html.erb +++ b/app/views/trestle/auth/_userbox.html.erb @@ -16,7 +16,7 @@ <% end %> <% if show_dropdown -%> -
    +
      <% if Trestle.config.auth.user_admin && user_admin = Trestle.lookup(Trestle.config.auth.user_admin) -%>
    • <%= admin_link_to t("admin.auth.my_account", default: "My Account"), current_user, admin: user_admin, class: "dropdown-item" %>
      • <% end -%> From 75b182c7869c248cad0b762c592b24f68e059326 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Mon, 27 May 2024 16:29:55 +0930 Subject: [PATCH 5/8] Update Turbolinks tags and configuration to Turbo --- app/views/layouts/trestle/auth.html.erb | 14 ++++++++------ spec/dummy/config/initializers/devise.rb | 14 ++++++++------ spec/dummy/config/initializers/trestle.rb | 5 ----- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/views/layouts/trestle/auth.html.erb b/app/views/layouts/trestle/auth.html.erb index 3f23646..9641746 100644 --- a/app/views/layouts/trestle/auth.html.erb +++ b/app/views/layouts/trestle/auth.html.erb @@ -5,18 +5,20 @@ - <% if Trestle.config.turbolinks %> - - <% end %> + + + <%= csrf_meta_tags %> <%= Trestle.config.site_title %> - <%= stylesheet_link_tag "trestle/admin", 'data-turbolinks-track': 'reload' %> - <%= stylesheet_link_tag "trestle/custom", 'data-turbolinks-track': 'reload' %> + <%= favicon_link_tag Trestle.config.favicon if Trestle.config.favicon %> - <%= stylesheet_link_tag "trestle/auth", 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag "trestle/admin", 'data-turbo-track': 'reload' %> + <%= stylesheet_link_tag "trestle/custom", 'data-turbo-track': 'reload' %> + + <%= stylesheet_link_tag "trestle/auth", 'data-turbo-track': 'reload' %> <%= render "trestle/theme" %> diff --git a/spec/dummy/config/initializers/devise.rb b/spec/dummy/config/initializers/devise.rb index fca4386..3e55e85 100644 --- a/spec/dummy/config/initializers/devise.rb +++ b/spec/dummy/config/initializers/devise.rb @@ -287,12 +287,14 @@ # so you need to do it manually. For the users scope, it would be: # config.omniauth_path_prefix = '/my_engine/users/auth' - # ==> Turbolinks configuration - # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly: - # - # ActiveSupport.on_load(:devise_failure_app) do - # include Turbolinks::Controller - # end + # ==> Hotwire/Turbo configuration + # When using Devise with Hotwire/Turbo, the http status for error responses + # and some redirects must match the following. The default in Devise for existing + # apps is `200 OK` and `302 Found` respectively, but new apps are generated with + # these new defaults that match Hotwire/Turbo behavior. + # Note: These might become the new default in future versions of Devise. + config.responder.error_status = :unprocessable_entity + config.responder.redirect_status = :see_other # ==> Configuration for :registerable diff --git a/spec/dummy/config/initializers/trestle.rb b/spec/dummy/config/initializers/trestle.rb index b111501..f44045e 100644 --- a/spec/dummy/config/initializers/trestle.rb +++ b/spec/dummy/config/initializers/trestle.rb @@ -93,11 +93,6 @@ # stylesheet_link_tag "custom" # end - # Toggle whether Turbolinks is enabled within the admin. - # Defaults to true if Turbolinks is available. - # - # config.turbolinks = false - # Specify the parameters that should persist across requests when # paginating or reordering. Defaults to [:sort, :order, :scope]. # From 198ff8a8ad28184eda5ba9afc8b5381d64448a85 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Mon, 27 May 2024 17:14:17 +0930 Subject: [PATCH 6/8] Remove sassc-rails and Sass files --- Gemfile | 3 +-- gemfiles/rails-5.2.gemfile | 3 +-- gemfiles/rails-6.0.gemfile | 3 +-- gemfiles/rails-6.1.gemfile | 3 +-- gemfiles/rails-7.0.gemfile | 3 +-- gemfiles/rails-7.1.gemfile | 3 +-- spec/dummy/app/assets/stylesheets/application.css | 1 - .../app/assets/stylesheets/trestle/_custom.css | 8 ++++++++ .../app/assets/stylesheets/trestle/_custom.scss | 8 -------- .../app/assets/stylesheets/trestle/_theme.scss | 13 ------------- 10 files changed, 14 insertions(+), 34 deletions(-) create mode 100644 spec/dummy/app/assets/stylesheets/trestle/_custom.css delete mode 100644 spec/dummy/app/assets/stylesheets/trestle/_custom.scss delete mode 100644 spec/dummy/app/assets/stylesheets/trestle/_theme.scss diff --git a/Gemfile b/Gemfile index 9301e72..61bf97e 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,5 @@ group :test do end gem "rails", "~> 7.1.0" -gem "sassc-rails" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" diff --git a/gemfiles/rails-5.2.gemfile b/gemfiles/rails-5.2.gemfile index ade8fe5..300d797 100644 --- a/gemfiles/rails-5.2.gemfile +++ b/gemfiles/rails-5.2.gemfile @@ -10,9 +10,8 @@ end gem "rails", "~> 5.2.0" gem "sqlite3", "~> 1.3.13" -gem "sassc-rails" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/gemfiles/rails-6.0.gemfile b/gemfiles/rails-6.0.gemfile index 40c5f4f..f022eb9 100644 --- a/gemfiles/rails-6.0.gemfile +++ b/gemfiles/rails-6.0.gemfile @@ -9,10 +9,9 @@ end gem "rails", "~> 6.0.0" -gem "sassc-rails" gem "sqlite3", "~> 1.4" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/gemfiles/rails-6.1.gemfile b/gemfiles/rails-6.1.gemfile index b8446d6..3f28534 100644 --- a/gemfiles/rails-6.1.gemfile +++ b/gemfiles/rails-6.1.gemfile @@ -10,9 +10,8 @@ end gem "rails", "~> 6.1.0" gem "sqlite3", "~> 1.4" -gem "sassc-rails" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/gemfiles/rails-7.0.gemfile b/gemfiles/rails-7.0.gemfile index c046365..a32e254 100644 --- a/gemfiles/rails-7.0.gemfile +++ b/gemfiles/rails-7.0.gemfile @@ -10,9 +10,8 @@ end gem "rails", "~> 7.0.0" gem "sqlite3", "~> 1.4" -gem "sassc-rails" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile index 20fc271..7c1f2f9 100644 --- a/gemfiles/rails-7.1.gemfile +++ b/gemfiles/rails-7.1.gemfile @@ -10,9 +10,8 @@ end gem "rails", "~> 7.1.0" gem "sqlite3", "~> 1.4" -gem "sassc-rails" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/spec/dummy/app/assets/stylesheets/application.css b/spec/dummy/app/assets/stylesheets/application.css index 0ebd7fe..d1a3a7e 100644 --- a/spec/dummy/app/assets/stylesheets/application.css +++ b/spec/dummy/app/assets/stylesheets/application.css @@ -10,6 +10,5 @@ * files in this directory. Styles in this file should be added after the last require_* statement. * It is generally better to create a new file per style scope. * - *= require_tree . *= require_self */ diff --git a/spec/dummy/app/assets/stylesheets/trestle/_custom.css b/spec/dummy/app/assets/stylesheets/trestle/_custom.css new file mode 100644 index 0000000..f15c317 --- /dev/null +++ b/spec/dummy/app/assets/stylesheets/trestle/_custom.css @@ -0,0 +1,8 @@ +/* This file may be used for providing additional customizations to the Trestle + * admin. It will be automatically included within all admin pages. + * + * For organizational purposes, you may wish to define your customizations + * within individual partials in this folder and they'll be required below. + * + *= require_tree . +*/ diff --git a/spec/dummy/app/assets/stylesheets/trestle/_custom.scss b/spec/dummy/app/assets/stylesheets/trestle/_custom.scss deleted file mode 100644 index 6286615..0000000 --- a/spec/dummy/app/assets/stylesheets/trestle/_custom.scss +++ /dev/null @@ -1,8 +0,0 @@ -// This file may be used for providing additional customizations to the Trestle -// admin. It will be automatically included within all admin pages. -// -// For organizational purposes, you may wish to define your customizations -// within individual partials and `import` them here, e.g. -// -// @import "trestle/custom/my_custom_css"; -// diff --git a/spec/dummy/app/assets/stylesheets/trestle/_theme.scss b/spec/dummy/app/assets/stylesheets/trestle/_theme.scss deleted file mode 100644 index 64a89c2..0000000 --- a/spec/dummy/app/assets/stylesheets/trestle/_theme.scss +++ /dev/null @@ -1,13 +0,0 @@ -// This file may be used to override the Sass variables used within the Trestle -// admin. It will be automatically included within all admin pages. -// -// A subset of Bootstrap and Trestle defaults can be set here. -// For a detailed overview of the customizable variables, see the file -// `frontend/theme/trestle/theme/_defaults.scss` within the Trestle source. - -// Customize admin theme colors: -// -// $theme-colors: ( -// "primary": #337ab7, -// "secondary": #b3b53d -// ); From b60e66fd114a94b0258d67150175c9b5f99f8672 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Wed, 26 Jun 2024 17:47:54 +0930 Subject: [PATCH 7/8] Include FontAwesome icons in layout when using Sprockets --- app/views/layouts/trestle/auth.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/layouts/trestle/auth.html.erb b/app/views/layouts/trestle/auth.html.erb index 9641746..053ae59 100644 --- a/app/views/layouts/trestle/auth.html.erb +++ b/app/views/layouts/trestle/auth.html.erb @@ -16,6 +16,8 @@ <%= favicon_link_tag Trestle.config.favicon if Trestle.config.favicon %> <%= stylesheet_link_tag "trestle/admin", 'data-turbo-track': 'reload' %> + <%= stylesheet_link_tag "trestle/icons/font-awesome", 'data-turbo-track': 'reload' if defined?(Sprockets) %> + <%= stylesheet_link_tag "trestle/custom", 'data-turbo-track': 'reload' %> <%= stylesheet_link_tag "trestle/auth", 'data-turbo-track': 'reload' %> From 4ac83a33367aca9aaf0286faff54c2f94b5de113 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Wed, 26 Jun 2024 17:52:04 +0930 Subject: [PATCH 8/8] Add sprockets-rails to CI Gemfiles --- gemfiles/rails-5.2.gemfile | 2 +- gemfiles/rails-6.0.gemfile | 2 +- gemfiles/rails-6.1.gemfile | 2 +- gemfiles/rails-7.0.gemfile | 2 +- gemfiles/rails-7.1.gemfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gemfiles/rails-5.2.gemfile b/gemfiles/rails-5.2.gemfile index 300d797..609fbf5 100644 --- a/gemfiles/rails-5.2.gemfile +++ b/gemfiles/rails-5.2.gemfile @@ -8,7 +8,7 @@ group :test do end gem "rails", "~> 5.2.0" - +gem "sprockets-rails" gem "sqlite3", "~> 1.3.13" gem "devise" diff --git a/gemfiles/rails-6.0.gemfile b/gemfiles/rails-6.0.gemfile index f022eb9..1b85f75 100644 --- a/gemfiles/rails-6.0.gemfile +++ b/gemfiles/rails-6.0.gemfile @@ -8,7 +8,7 @@ group :test do end gem "rails", "~> 6.0.0" - +gem "sprockets-rails" gem "sqlite3", "~> 1.4" gem "devise" diff --git a/gemfiles/rails-6.1.gemfile b/gemfiles/rails-6.1.gemfile index 3f28534..8fb7753 100644 --- a/gemfiles/rails-6.1.gemfile +++ b/gemfiles/rails-6.1.gemfile @@ -8,7 +8,7 @@ group :test do end gem "rails", "~> 6.1.0" - +gem "sprockets-rails" gem "sqlite3", "~> 1.4" gem "devise" diff --git a/gemfiles/rails-7.0.gemfile b/gemfiles/rails-7.0.gemfile index a32e254..afe1898 100644 --- a/gemfiles/rails-7.0.gemfile +++ b/gemfiles/rails-7.0.gemfile @@ -8,7 +8,7 @@ group :test do end gem "rails", "~> 7.0.0" - +gem "sprockets-rails" gem "sqlite3", "~> 1.4" gem "devise" diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile index 7c1f2f9..2df27a5 100644 --- a/gemfiles/rails-7.1.gemfile +++ b/gemfiles/rails-7.1.gemfile @@ -8,7 +8,7 @@ group :test do end gem "rails", "~> 7.1.0" - +gem "sprockets-rails" gem "sqlite3", "~> 1.4" gem "devise"