From 74af41c8abec4b05d01bb54d077d1f37099f4f62 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 16 Jan 2026 12:46:25 +0100 Subject: [PATCH] feat: reorder sidebar --- lib/mv_web/components/layouts/sidebar.ex | 36 ++++++++++------------- priv/gettext/de/LC_MESSAGES/default.po | 32 +++++++++++++++----- priv/gettext/default.pot | 27 ++++++++++++----- priv/gettext/en/LC_MESSAGES/default.po | 37 +++++++++++++++++++----- 4 files changed, 90 insertions(+), 42 deletions(-) diff --git a/lib/mv_web/components/layouts/sidebar.ex b/lib/mv_web/components/layouts/sidebar.ex index 6f7e684..6e50b3c 100644 --- a/lib/mv_web/components/layouts/sidebar.ex +++ b/lib/mv_web/components/layouts/sidebar.ex @@ -75,30 +75,24 @@ defmodule MvWeb.Layouts.Sidebar do icon="hero-users" label={gettext("Members")} /> - <.menu_item - href={~p"/users"} - icon="hero-user-circle" - label={gettext("Users")} - /> - <.menu_item - href={~p"/custom_field_values"} - icon="hero-rectangle-group" - label={gettext("Custom Fields")} - /> - - <.menu_group - icon="hero-currency-dollar" - label={gettext("Contributions")} - > - <.menu_subitem href="/contribution_types" label={gettext("Contribution Types")} /> - <.menu_subitem href="/membership_fee_settings" label={gettext("Settings")} /> - <.menu_item - href={~p"/settings"} - icon="hero-cog-6-tooth" - label={gettext("Settings")} + href={~p"/membership_fee_types"} + icon="hero-currency-euro" + label={gettext("Fee Types")} /> + + + <.menu_group icon="hero-cog-6-tooth" label={gettext("Administration")}> + <.menu_subitem href={~p"/users"} icon="hero-user-circle" label={gettext("Users")} /> + <.menu_subitem href={~p"/admin/roles"} icon="hero-shield-check" label={gettext("Roles")} /> + <.menu_subitem + href={~p"/membership_fee_settings"} + icon="hero-currency-euro" + label={gettext("Fee Settings")} + /> + <.menu_subitem href={~p"/settings"} icon="hero-cog-6-tooth" label={gettext("Settings")} /> + """ end diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 33dff0f..6264697 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -631,7 +631,6 @@ msgstr "Benutzerdefinierter Feldwert erfolgreich %{action}" msgid "Please select a custom field first" msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld" -#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format @@ -915,7 +914,6 @@ msgstr "Beitragsart ändern" msgid "Contribution Start" msgstr "Beitragsbeginn" -#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format, fuzzy msgid "Contribution Types" @@ -926,11 +924,6 @@ msgstr "Beitragsarten" msgid "Contribution type" msgstr "Beitragsart" -#: lib/mv_web/components/layouts/sidebar.ex -#, elixir-autogen, elixir-format, fuzzy -msgid "Contributions" -msgstr "Beiträge" - #: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format, fuzzy msgid "Contributions for %{name}" @@ -2188,3 +2181,28 @@ msgstr "Mitglied wurde erfolgreich erstellt" #, elixir-autogen, elixir-format msgid "Member updated successfully" msgstr "Mitglied wurde erfolgreich aktualisiert" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Roles" +msgstr "Rollen" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Fee Settings" +msgstr "Beitragseinstellungen" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Fee Types" +msgstr "Beitragstypen" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Administration" +msgstr "Administration" + +#~ #: lib/mv_web/components/layouts/sidebar.ex +#~ #, elixir-autogen, elixir-format, fuzzy +#~ msgid "Contributions" +#~ msgstr "Beiträge" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 4124d86..b7e0ceb 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -632,7 +632,6 @@ msgstr "" msgid "Please select a custom field first" msgstr "" -#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format @@ -916,7 +915,6 @@ msgstr "" msgid "Contribution Start" msgstr "" -#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Contribution Types" @@ -927,11 +925,6 @@ msgstr "" msgid "Contribution type" msgstr "" -#: lib/mv_web/components/layouts/sidebar.ex -#, elixir-autogen, elixir-format -msgid "Contributions" -msgstr "" - #: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Contributions for %{name}" @@ -2189,3 +2182,23 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Member updated successfully" msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Roles" +msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Fee Settings" +msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Fee Types" +msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Administration" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 50c5440..6001b60 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -632,7 +632,6 @@ msgstr "" msgid "Please select a custom field first" msgstr "" -#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/member_live/form.ex #: lib/mv_web/live/member_live/show.ex #, elixir-autogen, elixir-format, fuzzy @@ -916,7 +915,6 @@ msgstr "" msgid "Contribution Start" msgstr "" -#: lib/mv_web/components/layouts/sidebar.ex #: lib/mv_web/live/contribution_type_live/index.ex #, elixir-autogen, elixir-format msgid "Contribution Types" @@ -927,11 +925,6 @@ msgstr "" msgid "Contribution type" msgstr "" -#: lib/mv_web/components/layouts/sidebar.ex -#, elixir-autogen, elixir-format -msgid "Contributions" -msgstr "" - #: lib/mv_web/live/contribution_period_live/show.ex #, elixir-autogen, elixir-format msgid "Contributions for %{name}" @@ -2189,3 +2182,33 @@ msgstr "Member created successfully" #, elixir-autogen, elixir-format msgid "Member updated successfully" msgstr "Member updated successfully" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Roles" +msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Fee Settings" +msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Fee Types" +msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#, elixir-autogen, elixir-format +msgid "Administration" +msgstr "" + +#~ #: lib/mv_web/components/layouts/sidebar.ex +#~ #, elixir-autogen, elixir-format, fuzzy +#~ msgid "Admin" +#~ msgstr "" + +#~ #: lib/mv_web/components/layouts/sidebar.ex +#~ #, elixir-autogen, elixir-format +#~ msgid "Contributions" +#~ msgstr ""