btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: update color-mode usage to new composable

Browse Source
This commit is contained in:
Andrew Bastin
2021-12-17 14:38:32 +05:30
parent 6e53adb5e7
commit 65ee2ebcb2
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/hoppscotch-app/components/app/GitHubStarButton.vue
View File

@@ -4,8 +4,8 @@
title="Star Hoppscotch" title="Star Hoppscotch"
href="https://github.com/hoppscotch/hoppscotch" href="https://github.com/hoppscotch/hoppscotch"
:data-color-scheme=" :data-color-scheme="
$colorMode.value != 'light' colorMode.value != 'light'
? $colorMode.value == 'black' ? colorMode.value == 'black'
? 'dark' ? 'dark'
: 'dark_dimmed' : 'dark_dimmed'
: 'light' : 'light'
@@ -20,6 +20,9 @@
<script setup lang="ts"> <script setup lang="ts">
import GithubButton from "vue-github-button" import GithubButton from "vue-github-button"
import { useColorMode } from "~/helpers/utils/composables"
const colorMode = useColorMode()
defineProps({ defineProps({
size: { size: {

6
packages/hoppscotch-app/layouts/default.vue
View File

@@ -57,7 +57,11 @@ import { logPageView } from "~/helpers/fb/analytics"
import { hookKeybindingsListener } from "~/helpers/keybindings" import { hookKeybindingsListener } from "~/helpers/keybindings"
import { defineActionHandler } from "~/helpers/actions" import { defineActionHandler } from "~/helpers/actions"
import useWindowSize from "~/helpers/utils/useWindowSize" import useWindowSize from "~/helpers/utils/useWindowSize"
<<<<<<< HEAD
import { useSentry } from "~/helpers/sentry" import { useSentry } from "~/helpers/sentry"
=======
import { useColorMode } from "~/helpers/utils/composables"
>>>>>>> refactor: update color-mode usage to new composable
function appLayout() { function appLayout() {
const rightSidebar = useSetting("SIDEBAR") const rightSidebar = useSetting("SIDEBAR")
@@ -99,7 +103,7 @@ function setupSentry() {
} }
function updateThemes() { function updateThemes() {
const { $colorMode } = useContext() as any const $colorMode = useColorMode()
// Apply theme updates // Apply theme updates
const themeColor = useSetting("THEME_COLOR") const themeColor = useSetting("THEME_COLOR")

10
packages/hoppscotch-app/layouts/empty.vue
View File

@@ -3,17 +3,13 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { import { onBeforeMount, watch, defineComponent } from "@nuxtjs/composition-api"
useContext, import { useColorMode } from "~/helpers/utils/composables"
onBeforeMount,
watch,
defineComponent,
} from "@nuxtjs/composition-api"
import { setupLocalPersistence } from "~/newstore/localpersistence" import { setupLocalPersistence } from "~/newstore/localpersistence"
import { useSetting } from "~/newstore/settings" import { useSetting } from "~/newstore/settings"
function updateThemes() { function updateThemes() {
const { $colorMode } = useContext() as any const $colorMode = useColorMode()
// Apply theme updates // Apply theme updates
const themeColor = useSetting("THEME_COLOR") const themeColor = useSetting("THEME_COLOR")