kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-10 17:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update devise to 4.9.3 and links to work with Turbo

Browse source
This commit is contained in:
Eugene Burmakin 2024-03-15 22:23:48 +01:00
parent 0d2dbed2d0
commit a81b6ef723
5 changed files with 67 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -5,11 +5,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.2.3' ruby '3.2.3'
gem 'bootsnap', require: false gem 'bootsnap', require: false
gem 'devise', '4.9.2' gem 'devise'
gem 'pg' gem 'pg'
gem 'puma' gem 'puma'
gem 'pundit' gem 'pundit'
gem 'rails', '7.1.1' gem 'rails'
gem 'sprockets-rails' gem 'sprockets-rails'
gem 'strong_migrations' gem 'strong_migrations'
gem 'stimulus-rails' gem 'stimulus-rails'

121
Gemfile.lock
View file

@ -1,70 +1,71 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.1.1) actioncable (7.1.3.2)
actionpack (= 7.1.1) actionpack (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
actionmailbox (7.1.1) actionmailbox (7.1.3.2)
actionpack (= 7.1.1) actionpack (= 7.1.3.2)
activejob (= 7.1.1) activejob (= 7.1.3.2)
activerecord (= 7.1.1) activerecord (= 7.1.3.2)
activestorage (= 7.1.1) activestorage (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
mail (>= 2.7.1) mail (>= 2.7.1)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
actionmailer (7.1.1) actionmailer (7.1.3.2)
actionpack (= 7.1.1) actionpack (= 7.1.3.2)
actionview (= 7.1.1) actionview (= 7.1.3.2)
activejob (= 7.1.1) activejob (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
actionpack (7.1.1) actionpack (7.1.3.2)
actionview (= 7.1.1) actionview (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4) rack (>= 2.2.4)
rack-session (>= 1.0.1) rack-session (>= 1.0.1)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
actiontext (7.1.1) actiontext (7.1.3.2)
actionpack (= 7.1.1) actionpack (= 7.1.3.2)
activerecord (= 7.1.1) activerecord (= 7.1.3.2)
activestorage (= 7.1.1) activestorage (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.1.1) actionview (7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.11) erubi (~> 1.11)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
activejob (7.1.1) activejob (7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.1.1) activemodel (7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
activerecord (7.1.1) activerecord (7.1.3.2)
activemodel (= 7.1.1) activemodel (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
timeout (>= 0.4.0) timeout (>= 0.4.0)
activestorage (7.1.1) activestorage (7.1.3.2)
actionpack (= 7.1.1) actionpack (= 7.1.3.2)
activejob (= 7.1.1) activejob (= 7.1.3.2)
activerecord (= 7.1.1) activerecord (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
marcel (~> 1.0) marcel (~> 1.0)
activesupport (7.1.1) activesupport (7.1.3.2)
base64 base64
bigdecimal bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
@ -77,7 +78,7 @@ GEM
ast (2.4.2) ast (2.4.2)
base64 (0.2.0) base64 (0.2.0)
bcrypt (3.1.20) bcrypt (3.1.20)
bigdecimal (3.1.6) bigdecimal (3.1.7)
bootsnap (1.18.3) bootsnap (1.18.3)
msgpack (~> 1.2) msgpack (~> 1.2)
builder (3.2.4) builder (3.2.4)
@ -88,7 +89,7 @@ GEM
debug (1.9.1) debug (1.9.1)
irb (~> 1.10) irb (~> 1.10)
reline (>= 0.3.8) reline (>= 0.3.8)
devise (4.9.2) devise (4.9.3)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0) railties (>= 4.1.0)
@ -129,7 +130,7 @@ GEM
net-smtp net-smtp
marcel (1.0.4) marcel (1.0.4)
mini_mime (1.1.5) mini_mime (1.1.5)
minitest (5.22.2) minitest (5.22.3)
msgpack (1.7.2) msgpack (1.7.2)
mutex_m (0.2.0) mutex_m (0.2.0)
net-imap (0.4.10) net-imap (0.4.10)
@ -169,20 +170,20 @@ GEM
rackup (2.1.0) rackup (2.1.0)
rack (>= 3) rack (>= 3)
webrick (~> 1.8) webrick (~> 1.8)
rails (7.1.1) rails (7.1.3.2)
actioncable (= 7.1.1) actioncable (= 7.1.3.2)
actionmailbox (= 7.1.1) actionmailbox (= 7.1.3.2)
actionmailer (= 7.1.1) actionmailer (= 7.1.3.2)
actionpack (= 7.1.1) actionpack (= 7.1.3.2)
actiontext (= 7.1.1) actiontext (= 7.1.3.2)
actionview (= 7.1.1) actionview (= 7.1.3.2)
activejob (= 7.1.1) activejob (= 7.1.3.2)
activemodel (= 7.1.1) activemodel (= 7.1.3.2)
activerecord (= 7.1.1) activerecord (= 7.1.3.2)
activestorage (= 7.1.1) activestorage (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.1.1) railties (= 7.1.3.2)
rails-dom-testing (2.2.0) rails-dom-testing (2.2.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
minitest minitest
@ -190,9 +191,9 @@ GEM
rails-html-sanitizer (1.6.0) rails-html-sanitizer (1.6.0)
loofah (~> 2.21) loofah (~> 2.21)
nokogiri (~> 1.14) nokogiri (~> 1.14)
railties (7.1.1) railties (7.1.3.2)
actionpack (= 7.1.1) actionpack (= 7.1.3.2)
activesupport (= 7.1.1) activesupport (= 7.1.3.2)
irb irb
rackup (>= 1.0.0) rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)
@ -230,7 +231,7 @@ GEM
rspec-mocks (~> 3.12) rspec-mocks (~> 3.12)
rspec-support (~> 3.12) rspec-support (~> 3.12)
rspec-support (3.13.1) rspec-support (3.13.1)
rubocop (1.62.0) rubocop (1.62.1)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
@ -267,7 +268,7 @@ GEM
stimulus-rails (1.3.3) stimulus-rails (1.3.3)
railties (>= 6.0.0) railties (>= 6.0.0)
stringio (3.1.0) stringio (3.1.0)
strong_migrations (1.7.0) strong_migrations (1.8.0)
activerecord (>= 5.2) activerecord (>= 5.2)
tailwindcss-rails (2.3.0-aarch64-linux) tailwindcss-rails (2.3.0-aarch64-linux)
railties (>= 6.0.0) railties (>= 6.0.0)
@ -303,7 +304,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
bootsnap bootsnap
debug debug
devise (= 4.9.2) devise
factory_bot_rails factory_bot_rails
ffaker ffaker
foreman foreman
@ -311,7 +312,7 @@ DEPENDENCIES
pg pg
puma puma
pundit pundit
rails (= 7.1.1) rails
redis redis
rspec-rails rspec-rails
rubocop-rails rubocop-rails

2
app/views/devise/registrations/edit.html.erb
View file

@ -55,7 +55,7 @@
<%= render "devise/shared/links" %> <%= render "devise/shared/links" %>
<% end %> <% end %>
<p class='mt-3'>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), method: :delete, form: { data: { turbo_confirm: 'Are you sure?' } }, class: 'btn' %></p> <p class='mt-3'>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?", turbo_method: :delete }, method: :delete, class: 'btn' %></p>
</div> </div>
</div> </div>
</div> </div>

2
app/views/shared/_navbar.html.erb
View file

@ -31,7 +31,7 @@
</a> </a>
<ul class="p-2 bg-base-300"> <ul class="p-2 bg-base-300">
<li><%= link_to 'Settings', edit_user_registration_path %></li> <li><%= link_to 'Settings', edit_user_registration_path %></li>
<li><%= button_to 'Logout', destroy_user_session_path, method: :delete %></li> <li><%= link_to 'Logout', destroy_user_session_path, method: :delete, data: { turbo_method: :delete } %></li>
</ul> </ul>
</li> </li>
<% else %> <% else %>

2
config/initializers/devise.rb
View file

@ -310,4 +310,6 @@ Devise.setup do |config|
# When set to false, does not sign a user in automatically after their password is # When set to false, does not sign a user in automatically after their password is
# changed. Defaults to true, so a user is signed in automatically after changing a password. # changed. Defaults to true, so a user is signed in automatically after changing a password.
# config.sign_in_after_change_password = true # config.sign_in_after_change_password = true
config.responder.error_status = :unprocessable_entity
config.responder.redirect_status = :see_other
end end