diff --git a/packages/hoppscotch-app/assets/icons/verified.svg b/packages/hoppscotch-app/assets/icons/verified.svg new file mode 100644 index 00000000..2a2c4e92 --- /dev/null +++ b/packages/hoppscotch-app/assets/icons/verified.svg @@ -0,0 +1 @@ + diff --git a/packages/hoppscotch-app/components/app/Header.vue b/packages/hoppscotch-app/components/app/Header.vue index 283e58b4..04804d63 100644 --- a/packages/hoppscotch-app/components/app/Header.vue +++ b/packages/hoppscotch-app/components/app/Header.vue @@ -69,6 +69,12 @@ svg="user" /> + - - {{ $t("team.title") }} - - - - - + + + + + + + + + + + + + + {{ currentUser.displayName || $t("state.nothing_found") }} + + + {{ currentUser.email || $t("state.nothing_found") }} + + + + + + + + + {{ $t("settings.sync") }} + + + {{ $t("settings.sync_description") }} + + + + + {{ $t("settings.sync_collections") }} + + + + + {{ $t("settings.sync_environments") }} + + + + + {{ $t("settings.sync_history") }} + + + + + + + + + + + + + + + + + + + diff --git a/packages/hoppscotch-app/pages/settings.vue b/packages/hoppscotch-app/pages/settings.vue index 16f4bab7..790c6c88 100644 --- a/packages/hoppscotch-app/pages/settings.vue +++ b/packages/hoppscotch-app/pages/settings.vue @@ -1,104 +1,6 @@ - - - - {{ $t("settings.account") }} - - - {{ $t("settings.account_description") }} - - - - - - - - - - {{ $t("settings.user") }} - - - - - - - - - - {{ currentUser.displayName || $t("state.nothing_found") }} - - - {{ $t("settings.account_name_description") }} - - - - - - - - - - {{ currentUser.email || $t("state.nothing_found") }} - - - {{ $t("settings.account_email_description") }} - - - - - - - - - {{ $t("settings.sync") }} - - - {{ $t("settings.sync_description") }} - - - - - {{ $t("settings.sync_collections") }} - - - - - {{ $t("settings.sync_environments") }} - - - - - {{ $t("settings.sync_history") }} - - - - - - - - @@ -317,7 +219,6 @@ - import { defineComponent } from "@nuxtjs/composition-api" -import { currentUserInfo$ } from "~/helpers/teams/BackendUserInfo" import { hasExtensionInstalled, hasChromeExtensionInstalled, @@ -349,9 +249,7 @@ import { useSetting, } from "~/newstore/settings" import type { KeysMatching } from "~/types/ts-utils" -import { currentUser$ } from "~/helpers/fb/auth" import { getLocalConfig } from "~/newstore/localpersistence" -import { useReadonlyStream } from "~/helpers/utils/composables" type SettingsType = typeof defaultSettings @@ -362,17 +260,10 @@ export default defineComponent({ PROXY_URL: useSetting("PROXY_URL"), PROXY_KEY: useSetting("PROXY_KEY"), EXTENSIONS_ENABLED: useSetting("EXTENSIONS_ENABLED"), - SYNC_COLLECTIONS: useSetting("syncCollections"), - SYNC_ENVIRONMENTS: useSetting("syncEnvironments"), - SYNC_HISTORY: useSetting("syncHistory"), + EXPERIMENTAL_URL_BAR_ENABLED: useSetting("EXPERIMENTAL_URL_BAR_ENABLED"), TELEMETRY_ENABLED: useSetting("TELEMETRY_ENABLED"), LEFT_SIDEBAR: useSetting("LEFT_SIDEBAR"), ZEN_MODE: useSetting("ZEN_MODE"), - currentUser: useReadonlyStream(currentUser$, currentUser$.value), - currentBackendUser: useReadonlyStream( - currentUserInfo$, - currentUserInfo$.value - ), } }, data() { @@ -386,9 +277,7 @@ export default defineComponent({ clearIcon: "rotate-ccw", - showLogin: false, - - active: getLocalConfig("THEME_COLOR") || "indigo", + active: getLocalConfig("THEME_COLOR") || "blue", confirmRemove: false, } },
+ {{ currentUser.email || $t("state.nothing_found") }} + +
- {{ $t("settings.account_description") }} -
- {{ $t("settings.account_name_description") }} -
- {{ $t("settings.account_email_description") }} -