gorb/frontend
4
0
Fork 0
Code Issues 15 Pull requests 7 Projects Releases Packages 1 Wiki Activity Actions

Code cleanup #81

Open
twig wants to merge 7 commits from temmie-random-cleanup into main
pull from: temmie-random-cleanup
merge into: gorb:main
Conversation 0 Commits 7 Files changed 10 +11 -13
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e1f30ba9a8 - Show all commits

5
components/Settings/AppSettings/Appearance.vue
View file

@ -51,8 +51,9 @@
<script lang="ts" setup> <script lang="ts" setup>
const runtimeConfig = useRuntimeConfig() const runtimeConfig = useRuntimeConfig()
const baseURL = runtimeConfig.app.baseURL; const baseURL = runtimeConfig.app.baseURL;
const styleFolder = `${baseURL}/themes/style`
const layoutFolder = `${baseURL}/themes/layout` const styleFolder = `${baseURL}themes/style`
const layoutFolder = `${baseURL}themes/layout`
enum StyleLayout { enum StyleLayout {
Style, Style,

19
utils/loadPreferredThemes.ts
View file

@ -2,20 +2,17 @@ let styleLinkElement: HTMLLinkElement | null;
let layoutLinkElement: HTMLLinkElement | null; let layoutLinkElement: HTMLLinkElement | null;
export default () => { export default () => {
const runtimeConfig = useRuntimeConfig() const runtimeConfig = useRuntimeConfig()
const baseURL = runtimeConfig.app.baseURL; const baseURL = runtimeConfig.app.baseURL;
let currentStyle = settingsLoad().selectedThemeStyle ?? undefined
let currentLayout = settingsLoad().selectedThemeLayout ?? `${baseURL}themes/layout/gorb.css`
if (!currentStyle) { let currentStyle = settingsLoad().selectedThemeStyle ?? (
if (prefersLight()) { prefersLight()
currentStyle = `${baseURL}themes/style/light.css` ? `${baseURL}themes/style/light.css`
} else { : `${baseURL}themes/style/dark.css`
currentStyle = `${baseURL}themes/style/dark.css` );
}
} let currentLayout = settingsLoad().selectedThemeLayout ?? `${baseURL}themes/layout/gorb.css`
if (styleLinkElement) { if (styleLinkElement) {
styleLinkElement.href = currentStyle; styleLinkElement.href = currentStyle;