diff --git a/packages/hoppscotch-app/components/app/Footer.vue b/packages/hoppscotch-app/components/app/Footer.vue index 013f9077d..1750af5bc 100644 --- a/packages/hoppscotch-app/components/app/Footer.vue +++ b/packages/hoppscotch-app/components/app/Footer.vue @@ -192,7 +192,6 @@ - { showShortcuts.value = !showShortcuts.value @@ -222,10 +220,6 @@ defineActionHandler("modals.share.toggle", () => { showShare.value = !showShare.value }) -defineActionHandler("modals.search.toggle", () => { - showSearch.value = !showSearch.value -}) - const EXPAND_NAVIGATION = useSetting("EXPAND_NAVIGATION") const SIDEBAR = useSetting("SIDEBAR") const ZEN_MODE = useSetting("ZEN_MODE") diff --git a/packages/hoppscotch-app/components/app/Header.vue b/packages/hoppscotch-app/components/app/Header.vue index a53e7a886..98aac7e70 100644 --- a/packages/hoppscotch-app/components/app/Header.vue +++ b/packages/hoppscotch-app/components/app/Header.vue @@ -25,11 +25,13 @@ :title="`${t('app.search')} /`" svg="search" class="rounded hover:bg-primaryDark focus-visible:bg-primaryDark" - @click.native="invokeAction('modals.search.toggle')" + @click.native="showSearch = true" /> - + + + diff --git a/packages/hoppscotch-app/layouts/default.vue b/packages/hoppscotch-app/layouts/default.vue index ee6bfaa52..c8f8d9aca 100644 --- a/packages/hoppscotch-app/layouts/default.vue +++ b/packages/hoppscotch-app/layouts/default.vue @@ -43,7 +43,6 @@ class="hide-scrollbar !overflow-auto flex flex-col fixed inset-x-0 bottom-0 z-10" > - @@ -119,11 +118,22 @@ function updateThemes() { const themeColor = useSetting("THEME_COLOR") const bgColor = useSetting("BG_COLOR") const fontSize = useSetting("FONT_SIZE") + const EXPAND_NAVIGATION = useSetting("EXPAND_NAVIGATION") const spacerClass = computed(() => { - if (fontSize.value === "small") return "spacer-small" - if (fontSize.value === "large") return "spacer-large" - return "spacer-medium" + if (fontSize.value === "small" && EXPAND_NAVIGATION.value) + return "spacer-small" + if (fontSize.value === "medium" && EXPAND_NAVIGATION.value) + return "spacer-medium" + if (fontSize.value === "large" && EXPAND_NAVIGATION.value) + return "spacer-large" + if ( + (fontSize.value === "small" || + fontSize.value === "medium" || + fontSize.value === "large") && + !EXPAND_NAVIGATION.value + ) + return "spacer-expand" }) // Initially apply @@ -262,28 +272,36 @@ export default defineComponent({ diff --git a/packages/hoppscotch-app/locales/en.json b/packages/hoppscotch-app/locales/en.json index 51beee7b8..7c8c31e37 100644 --- a/packages/hoppscotch-app/locales/en.json +++ b/packages/hoppscotch-app/locales/en.json @@ -45,6 +45,7 @@ "contact_us": "Contact us", "copy": "Copy", "copy_user_id": "Copy User Auth Token", + "discord": "Discord", "documentation": "Documentation", "developer_option": "Developer options", "developer_option_description": "Developer tools which helps in development and maintenance of Hoppscotch.", @@ -58,6 +59,7 @@ "keyboard_shortcuts": "Keyboard shortcuts", "name": "Hoppscotch", "new_version_found": "New version found. Refresh to update.", + "options": "Options", "proxy_privacy_policy": "Proxy privacy policy", "reload": "Reload", "search": "Search", @@ -65,6 +67,7 @@ "shortcuts": "Shortcuts", "spotlight": "Spotlight", "status": "Status", + "status_description": "Check the status of the website", "terms_and_privacy": "Terms and privacy", "twitter": "Twitter", "type_a_command_search": "Type a command or search…", @@ -238,7 +241,8 @@ "hide": { "more": "Hide more", "preview": "Hide Preview", - "sidebar": "Collapse sidebar" + "sidebar": "Collapse sidebar", + "collection": "Collapse Collection Panel" }, "import": { "collections": "Import collections", @@ -264,7 +268,10 @@ "layout": { "column": "Vertical layout", "row": "Horizontal layout", - "zen_mode": "Zen mode" + "zen_mode": "Zen mode", + "collapse_sidebar": "Collapse or Expand the sidebar", + "collapse_collection": "Collapse or Expand Collections", + "name": "Layout" }, "modal": { "collections": "Collections", @@ -342,6 +349,7 @@ "save_as": "Save as", "saved": "Request saved", "share": "Share", + "share_description": "Share Hoppscotch with your friends", "title": "Request", "type": "Request type", "url": "URL", @@ -388,6 +396,7 @@ "font_size_large": "Large", "font_size_medium": "Medium", "font_size_small": "Small", + "follow": "Follow Us", "interceptor": "Interceptor", "interceptor_description": "Middleware between application and APIs.", "language": "Language", @@ -466,7 +475,8 @@ "show": { "code": "Show code", "more": "Show more", - "sidebar": "Expand sidebar" + "sidebar": "Expand sidebar", + "collection": "Expand Collection Panel" }, "socketio": { "communication": "Communication", @@ -514,7 +524,8 @@ "shortcuts": "Browse app faster", "team": "Get in touch with the team", "title": "Support", - "twitter": "Follow us on Twitter" + "twitter": "Follow us on Twitter", + "github": "Follow us on Github" }, "tab": { "authorization": "Authorization",