Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia
TypeScript apiapi-clientapi-restapi-testingdeveloper-toolsgraphqlhttphttp-clientpwarestrest-apispatestingtesting-toolstoolsvuevuejswebsocket
refactor: update color-mode usage to new composable
Andrew Bastin65ee2ebcb2be
diff --git a/packages/hoppscotch-app/components/app/GitHubStarButton.vue b/packages/hoppscotch-app/components/app/GitHubStarButton.vueindex 671144be9..a844ba415 100644--- a/packages/hoppscotch-app/components/app/GitHubStarButton.vue+++ b/packages/hoppscotch-app/components/app/GitHubStarButton.vue@@ -4,8 +4,8 @@title="Star Hoppscotch"href="https://github.com/hoppscotch/hoppscotch":data-color-scheme="- $colorMode.value != 'light'- ? $colorMode.value == 'black'+ colorMode.value != 'light'+ ? colorMode.value == 'black'? 'dark': 'dark_dimmed': 'light'@@ -20,6 +20,9 @@<script setup lang="ts">import GithubButton from "vue-github-button"+import { useColorMode } from "~/helpers/utils/composables"++const colorMode = useColorMode()defineProps({size: {diff --git a/packages/hoppscotch-app/layouts/default.vue b/packages/hoppscotch-app/layouts/default.vueindex 0be719766..e7b5d0d64 100644--- a/packages/hoppscotch-app/layouts/default.vue+++ b/packages/hoppscotch-app/layouts/default.vue@@ -57,7 +57,11 @@ import { logPageView } from "~/helpers/fb/analytics"import { hookKeybindingsListener } from "~/helpers/keybindings"import { defineActionHandler } from "~/helpers/actions"import useWindowSize from "~/helpers/utils/useWindowSize"+<<<<<<< HEADimport { useSentry } from "~/helpers/sentry"+=======+import { useColorMode } from "~/helpers/utils/composables"+>>>>>>> refactor: update color-mode usage to new composablefunction appLayout() {const rightSidebar = useSetting("SIDEBAR")@@ -99,7 +103,7 @@ function setupSentry() {}function updateThemes() {- const { $colorMode } = useContext() as any+ const $colorMode = useColorMode()// Apply theme updatesconst themeColor = useSetting("THEME_COLOR")diff --git a/packages/hoppscotch-app/layouts/empty.vue b/packages/hoppscotch-app/layouts/empty.vueindex 2d7fe5324..8445866e2 100644--- a/packages/hoppscotch-app/layouts/empty.vue+++ b/packages/hoppscotch-app/layouts/empty.vue@@ -3,17 +3,13 @@</template><script lang="ts">-import {- useContext,- onBeforeMount,- watch,- defineComponent,-} from "@nuxtjs/composition-api"+import { onBeforeMount, watch, defineComponent } from "@nuxtjs/composition-api"+import { useColorMode } from "~/helpers/utils/composables"import { setupLocalPersistence } from "~/newstore/localpersistence"import { useSetting } from "~/newstore/settings"function updateThemes() {- const { $colorMode } = useContext() as any+ const $colorMode = useColorMode()// Apply theme updatesconst themeColor = useSetting("THEME_COLOR")