Merge remote-tracking branch 'origin/main' into sidebar

lib/mv_web/components/core_components.ex

@@ -692,7 +692,7 @@ defmodule MvWeb.CoreComponents do
   """
   attr :name, :string, required: true
   attr :class, :string, default: "size-4"
-  attr :rest, :global, include: ~w[aria-hidden]
+  attr :rest, :global, include: ~w(aria-hidden)
 
   def icon(%{name: "hero-" <> _} = assigns) do
     ~H"""

lib/mv_web/components/layouts/navbar.ex

@@ -3,6 +3,7 @@ defmodule MvWeb.Layouts.Navbar do
   Navbar that is used in the rootlayout shown on every page
   """
   use MvWeb, :html
+  import MvWeb.Authorization
 
   attr :current_user, :map,
     required: true,
@@ -22,12 +23,26 @@ defmodule MvWeb.Layouts.Navbar do
         <a href="/members" class="btn btn-ghost text-xl">{@club_name}</a>
         <ul class="menu menu-horizontal bg-base-200">
           <li><.link navigate="/members">{gettext("Members")}</.link></li>
-          <li><.link navigate="/settings">{gettext("Settings")}</.link></li>
+          <li>
+            <details>
+              <summary>{gettext("Settings")}</summary>
+              <ul class="bg-base-200 rounded-t-none p-2 z-10 w-48">
+                <li>
+                  <.link navigate="/settings">{gettext("Global Settings")}</.link>
+                </li>
+                <%= if can_access_page?(@current_user, ~p"/admin/roles") do %>
+                  <li>
+                    <.link navigate={~p"/admin/roles"}>{gettext("Roles")}</.link>
+                  </li>
+                <% end %>
+              </ul>
+            </details>
+          </li>
           <li><.link navigate="/users">{gettext("Users")}</.link></li>
           <li>
             <details>
               <summary>{gettext("Contributions")}</summary>
-              <ul class="bg-base-200 rounded-t-none p-2 z-10 w-48">
+              <ul class="bg-base-200 rounded-t-none p-2 z-10">
                 <li>
                   <.link navigate="/membership_fee_types">{gettext("Membership Fee Types")}</.link>
                 </li>