From 7dc32270c5c5d47a5dfd1566519939d08d741027 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Thu, 10 Mar 2022 23:22:49 -0600
Subject: [PATCH] [Vault Refresh] Nav update and Options -> Preferences (#1530)

---
 src/app/layouts/navbar.component.html                |  3 ---
 src/app/oss-routing.module.ts                        |  8 ++++++--
 src/app/oss.module.ts                                |  4 ++--
 ...ons.component.html => preferences.component.html} |  4 ++--
 ...options.component.ts => preferences.component.ts} | 12 ++++++++----
 src/app/settings/settings.component.html             |  4 ++--
 src/locales/en/messages.json                         |  9 ++++++---
 7 files changed, 26 insertions(+), 18 deletions(-)
 rename src/app/settings/{options.component.html => preferences.component.html} (98%)
 rename src/app/settings/{options.component.ts => preferences.component.ts} (94%)

diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html
index 13fc0846..e57001da 100644
--- a/src/app/layouts/navbar.component.html
+++ b/src/app/layouts/navbar.component.html
@@ -24,9 +24,6 @@
         <li class="nav-item" routerLinkActive="active">
           <a class="nav-link" routerLink="/tools">{{ "tools" | i18n }}</a>
         </li>
-        <li class="nav-item" routerLinkActive="active">
-          <a class="nav-link" routerLink="/settings">{{ "settings" | i18n }}</a>
-        </li>
       </ul>
     </div>
     <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
diff --git a/src/app/oss-routing.module.ts b/src/app/oss-routing.module.ts
index 38e1eecb..1f122840 100644
--- a/src/app/oss-routing.module.ts
+++ b/src/app/oss-routing.module.ts
@@ -55,8 +55,8 @@ import { CreateOrganizationComponent } from "./settings/create-organization.comp
 import { DomainRulesComponent } from "./settings/domain-rules.component";
 import { EmergencyAccessViewComponent } from "./settings/emergency-access-view.component";
 import { EmergencyAccessComponent } from "./settings/emergency-access.component";
-import { OptionsComponent } from "./settings/options.component";
 import { OrganizationsComponent } from "./settings/organizations.component";
+import { PreferencesComponent } from "./settings/preferences.component";
 import { PremiumComponent } from "./settings/premium.component";
 import { SettingsComponent } from "./settings/settings.component";
 import { SponsoredFamiliesComponent } from "./settings/sponsored-families.component";
@@ -178,7 +178,11 @@ const routes: Routes = [
         children: [
           { path: "", pathMatch: "full", redirectTo: "account" },
           { path: "account", component: AccountComponent, data: { titleId: "myAccount" } },
-          { path: "options", component: OptionsComponent, data: { titleId: "options" } },
+          {
+            path: "preferences",
+            component: PreferencesComponent,
+            data: { titleId: "preferences" },
+          },
           {
             path: "domain-rules",
             component: DomainRulesComponent,
diff --git a/src/app/oss.module.ts b/src/app/oss.module.ts
index 4db91ea0..daa8d37f 100644
--- a/src/app/oss.module.ts
+++ b/src/app/oss.module.ts
@@ -184,10 +184,10 @@ import { EmergencyAccessViewComponent } from "./settings/emergency-access-view.c
 import { EmergencyAccessComponent } from "./settings/emergency-access.component";
 import { EmergencyAddEditComponent } from "./settings/emergency-add-edit.component";
 import { LinkSsoComponent } from "./settings/link-sso.component";
-import { OptionsComponent } from "./settings/options.component";
 import { OrganizationPlansComponent } from "./settings/organization-plans.component";
 import { OrganizationsComponent } from "./settings/organizations.component";
 import { PaymentComponent } from "./settings/payment.component";
+import { PreferencesComponent } from "./settings/preferences.component";
 import { PremiumComponent } from "./settings/premium.component";
 import { ProfileComponent } from "./settings/profile.component";
 import { PurgeVaultComponent } from "./settings/purge-vault.component";
@@ -369,7 +369,6 @@ registerLocaleData(localeZhTw, "zh-TW");
     NavbarComponent,
     NestedCheckboxComponent,
     NotPremiumDirective,
-    OptionsComponent,
     OrgAccountComponent,
     OrgAddEditComponent,
     OrganizationBillingComponent,
@@ -417,6 +416,7 @@ registerLocaleData(localeZhTw, "zh-TW");
     PasswordStrengthComponent,
     PaymentComponent,
     PersonalOwnershipPolicyComponent,
+    PreferencesComponent,
     PremiumBadgeComponent,
     PremiumComponent,
     ProfileComponent,
diff --git a/src/app/settings/options.component.html b/src/app/settings/preferences.component.html
similarity index 98%
rename from src/app/settings/options.component.html
rename to src/app/settings/preferences.component.html
index 90f7294b..16ded564 100644
--- a/src/app/settings/options.component.html
+++ b/src/app/settings/preferences.component.html
@@ -1,7 +1,7 @@
 <div class="page-header">
-  <h1>{{ "options" | i18n }}</h1>
+  <h1>{{ "preferences" | i18n }}</h1>
 </div>
-<p>{{ "optionsDesc" | i18n }}</p>
+<p>{{ "preferencesDesc" | i18n }}</p>
 <form (ngSubmit)="submit()" ngNativeValidate>
   <div class="row">
     <div class="col-6">
diff --git a/src/app/settings/options.component.ts b/src/app/settings/preferences.component.ts
similarity index 94%
rename from src/app/settings/options.component.ts
rename to src/app/settings/preferences.component.ts
index 79068240..97b63352 100644
--- a/src/app/settings/options.component.ts
+++ b/src/app/settings/preferences.component.ts
@@ -10,10 +10,10 @@ import { ThemeType } from "jslib-common/enums/themeType";
 import { Utils } from "jslib-common/misc/utils";
 
 @Component({
-  selector: "app-options",
-  templateUrl: "options.component.html",
+  selector: "app-preferences",
+  templateUrl: "preferences.component.html",
 })
-export class OptionsComponent implements OnInit {
+export class PreferencesComponent implements OnInit {
   vaultTimeoutAction = "lock";
   disableIcons: boolean;
   enableGravatars: boolean;
@@ -107,7 +107,11 @@ export class OptionsComponent implements OnInit {
     if (this.locale !== this.startingLocale) {
       window.location.reload();
     } else {
-      this.platformUtilsService.showToast("success", null, this.i18nService.t("optionsUpdated"));
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("preferencesUpdated")
+      );
     }
   }
 
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index 24d926ad..a0e5a15f 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -7,8 +7,8 @@
           <a routerLink="account" class="list-group-item" routerLinkActive="active">
             {{ "myAccount" | i18n }}
           </a>
-          <a routerLink="options" class="list-group-item" routerLinkActive="active">
-            {{ "options" | i18n }}
+          <a routerLink="preferences" class="list-group-item" routerLinkActive="active">
+            {{ "preferences" | i18n }}
           </a>
           <a routerLink="organizations" class="list-group-item" routerLinkActive="active">
             {{ "organizations" | i18n }}
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 612bf822..88b5c8ac 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1105,11 +1105,14 @@
   "options": {
     "message": "Options"
   },
-  "optionsDesc": {
+  "preferences": {
+    "message": "Preferences"
+  },
+  "preferencesDesc": {
     "message": "Customize your web vault experience."
   },
-  "optionsUpdated": {
-    "message": "Options updated"
+  "preferencesUpdated": {
+    "message": "Preferences updated"
   },
   "language": {
     "message": "Language"