From 2f6d5ff81864ee4a9eec87d66126b2f5ffd5555f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= Date: Wed, 3 Dec 2025 21:25:39 +0100 Subject: [PATCH] Add simple sidebar --- lib/mv_web/components/layouts.ex | 36 ++++++++--- lib/mv_web/components/layouts/navbar.ex | 64 ++++++++----------- lib/mv_web/components/layouts/sidebar.ex | 80 ++++++++++++++++++++++++ priv/gettext/de/LC_MESSAGES/default.po | 19 +++--- priv/gettext/default.pot | 15 +++-- priv/gettext/en/LC_MESSAGES/default.po | 15 +++-- 6 files changed, 162 insertions(+), 67 deletions(-) create mode 100644 lib/mv_web/components/layouts/sidebar.ex diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex index 487a01f..d45b8d5 100644 --- a/lib/mv_web/components/layouts.ex +++ b/lib/mv_web/components/layouts.ex @@ -10,6 +10,7 @@ defmodule MvWeb.Layouts do use MvWeb, :html use Gettext, backend: MvWeb.Gettext import MvWeb.Layouts.Navbar + import MvWeb.Layouts.Sidebar embed_templates "layouts/*" @@ -39,20 +40,39 @@ defmodule MvWeb.Layouts do slot :inner_block, required: true def app(assigns) do + club_name = get_club_name() + assigns = assign(assigns, :club_name, club_name) + ~H""" - <%= if @current_user do %> - <.navbar current_user={@current_user} /> - <% end %> -
-
- {render_slot(@inner_block)} +
+ +
+ <%= if @current_user do %> + <.navbar current_user={@current_user} /> + <% end %> +
+
+ {render_slot(@inner_block)} +
+
-
+ + <.sidebar current_user={@current_user} club_name={@club_name} /> + <.flash_group flash={@flash} /> """ end + # Helper function to get club name from settings + # Falls back to "Mitgliederverwaltung" if settings can't be loaded + defp get_club_name do + case Mv.Membership.get_settings() do + {:ok, settings} -> settings.club_name + _ -> "Mitgliederverwaltung" + end + end + @doc """ Shows the flash group with standard titles and content. @@ -65,7 +85,7 @@ defmodule MvWeb.Layouts do def flash_group(assigns) do ~H""" -
+
<.flash kind={:success} flash={@flash} /> <.flash kind={:warning} flash={@flash} /> <.flash kind={:info} flash={@flash} /> diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex index 4246c99..8258d43 100644 --- a/lib/mv_web/components/layouts/navbar.ex +++ b/lib/mv_web/components/layouts/navbar.ex @@ -6,37 +6,35 @@ defmodule MvWeb.Layouts.Navbar do use Gettext, backend: MvWeb.Gettext use MvWeb, :verified_routes - alias Mv.Membership - attr :current_user, :map, required: true, doc: "The current user - navbar is only shown when user is present" def navbar(assigns) do - club_name = get_club_name() - - assigns = assign(assigns, :club_name, club_name) - ~H""" -
+
- {@club_name} -
    -
  • <.link navigate="/members">{gettext("Members")}
    • -
  • <.link navigate="/settings">{gettext("Settings")}
    • -
  • <.link navigate="/users">{gettext("Users")}
    • -
  • -
    - {gettext("Contributions")} -
      -
    • <.link navigate="/contribution_types">{gettext("Contribution Types")}
      • -
    • - <.link navigate="/contribution_settings">{gettext("Contribution Settings")} -
      • -
    -
    -
    • -
+
@@ -54,7 +52,7 @@ defmodule MvWeb.Layouts.Navbar do
-
""" end - - # Helper function to get club name from settings - # Falls back to "Mitgliederverwaltung" if settings can't be loaded - defp get_club_name do - case Membership.get_settings() do - {:ok, settings} -> settings.club_name - _ -> "Mitgliederverwaltung" - end - end end diff --git a/lib/mv_web/components/layouts/sidebar.ex b/lib/mv_web/components/layouts/sidebar.ex new file mode 100644 index 0000000..2a9be38 --- /dev/null +++ b/lib/mv_web/components/layouts/sidebar.ex @@ -0,0 +1,80 @@ +defmodule MvWeb.Layouts.Sidebar do + @moduledoc """ + Sidebar navigation component used in the drawer layout + """ + use MvWeb, :html + + attr :current_user, :map, default: nil, doc: "The current user" + attr :club_name, :string, required: true, doc: "The name of the club" + + def sidebar(assigns) do + ~H""" +
+ +
+
    +
  • +

    {@club_name}

    +
    • + <%= if @current_user do %> +
  • + <.link + navigate="/members" + class={[ + "is-drawer-close:tooltip is-drawer-close:tooltip-right" + ]} + data-tip={gettext("Members")} + > + <.icon name="hero-users" class="size-5" /> + {gettext("Members")} + +
    • +
  • + <.link + navigate="/users" + class={[ + "is-drawer-close:tooltip is-drawer-close:tooltip-right" + ]} + data-tip={gettext("Users")} + > + <.icon name="hero-user-circle" class="size-5" /> + {gettext("Users")} + +
    • +
  • +

    + <.icon name="hero-currency-dollar" class="size-5" /> + {gettext("Contributions")} +

    +
      +
    • + <.link navigate="/contribution_types"> + {gettext("Plans")} + +
      • +
    • + <.link navigate="/contribution_settings"> + {gettext("Settings")} + +
      • +
    +
    • +
  • + <.link + navigate="/settings" + class={[ + "is-drawer-close:tooltip is-drawer-close:tooltip-right" + ]} + data-tip={gettext("Settings")} + > + <.icon name="hero-cog-6-tooth" class="size-5" /> + {gettext("Settings")} + +
    • + <% end %> +
+
+
+ """ + end +end diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index bb781f7..f61c9db 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -292,7 +292,7 @@ msgstr "Benutzer*innen auflisten" msgid "Member" msgstr "Mitglied" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex @@ -348,7 +348,7 @@ msgstr "Alle Mitglieder auswählen" msgid "Select member" msgstr "Mitglied auswählen" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Settings" @@ -531,7 +531,7 @@ msgstr "Dunklen Modus umschalten" msgid "Search..." msgstr "Suchen..." -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format msgid "Users" msgstr "Benutzer*innen" @@ -943,18 +943,16 @@ msgstr "" msgid "Configure global settings for membership contributions." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex #: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format, fuzzy msgid "Contribution Settings" -msgstr "Beitrag" +msgstr "Beitragseinstellungen" #: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format, fuzzy msgid "Contribution Start" msgstr "Beitrag" -#: lib/mv_web/components/layouts/navbar.ex #: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format, fuzzy msgid "Contribution Types" @@ -975,10 +973,10 @@ msgstr "Beitrag" msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format, fuzzy msgid "Contributions" -msgstr "Beitrag" +msgstr "Beiträge" #: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format, fuzzy @@ -1405,6 +1403,11 @@ msgstr "Diese Felder können zusätzlich zu den normalen Daten ausgefüllt werde msgid "Value Type" msgstr "Wertetyp" +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Plans" +msgstr "Beitragsklassen" + #~ #: lib/mv_web/live/custom_field_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "Auto-generated identifier (immutable)" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 7581d62..40783db 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -293,7 +293,7 @@ msgstr "" msgid "Member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex @@ -349,7 +349,7 @@ msgstr "" msgid "Select member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Settings" @@ -532,7 +532,7 @@ msgstr "" msgid "Search..." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format msgid "Users" msgstr "" @@ -944,7 +944,6 @@ msgstr "" msgid "Configure global settings for membership contributions." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex #: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Contribution Settings" @@ -955,7 +954,6 @@ msgstr "" msgid "Contribution Start" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex #: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Contribution Types" @@ -976,7 +974,7 @@ msgstr "" msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format msgid "Contributions" msgstr "" @@ -1405,3 +1403,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Value Type" msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Plans" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index dc86840..ea2c032 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -293,7 +293,7 @@ msgstr "" msgid "Member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/contribution_type_live/index.ex #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex @@ -349,7 +349,7 @@ msgstr "" msgid "Select member" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgid "Settings" @@ -532,7 +532,7 @@ msgstr "" msgid "Search..." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format, fuzzy msgid "Users" msgstr "" @@ -944,7 +944,6 @@ msgstr "" msgid "Configure global settings for membership contributions." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex #: lib/mv_web/live/contribution_settings_live.ex #, elixir-autogen, elixir-format msgid "Contribution Settings" @@ -955,7 +954,6 @@ msgstr "" msgid "Contribution Start" msgstr "" -#: lib/mv_web/components/layouts/navbar.ex #: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Contribution Types" @@ -976,7 +974,7 @@ msgstr "" msgid "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation." msgstr "" -#: lib/mv_web/components/layouts/navbar.ex +#: lib/mv_web/components/layouts/sidebar.ex #, elixir-autogen, elixir-format msgid "Contributions" msgstr "" @@ -1406,6 +1404,11 @@ msgstr "" msgid "Value Type" msgstr "" +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Plans" +msgstr "" + #~ #: lib/mv_web/live/custom_field_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "Auto-generated identifier (immutable)" -- 2.47.2