Skip to content

feat(enhancement): use system dark mode #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2023
Merged

feat(enhancement): use system dark mode #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7952709
Use prefers-color-scheme
rmtsrc Jun 17, 2023
cba7341
Remove theme store
rmtsrc Jun 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions src/components/NavbarButtons.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
<script setup lang="ts">
import { BrandGithub, BrandTwitter, InfoCircle, Moon, Sun } from '@vicons/tabler';
import { useStyleStore } from '@/stores/style.store';
import { useThemeStore } from '@/ui/theme/theme.store';

const styleStore = useStyleStore();
const { isDarkTheme } = toRefs(styleStore);

const themeStore = useThemeStore();

function toggleDarkTheme() {
isDarkTheme.value = !isDarkTheme.value;

themeStore.toggleTheme();
}
</script>

<template>
Expand Down Expand Up @@ -58,7 +49,7 @@ function toggleDarkTheme() {
</n-tooltip>
<n-tooltip trigger="hover">
<template #trigger>
<c-button circle variant="text" aria-label="Toggle dark/light mode" @click="toggleDarkTheme">
<c-button circle variant="text" aria-label="Toggle dark/light mode" @click="() => styleStore.toggleDark()">
<n-icon v-if="isDarkTheme" size="25" :component="Sun" />
<n-icon v-else size="25" :component="Moon" />
</c-button>
Expand Down
6 changes: 4 additions & 2 deletions src/stores/style.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import { useMediaQuery, useStorage } from '@vueuse/core';
import { useDark, useMediaQuery, useStorage, useToggle } from '@vueuse/core';
import { defineStore } from 'pinia';
import { type Ref, watch } from 'vue';

export const useStyleStore = defineStore('style', {
state: () => {
const isDarkTheme = useStorage('isDarkTheme', true) as Ref<boolean>;
const isDarkTheme = useDark();
const toggleDark = useToggle(isDarkTheme);
const isSmallScreen = useMediaQuery('(max-width: 700px)');
const isMenuCollapsed = useStorage('isMenuCollapsed', isSmallScreen.value) as Ref<boolean>;

watch(isSmallScreen, v => (isMenuCollapsed.value = v));

return {
isDarkTheme,
toggleDark,
isMenuCollapsed,
isSmallScreen,
};
Expand Down
6 changes: 3 additions & 3 deletions src/ui/theme/theme.models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useThemeStore } from './theme.store';
import { useStyleStore } from '@/stores/style.store';

export { defineThemes };

function defineThemes<Theme>(themes: { light: Theme; dark: Theme }) {
return {
themes,
useTheme() {
const themeStore = useThemeStore();
return computed(() => themes[themeStore.themeType]);
const styleStore = useStyleStore();
return computed(() => themes[styleStore.isDarkTheme ? 'dark' : 'light']);
},
};
}
20 changes: 0 additions & 20 deletions src/ui/theme/theme.store.ts
View file
Open in desktop

This file was deleted.