PR suggestions

thunderbird · May 8, 2024 · 372a098 · 372a098
1 parent 248d7cb
commit 372a098
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/frontend/src/components/SettingsConnections.vue b/frontend/src/components/SettingsConnections.vue
@@ -6,8 +6,18 @@
       <p>{{ t(`text.settings.connectedAccounts.connect.${category}`) }}</p>
       <div v-if="category === 'google'" class="pt-2">
         <p>
-          <i18n-t :keypath="`text.settings.connectedAccounts.connect.${category}Legal.text`" tag="label" :for="`text.settings.connectedAccounts.connect.${category}Legal.link`">
-          <a class="underline" href="https://developers.google.com/terms/api-services-user-data-policy" target="_blank">{{ t(`text.settings.connectedAccounts.connect.${category}Legal.link`) }}</a>
+          <i18n-t
+            :keypath="`text.settings.connectedAccounts.connect.${category}Legal.text`"
+            tag="label"
+            :for="`text.settings.connectedAccounts.connect.${category}Legal.link`"
+          >
+          <a
+            class="underline"
+            href="https://developers.google.com/terms/api-services-user-data-policy"
+            target="_blank"
+          >
+            {{ t(`text.settings.connectedAccounts.connect.${category}Legal.link`) }}
+          </a>
           </i18n-t>
         </p>
       </div>
@@ -38,7 +48,7 @@
     </div>
   </div>
   <!-- Disconnect Google Modal -->
-  <ConfirmationModal
+  <confirmation-modal
       :open="disconnectGoogleModalOpen"
       :title="t('text.settings.connectedAccounts.disconnect.google.title')"
       :message="t('text.settings.connectedAccounts.disconnect.google.message')"
@@ -47,9 +57,9 @@
       :use-caution-button="true"
       @confirm="() => disconnectAccount('google')"
       @close="closeModals"
-  ></ConfirmationModal>
+  ></confirmation-modal>
   <!-- Disconnect Zoom Modal -->
-  <ConfirmationModal
+  <confirmation-modal
       :open="disconnectZoomModalOpen"
       :title="t('text.settings.connectedAccounts.disconnect.zoom.title')"
       :message="t('text.settings.connectedAccounts.disconnect.zoom.message')"
@@ -58,7 +68,7 @@
       :use-caution-button="true"
       @confirm="() => disconnectAccount('zoom')"
       @close="closeModals"
-  ></ConfirmationModal>
+  ></confirmation-modal>
 </template>
 
 <script setup>

diff --git a/frontend/src/stores/external-connections-store.js b/frontend/src/stores/external-connections-store.js
@@ -11,7 +11,7 @@ export const useExternalConnectionsStore = defineStore('externalConnections', ()
   const fxa = ref([]);
   const google = ref([]);
   const connections = computed(() => ({
-    // FXA should be at the top imo
+    // FXA should be at the top since it represents the Appointment subscriber.
     fxa: fxa.value,
     google: google.value,
     zoom: zoom.value,

diff --git a/frontend/src/views/SettingsView.vue b/frontend/src/views/SettingsView.vue
@@ -44,19 +44,10 @@
     </div>
     <!-- content -->
     <div class="w-full pt-2 lg:w-4/5 lg:pt-14">
-
-      <!-- general settings -->
       <settings-general v-if="activeView === settingsSections.general" />
-
-      <!-- calendar settings -->
       <settings-calendar v-if="activeView === settingsSections.calendar" />
-
-      <!-- account settings -->
       <settings-account v-if="activeView === settingsSections.account" />
-
-      <!-- connected accounts -->
       <settings-connections v-if="activeView === settingsSections.connectedAccounts" />
-
     </div>
   </div>
 </template>
@@ -82,7 +73,7 @@ const { t } = useI18n({ useScope: 'global' });
 const route = useRoute();
 const router = useRouter();
 
-const activeView = computed(() => (route.params.view ? settingsSections[route.params.view] : settingsSections.general));
+const activeView = computed(() => (route.params.view && settingsSections[route.params.view] ? settingsSections[route.params.view] : settingsSections.general));
 
 // menu navigation of different views
 const show = (key) => {