Merge pull request 'Show links for log-in, ToS, and Privacy Policy when logged out' (#240) from chore/login_links into master
CI / Test (push) Successful in 44s
CI / Test (push) Successful in 44s
Reviewed-on: #240
This commit was merged in pull request #240.
This commit is contained in:
@@ -41,6 +41,10 @@
|
|||||||
<%= link_to "Log out", destroy_user_session_path, class: 'underline hover:text-white' %>
|
<%= link_to "Log out", destroy_user_session_path, class: 'underline hover:text-white' %>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
<% elsif !user_signed_in? && controller_name != 'sessions' %>
|
||||||
|
<div class="flex items-baseline text-gray-200/80 text-sm font-medium">
|
||||||
|
<%= link_to "Log in", new_user_session_path, class: 'underline hover:text-white' %>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="-mr-2 flex md:hidden">
|
<div class="-mr-2 flex md:hidden">
|
||||||
@@ -60,6 +64,11 @@
|
|||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
|
<% elsif !user_signed_in? && controller_name != 'sessions' %>
|
||||||
|
<div class="mt-3 px-2 space-y-1">
|
||||||
|
<%= link_to "Log in", new_user_session_path,
|
||||||
|
class: 'block px-3 py-2 rounded-md text-base font-medium text-gray-300 hover:text-white hover:bg-gray-900/30 active:text-white active:bg-gray-900/30' %>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -100,14 +109,12 @@
|
|||||||
<%= yield %>
|
<%= yield %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% if user_signed_in? && current_user.confirmed? %>
|
|
||||||
<nav id="footer" class="max-w-6xl mx-auto pt-4 sm:px-6 lg:px-8">
|
<nav id="footer" class="max-w-6xl mx-auto pt-4 sm:px-6 lg:px-8">
|
||||||
<div class="flex justify-end items-center space-x-4 h-16">
|
<div class="flex justify-end items-center space-x-4 h-16">
|
||||||
<%= link_to "Terms", tos_page_path, class: main_nav_class(@current_section, :tos) %>
|
<%= link_to "Terms", tos_page_path, class: main_nav_class(@current_section, :tos) %>
|
||||||
<%= link_to "Privacy", privacy_page_path, class: main_nav_class(@current_section, :privacy) %>
|
<%= link_to "Privacy", privacy_page_path, class: main_nav_class(@current_section, :privacy) %>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
<% end %>
|
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user