Skip to content

A self-hosted media server and file management system

feat: modernise toggles

aminnausin39c678df07b4
diff --git a/resources/js/components/inputs/ToggleBase.vue b/resources/js/components/inputs/ToggleBase.vue
index cdc54046..e0e6a4fb 100755
--- a/resources/js/components/inputs/ToggleBase.vue
+++ b/resources/js/components/inputs/ToggleBase.vue
@@ -1,107 +1,41 @@
-<script setup>
-const model = defineModel();
-const { name } = defineProps(['name']);
-// NEEDS A REWORK
-</script>
-
-<template>
- <section class="toggle-switch shrink-0 flex flex-col">
- <label class="switch-label" :for="name">
- <input type="checkbox" class="checkbox peer invisible text-white" :name="name" :id="name" v-model="model" :checked="model" />
- <span class="toggleBase peer-checked:bg-white! dark:peer-checked:bg-neutral-50!"></span>
- </label>
- </section>
-</template>
-
-<style lang="css" scoped>
-.toggle-switch {
- position: relative;
- width: 60px;
- height: 30px;
- --light: #d8dbe0;
- --dark: #27272a;
- --disabled: #d8dbe0;
- --enabled: #27272a;
- --accent: #27272a;
- --link: rgb(27, 129, 112);
- --link-hover: rgb(24, 94, 82);
-}
+<script setup lang="ts">
+import { cn } from '@aminnausin/cedar-ui';
-.switch-label {
- position: absolute;
- width: 100%;
- height: 30px;
- background-color: var(--dark);
- border-radius: 15px;
- cursor: pointer;
- border: 2px solid var(--dark);
+export interface ToggleProps {
+ name?: string;
+ title?: string;
+ knobStyle?: string;
+ class?: string;
}
-.checkbox {
- position: absolute;
- display: none;
-}
-
-.toggle {
- position: absolute;
- width: 100%;
- height: 100%;
- border-radius: 15px;
- -webkit-transition: 0.3s;
- transition: 0.3s;
-}
-
-.toggleBase {
- position: absolute;
- width: 100%;
- height: 100%;
- border-radius: 15px;
- -webkit-transition: 0.3s;
- transition: 0.3s;
-}
-
-.checkbox:checked ~ .toggle,
-.checkbox:checked ~ .toggleBase {
- background-color: var(--light);
-}
-
-.toggle::before {
- content: '';
- position: absolute;
- top: 6px;
- left: 6px;
- width: 15px;
- height: 15px;
- border-radius: 50%;
- -webkit-box-shadow: inset 7px -2px 0px 0px var(--light);
- box-shadow: inset 7px -2px 0px 0px var(--light);
- background-color: var(--dark);
- -webkit-transition: 0.3s;
- transition: 0.3s;
-}
-
-.toggleBase::before {
- content: '';
- position: absolute;
- top: 6px;
- left: 6px;
- width: 15px;
- height: 15px;
- border-radius: 50%;
- -webkit-box-shadow: inset 15px 0px 0px 0px var(--disabled);
- box-shadow: inset 15px 0px 0px 0px var(--disabled);
- background-color: var(--enabled);
- -webkit-transition: 0.3s;
- transition: 0.3s;
-}
+const model = defineModel<boolean>();
+const props = withDefaults(defineProps<ToggleProps>(), { name: 'toggle' });
+</script>
-.checkbox:checked ~ .toggle::before,
-.checkbox:checked ~ .toggleBase::before {
- -webkit-transform: translateX(30px);
- -ms-transform: translateX(30px);
- transform: translateX(30px);
- background-color: var(--accent);
- -webkit-box-shadow: none;
- box-shadow: none;
-}
-</style>
+<template>
+ <label
+ :class="
+ cn(
+ 'group hover:bg-primary-dark-600 hover:has-[input:checked]:bg-primary-800 relative inline-flex h-8 w-16 cursor-pointer items-center rounded-lg border-2 border-zinc-800 bg-zinc-800 transition-colors duration-300 has-checked:bg-white',
+ props.class,
+ )
+ "
+ :title="title ?? name"
+ :for="name"
+ >
+ <input type="checkbox" :id="name" :name="name" v-model="model" class="peer sr-only" />
+
+ <span
+ :class="
+ cn(
+ 'group-hover:bg-primary-dark-600 absolute top-1/4 left-1/8 aspect-square h-1/2 rounded-full bg-zinc-800 shadow-[inset_16px_0_0_0_#fff]',
+ 'transition-all duration-300',
+ 'peer-checked:translate-x-8 peer-checked:overflow-hidden peer-checked:shadow-none',
+ knobStyle,
+ )
+ "
+ >
+ <slot></slot>
+ </span>
+ </label>
+</template>
diff --git a/resources/js/components/inputs/ToggleLightMode.vue b/resources/js/components/inputs/ToggleLightMode.vue
index 7cb0a1e4..141b6101 100755
--- a/resources/js/components/inputs/ToggleLightMode.vue
+++ b/resources/js/components/inputs/ToggleLightMode.vue
@@ -1,116 +1,12 @@
-<script setup>
+<script setup lang="ts">
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
+import ToggleBase from './ToggleBase.vue';
+
const { lightMode } = storeToRefs(useAppStore());
</script>
<template>
- <section class="toggle-switch flex shrink-0 flex-col" title="Toggle Light Mode">
- <label class="switch-label" for="light-mode-toggle">
- <input
- type="checkbox"
- class="checkbox invisible text-white"
- id="light-mode-toggle"
- name="light-mode-toggle"
- v-model="lightMode"
- :checked="lightMode"
- title="Toggle Light Mode"
- />
- <span class="toggle"></span>
- </label>
- </section>
+ <ToggleBase knob-style="shadow-[inset_7px_-2px_0_0_#fff]" title="Toggle Light Mode" name="light-mode-toggle" v-model="lightMode" />
</template>
-
-<style lang="css" scoped>
-.toggle-switch {
- position: relative;
- width: 60px;
- height: 30px;
- --light: #ffffff;
- --dark: #27272a;
- --disabled: #d8dbe0;
- --enabled: #27272a;
- --accent: #27272a;
- --link: rgb(27, 129, 112);
- --link-hover: rgb(24, 94, 82);
-}
-
-.switch-label {
- position: absolute;
- width: 100%;
- height: 30px;
- background-color: var(--dark);
- border-radius: 15px;
- cursor: pointer;
- border: 2px solid var(--dark);
-}
-
-.checkbox {
- position: absolute;
- display: none;
-}
-
-.toggle {
- position: absolute;
- width: 100%;
- height: 100%;
- border-radius: 15px;
- -webkit-transition: 0.3s;
- transition: 0.3s;
-}
-
-.toggleBase {
- position: absolute;
- width: 100%;
- height: 100%;
- border-radius: 15px;
- -webkit-transition: 0.3s;
- transition: 0.3s;
-}
-
-.checkbox:checked ~ .toggle,
-.checkbox:checked ~ .toggleBase {
- background-color: var(--light);
-}
-
-.toggle::before {
- content: '';
- position: absolute;
- top: 6px;
- left: 6px;
- width: 15px;
- height: 15px;
- border-radius: 50%;
- -webkit-box-shadow: inset 7px -2px 0px 0px var(--light);
- box-shadow: inset 7px -2px 0px 0px var(--light);
- background-color: var(--dark);
- -webkit-transition: 0.3s;
- transition: 0.3s;
-}
-
-.toggleBase::before {
- content: '';
- position: absolute;
- top: 6px;
- left: 6px;
- width: 15px;
- height: 15px;
- border-radius: 50%;
- -webkit-box-shadow: inset 15px 0px 0px 0px var(--disabled);
- box-shadow: inset 15px 0px 0px 0px var(--disabled);
- background-color: var(--enabled);
- -webkit-transition: 0.3s;
- transition: 0.3s;
-}
-
-.checkbox:checked ~ .toggle::before,
-.checkbox:checked ~ .toggleBase::before {
- -webkit-transform: translateX(30px);
- -ms-transform: translateX(30px);
- transform: translateX(30px);
- background-color: var(--accent);
- -webkit-box-shadow: none;
- box-shadow: none;
-}
-</style>
diff --git a/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue b/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue
index 224e333f..e7f2622d 100644
--- a/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue
+++ b/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue
@@ -19,16 +19,20 @@ const { ambientMode, playbackHeatmap } = storeToRefs(useAppStore());
</SettingsHeader>
<div class="flex w-full flex-col gap-4 sm:max-w-xs">
<span class="flex items-center justify-between">
- <InputLabel name="ToggleAmbientMode" text="Ambient Mode" class="line-clamp-1" />
+ <InputLabel name="settings-player-ambient" text="Ambient Mode" class="line-clamp-1" />
<div class="flex items-center gap-2">
- <ToggleBase v-model="ambientMode" class="rounded-full dark:ring-2 dark:ring-neutral-700/70" />
+ <ToggleBase v-model="ambientMode" :name="'settings-player-ambient'" class="rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700" />
<p class="w-8 text-end font-medium uppercase">{{ ambientMode ? 'On' : 'Off' }}</p>
</div>
</span>
<span class="flex items-center justify-between">
- <InputLabel name="TogglePlaybackHeatmap" text="Playback Heatmap" class="line-clamp-1" />
+ <InputLabel name="settings-player-heatmap" text="Playback Heatmap" class="line-clamp-1" />
<div class="flex items-center gap-2">
- <ToggleBase v-model="playbackHeatmap" class="rounded-full dark:ring-2 dark:ring-neutral-700/70" />
+ <ToggleBase
+ v-model="playbackHeatmap"
+ :name="'settings-player-heatmap'"
+ class="rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700"
+ />
<p class="w-8 text-end font-medium uppercase">{{ playbackHeatmap ? 'On' : 'Off' }}</p>
</div>
</span>
diff --git a/resources/js/stores/AppStore.ts b/resources/js/stores/AppStore.ts
index d23b8a88..5b0ab362 100644
--- a/resources/js/stores/AppStore.ts
+++ b/resources/js/stores/AppStore.ts
@@ -14,24 +14,26 @@ export const useAppStore = defineStore('App', () => {
const ws = ref<Echo<keyof Broadcaster> | null>(null);
- const pageTitle = ref('');
- const lightMode = ref<null | boolean>(null);
- const ambientMode = ref<null | boolean>(null);
- const playbackHeatmap = ref<null | boolean>(null);
- const isPlaylist = ref<null | boolean>(null);
- const isAutoPlay = ref<boolean>(false);
const selectedSideBar = ref('');
const sideBarTarget = ref('');
+ const pageTitle = ref('');
const scrollLock = ref(false);
+ const playbackHeatmap = ref<boolean>();
+ const ambientMode = ref<boolean>();
+ const lightMode = ref<boolean>();
+
+ const isPlaylist = ref<boolean>();
+ const isAutoPlay = ref<boolean>(false);
+
const contextMenu = useTemplateRef<InstanceType<typeof ContextMenu> | null>('contextMenu');
const contextMenuItems = ref<ContextMenuItem[]>([]);
const contextMenuEvent = ref<MouseEvent>();
const contextMenuItemStyle = ref('');
const contextMenuStyle = ref('');
- const appManifest = ref<AppManifest>({ version: 'Unversioned', commit: null });
const taskWaitTimes = ref<WaitTimesResponse>({ scan: 0, verify_files: 0, verify_folders: 0 });
+ const appManifest = ref<AppManifest>({ version: 'Unversioned', commit: null });
function toggleDarkMode() {
const rootHTML = document.querySelector('html');
@@ -48,8 +50,9 @@ export const useAppStore = defineStore('App', () => {
}
function initDarkMode() {
- const init = lightMode.value === null;
+ const init = lightMode.value === undefined;
const cachedState = localStorage.getItem('lightMode');
+
if (!init) return;
lightMode.value = cachedState === 'true';
@@ -61,7 +64,7 @@ export const useAppStore = defineStore('App', () => {
}
function initAmbientMode() {
- const init = ambientMode.value === null;
+ const init = ambientMode.value === undefined;
const cachedState = localStorage.getItem('ambientMode');
if (!init) return;
@@ -74,7 +77,7 @@ export const useAppStore = defineStore('App', () => {
}
function initPlaybackHeatmap() {
- const init = playbackHeatmap.value === null;
+ const init = playbackHeatmap.value === undefined;
const cachedState = localStorage.getItem('playbackHeatmap');
if (!init) return;
@@ -87,7 +90,7 @@ export const useAppStore = defineStore('App', () => {
}
function initIsPlaylist() {
- const init = isPlaylist.value === null;
+ const init = isPlaylist.value === undefined;
const cachedState = localStorage.getItem('isPlaylist');
if (!init) return;
@@ -114,7 +117,7 @@ export const useAppStore = defineStore('App', () => {
scrollLock.value = state;
}
- function booleanToString(val: null | boolean) {
+ function booleanToString(val: undefined | boolean) {
return val ? 'true' : 'false';
}