Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-28 09:39:39 +02:00
Code Issues Releases Activity Actions

Reorder settings nav and add translations (#680)

Browse source 
* Reorder settings nav and add translations

* Attempt to fix flaky system test
This commit is contained in:
Zach Gollwitzer 2024-04-25 16:31:12 -04:00 • committed by GitHub
parent 8ea7b54fe8
commit e7fe1b5a4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 53 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

41
app/views/settings/_nav.html.erb
View file

@ -10,39 +10,56 @@
<nav class="space-y-4"> <nav class="space-y-4">
<section class="space-y-2"> <section class="space-y-2">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h3 class="uppercase text-gray-500 font-medium text-xs">General</h3> <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".general_section_title") %></h3>
<div class="h-px bg-alpha-black-100 w-full"></div> <div class="h-px bg-alpha-black-100 w-full"></div>
</div> </div>
<ul class="space-y-1"> <ul class="space-y-1">
<li> <li>
<%= sidebar_link_to t(".profile_label"), settings_profile_path, icon: "circle-user" %> <%= sidebar_link_to t(".profile_label"), settings_profile_path, icon: "circle-user" %>
</li>
<li>
<%= sidebar_link_to t(".preferences_label"), settings_preferences_path, icon: "bolt" %> <%= sidebar_link_to t(".preferences_label"), settings_preferences_path, icon: "bolt" %>
</li>
<li>
<%= sidebar_link_to t(".notifications_label"), settings_notifications_path, icon: "bell-dot" %> <%= sidebar_link_to t(".notifications_label"), settings_notifications_path, icon: "bell-dot" %>
</li>
<li>
<%= sidebar_link_to t(".security_label"), settings_security_path, icon: "shield-check" %> <%= sidebar_link_to t(".security_label"), settings_security_path, icon: "shield-check" %>
</li>
<li>
<%= sidebar_link_to t(".billing_label"), settings_billing_path, icon: "circle-dollar-sign" %> <%= sidebar_link_to t(".billing_label"), settings_billing_path, icon: "circle-dollar-sign" %>
</li> </li>
<% if self_hosted? %>
<li>
<%= sidebar_link_to t(".self_hosting_label"), settings_hosting_path, icon: "database" %>
</li>
<% end %>
<li>
<%= sidebar_link_to t(".accounts_label"), accounts_path, icon: "layers" %>
</li>
</li>
</ul> </ul>
</section> </section>
<section class="space-y-2"> <section class="space-y-2">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h3 class="uppercase text-gray-500 font-medium text-xs">Setup</h3> <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".transactions_section_title") %></h3>
<div class="h-px bg-alpha-black-100 w-full"></div> <div class="h-px bg-alpha-black-100 w-full"></div>
</div> </div>
<ul class="space-y-1"> <ul class="space-y-1">
<li> <li>
<% if self_hosted? %>
<%= sidebar_link_to t(".self_hosting_label"), settings_hosting_path, icon: "database" %>
<% end %>
<%= sidebar_link_to t(".accounts_label"), accounts_path, icon: "layers" %>
<%= sidebar_link_to t(".categories_label"), transactions_categories_path, icon: "tags" %> <%= sidebar_link_to t(".categories_label"), transactions_categories_path, icon: "tags" %>
</li>
<li>
<%= sidebar_link_to t(".merchants_label"), transactions_merchants_path, icon: "store" %> <%= sidebar_link_to t(".merchants_label"), transactions_merchants_path, icon: "store" %>
</li>
<li>
<%= sidebar_link_to t(".rules_label"), transactions_rules_path, icon: "list-checks" %> <%= sidebar_link_to t(".rules_label"), transactions_rules_path, icon: "list-checks" %>
</li> </li>
</ul> </ul>
</section> </section>
<section class="space-y-2"> <section class="space-y-2">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h3 class="uppercase text-gray-500 font-medium text-xs">More</h3> <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".other_section_title") %></h3>
<div class="h-px bg-alpha-black-100 w-full"></div> <div class="h-px bg-alpha-black-100 w-full"></div>
</div> </div>
<ul class="space-y-1"> <ul class="space-y-1">
@ -52,5 +69,5 @@
<%= sidebar_link_to t(".invite_label"), invites_path, icon: "gift" %> <%= sidebar_link_to t(".invite_label"), invites_path, icon: "gift" %>
</li> </li>
</ul> </ul>
</section> </section>
</nav> </nav>

3
config/locales/views/settings/en.yml
View file

@ -48,14 +48,17 @@ en:
billing_label: Billing billing_label: Billing
categories_label: Categories categories_label: Categories
feedback_label: Feedback feedback_label: Feedback
general_section_title: General
invite_label: Invite friends invite_label: Invite friends
merchants_label: Merchants merchants_label: Merchants
notifications_label: Notifications notifications_label: Notifications
other_section_title: More
preferences_label: Preferences preferences_label: Preferences
profile_label: Account profile_label: Account
rules_label: Rules rules_label: Rules
security_label: Security security_label: Security
self_hosting_label: Self-Hosting self_hosting_label: Self-Hosting
transactions_section_title: Transactions
whats_new_label: What's New whats_new_label: What's New
nav_link_large: nav_link_large:
next: Next next: Next

3
test/system/settings_test.rb
View file

@ -48,6 +48,9 @@ class SettingsTest < ApplicationSystemTestCase
test "can see conditional nav items" do test "can see conditional nav items" do
ENV["SELF_HOSTING_ENABLED"] = "true" ENV["SELF_HOSTING_ENABLED"] = "true"
visit root_path
sign_in @user
open_settings_from_sidebar open_settings_from_sidebar
click_link "Self-Hosting" click_link "Self-Hosting"