Skip to content

Commit f1ccedd

Browse files
committed
Move flash messages into partial and prepare for turbo
1 parent 3cfe0aa commit f1ccedd

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

app/helpers/application_helper.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ def sidebar
33
render partial: "layouts/sidebar"
44
end
55

6+
def flash_messages
7+
render "layouts/flash"
8+
end
9+
10+
def turbo_stream_flash_messages
11+
turbo_stream.prepend "flash", partial: "layouts/flash_messages"
12+
end
13+
14+
615
def linked_logo
716
render partial: "layouts/linked_logo"
817
end

app/views/layouts/_flash.html.erb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<% flash.each do |type, message| %>
2+
<div data-controller="flash"
3+
data-flash-message-value="<%= message %>"
4+
data-flash-type-value="<%= type == 'notice' ? 'success' : 'error' %>">
5+
</div>
6+
<% end %>

app/views/layouts/application.html.erb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,7 @@
8080
<%= sidebar %>
8181
<div id="main" class='layout-navbar navbar-fixed'>
8282
<div id="main-content">
83-
<% flash.each do |type, message| %>
84-
<div data-controller="flash"
85-
data-flash-message-value="<%= message %>"
86-
data-flash-type-value="<%= type == 'notice' ? 'success' : 'error' %>">
87-
</div>
88-
<% end %>
83+
<%= flash_messages %>
8984
<%= yield %>
9085
</div>
9186
<footer>

0 commit comments

Comments
 (0)