diff --git a/packages/hoppscotch-common/locales/en.json b/packages/hoppscotch-common/locales/en.json index 8066a1c6..24355742 100644 --- a/packages/hoppscotch-common/locales/en.json +++ b/packages/hoppscotch-common/locales/en.json @@ -1037,6 +1037,8 @@ "no_collection": "No collection", "collection_deleted": "associated collection deleted.", "private_access_hint": "For private mock servers, include the header 'x-api-key' with your Personal Access Token (create one from your profile).", + "private_access_instruction": "To access this private mock server, include the header 'x-api-key' with your Personal Access Token.", + "create_token_here": "Create here", "status": "Status", "server_running": "Server is running", "server_stopped": "Server is stopped", diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts index be86b95f..460b9d62 100644 --- a/packages/hoppscotch-common/src/components.d.ts +++ b/packages/hoppscotch-common/src/components.d.ts @@ -327,7 +327,6 @@ declare module 'vue' { TabPrimary: typeof import('./components/tab/Primary.vue')['default'] TabSecondary: typeof import('./components/tab/Secondary.vue')['default'] TabsNav: typeof import('./components/TabsNav.vue')['default'] - Teams: typeof import('./components/teams/index.vue')['default'] TeamsAdd: typeof import('./components/teams/Add.vue')['default'] TeamsEdit: typeof import('./components/teams/Edit.vue')['default'] TeamsInvite: typeof import('./components/teams/Invite.vue')['default'] diff --git a/packages/hoppscotch-common/src/components/TabsNav.vue b/packages/hoppscotch-common/src/components/TabsNav.vue new file mode 100644 index 00000000..bd6869fb --- /dev/null +++ b/packages/hoppscotch-common/src/components/TabsNav.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/packages/hoppscotch-common/src/components/mockServer/ConfigureMockServerModal.vue b/packages/hoppscotch-common/src/components/mockServer/ConfigureMockServerModal.vue index 9eb3d104..4b2ed5ab 100644 --- a/packages/hoppscotch-common/src/components/mockServer/ConfigureMockServerModal.vue +++ b/packages/hoppscotch-common/src/components/mockServer/ConfigureMockServerModal.vue @@ -120,7 +120,15 @@
- {{ t("mock_server.private_access_hint") }} + {{ t("mock_server.private_access_instruction") }} +
@@ -202,6 +210,7 @@ import IconCopy from "~icons/lucide/copy" import IconPlay from "~icons/lucide/play" import IconServer from "~icons/lucide/server" import IconSquare from "~icons/lucide/square" +import IconExternalLink from "~icons/lucide/external-link" const t = useI18n() const toast = useToast() diff --git a/packages/hoppscotch-common/src/components/mockServer/CreateNewMockServerModal.vue b/packages/hoppscotch-common/src/components/mockServer/CreateNewMockServerModal.vue index 81f0cf28..f7d1c725 100644 --- a/packages/hoppscotch-common/src/components/mockServer/CreateNewMockServerModal.vue +++ b/packages/hoppscotch-common/src/components/mockServer/CreateNewMockServerModal.vue @@ -157,7 +157,15 @@
- {{ t("mock_server.private_access_hint") }} + {{ t("mock_server.private_access_instruction") }} +
@@ -309,6 +317,7 @@ import IconCheck from "~icons/lucide/check" import IconPlay from "~icons/lucide/play" import IconServer from "~icons/lucide/server" import IconSquare from "~icons/lucide/square" +import IconExternalLink from "~icons/lucide/external-link" const t = useI18n() const toast = useToast() diff --git a/packages/hoppscotch-common/src/components/mockServer/EditMockServer.vue b/packages/hoppscotch-common/src/components/mockServer/EditMockServer.vue index 71b922d4..9fd240ab 100644 --- a/packages/hoppscotch-common/src/components/mockServer/EditMockServer.vue +++ b/packages/hoppscotch-common/src/components/mockServer/EditMockServer.vue @@ -118,7 +118,15 @@
- {{ t("mock_server.private_access_hint") }} + {{ t("mock_server.private_access_instruction") }} +
@@ -171,6 +179,7 @@ import IconCheck from "~icons/lucide/check" import IconCopy from "~icons/lucide/copy" import IconPlay from "~icons/lucide/play" import IconSquare from "~icons/lucide/square" +import IconExternalLink from "~icons/lucide/external-link" interface Props { show: boolean diff --git a/packages/hoppscotch-common/src/components/profile/index.vue b/packages/hoppscotch-common/src/components/profile/index.vue new file mode 100644 index 00000000..d274a083 --- /dev/null +++ b/packages/hoppscotch-common/src/components/profile/index.vue @@ -0,0 +1,202 @@ + + + diff --git a/packages/hoppscotch-common/src/components/teams/Modal.vue b/packages/hoppscotch-common/src/components/teams/Modal.vue index 736c4da8..59f34f2f 100644 --- a/packages/hoppscotch-common/src/components/teams/Modal.vue +++ b/packages/hoppscotch-common/src/components/teams/Modal.vue @@ -6,7 +6,7 @@ @close="hideModal" > diff --git a/packages/hoppscotch-common/src/components/teams/index.vue b/packages/hoppscotch-common/src/components/teams/View.vue similarity index 100% rename from packages/hoppscotch-common/src/components/teams/index.vue rename to packages/hoppscotch-common/src/components/teams/View.vue diff --git a/packages/hoppscotch-common/src/pages/profile.vue b/packages/hoppscotch-common/src/pages/profile.vue index dad65f92..ce4a167e 100644 --- a/packages/hoppscotch-common/src/pages/profile.vue +++ b/packages/hoppscotch-common/src/pages/profile.vue @@ -71,126 +71,14 @@ - - -
-
-

- {{ t("settings.profile") }} -

-
- {{ t("settings.profile_description") }} -
-
- - - - -
-
- - - - -
-
+
+ -
-

- {{ t("settings.sync") }} -

-
- {{ t("settings.sync_description") }} -
-
-
- - {{ t("settings.sync_collections") }} - -
-
- - {{ t("settings.sync_environments") }} - -
-
- - {{ t("settings.sync_history") }} - -
-
-
- - - - -
- - - - - - - - - - + +
@@ -198,27 +86,21 @@ diff --git a/packages/hoppscotch-common/src/pages/profile/index.vue b/packages/hoppscotch-common/src/pages/profile/index.vue new file mode 100644 index 00000000..6c3ff64b --- /dev/null +++ b/packages/hoppscotch-common/src/pages/profile/index.vue @@ -0,0 +1,5 @@ + + + diff --git a/packages/hoppscotch-common/src/pages/profile/teams.vue b/packages/hoppscotch-common/src/pages/profile/teams.vue new file mode 100644 index 00000000..1fed2ae2 --- /dev/null +++ b/packages/hoppscotch-common/src/pages/profile/teams.vue @@ -0,0 +1,5 @@ + + + diff --git a/packages/hoppscotch-common/src/pages/profile/tokens.vue b/packages/hoppscotch-common/src/pages/profile/tokens.vue new file mode 100644 index 00000000..6327e123 --- /dev/null +++ b/packages/hoppscotch-common/src/pages/profile/tokens.vue @@ -0,0 +1,5 @@ + + +