Skip to content

A self-hosted media server and file management system

feat: add toggle for modern player ui

aminnausinc3c03ff76cfb
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 6fc8b537..ff558900 100755
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -15,8 +15,19 @@ import GlobalModal from '@/components/modals/GlobalModal.vue';
const toastPosition = ref<ToastPostion>();
-const { toggleDarkMode, initDarkMode, initAmbientMode, initPlaybackHeatmap, initIsPlaylist, setAmbientMode, setPlaybackHeatmap, setIsPlaylist } = useAppStore();
-const { lightMode, ambientMode, playbackHeatmap, contextMenuItems, contextMenuStyle, contextMenuItemStyle, isPlaylist } = storeToRefs(useAppStore());
+const {
+ toggleDarkMode,
+ initDarkMode,
+ initAmbientMode,
+ initPlaybackHeatmap,
+ initIsPlaylist,
+ initPlayerModernUI,
+ setAmbientMode,
+ setPlaybackHeatmap,
+ setIsPlaylist,
+ setPlayerModernUI,
+} = useAppStore();
+const { lightMode, ambientMode, playbackHeatmap, contextMenuItems, contextMenuStyle, contextMenuItemStyle, isPlaylist, usingPlayerModernUI } = storeToRefs(useAppStore());
const { isFullscreen } = useFullscreen();
async function loadUser() {
@@ -29,6 +40,7 @@ onMounted(async () => {
initAmbientMode();
initPlaybackHeatmap();
initIsPlaylist();
+ initPlayerModernUI();
toastPosition.value = getScreenSize() === 'default' ? 'top-center' : 'bottom-left';
loadUser();
@@ -44,6 +56,7 @@ watch(ambientMode, setAmbientMode, { immediate: false });
watch(lightMode, toggleDarkMode, { immediate: false });
watch(playbackHeatmap, setPlaybackHeatmap, { immediate: false });
watch(isPlaylist, setIsPlaylist, { immediate: false });
+watch(usingPlayerModernUI, setPlayerModernUI, { immediate: false });
</script>
<template>
diff --git a/resources/js/components/forms/ChangePassword.vue b/resources/js/components/forms/ChangePassword.vue
index 1c58f42b..b08c0c71 100644
--- a/resources/js/components/forms/ChangePassword.vue
+++ b/resources/js/components/forms/ChangePassword.vue
@@ -85,14 +85,14 @@ const handleSubmit = async () => {
<h3 class="text-base font-medium">Update password</h3>
<p class="text-neutral-600 dark:text-neutral-400">Ensure your account is using a long, random password to stay secure.</p>
</SettingsHeader>
- <form class="flex flex-col sm:flex-row sm:justify-between flex-wrap gap-4 w-full max-w-xl" @submit.prevent="handleSubmit">
+ <form class="flex w-full max-w-xl flex-col flex-wrap gap-4 sm:flex-row sm:justify-between" @submit.prevent="handleSubmit">
<div v-for="(field, index) in fields.filter((field) => !field.disabled)" :key="index" class="w-full" :class="field.class">
<FormInputLabel :field="field" />
<FormInput v-model="form.fields[field.name]" :field="field" :class="'dark:bg-primary-dark-900/70 bg-white ring-neutral-300 dark:ring-neutral-800'" />
<FormErrorList :errors="form.errors" :field-name="field.name" />
</div>
- <div class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2 w-full">
+ <div class="relative flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
<ButtonForm @click="form.reset(...Object.keys(form.fields))" type="button" variant="reset" :disabled="form.processing"> Cancel </ButtonForm>
<ButtonForm @click="handleSubmit" type="button" variant="submit" :disabled="form.processing"> Save Password </ButtonForm>
</div>
diff --git a/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue b/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue
index e7f2622d..f7b0bf30 100644
--- a/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue
+++ b/resources/js/components/settings/preferences/SettingsPlayerPreferences.vue
@@ -7,7 +7,7 @@ import SettingsCard from '@/components/cards/SettingsCard.vue';
import InputLabel from '@/components/labels/InputLabel.vue';
import ToggleBase from '@/components/inputs/ToggleBase.vue';
-const { ambientMode, playbackHeatmap } = storeToRefs(useAppStore());
+const { ambientMode, playbackHeatmap, usingPlayerModernUI } = storeToRefs(useAppStore());
</script>
<template>
@@ -21,7 +21,11 @@ const { ambientMode, playbackHeatmap } = storeToRefs(useAppStore());
<span class="flex items-center justify-between">
<InputLabel name="settings-player-ambient" text="Ambient Mode" class="line-clamp-1" />
<div class="flex items-center gap-2">
- <ToggleBase v-model="ambientMode" :name="'settings-player-ambient'" class="rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700" />
+ <ToggleBase
+ v-model="ambientMode"
+ :name="'settings-player-ambient'"
+ class="h-6 w-12 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>
@@ -31,11 +35,22 @@ const { ambientMode, playbackHeatmap } = storeToRefs(useAppStore());
<ToggleBase
v-model="playbackHeatmap"
:name="'settings-player-heatmap'"
- class="rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700"
+ class="h-6 w-12 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>
+ <span class="flex items-center justify-between">
+ <InputLabel name="settings-player-modern-ui" text="Modern UI" class="line-clamp-1" />
+ <div class="flex items-center gap-2">
+ <ToggleBase
+ v-model="usingPlayerModernUI"
+ :name="'settings-player-modern-ui'"
+ class="h-6 w-12 rounded-full dark:border-neutral-700/70 dark:has-checked:border-neutral-700"
+ />
+ <p class="w-8 text-end font-medium uppercase">{{ usingPlayerModernUI ? 'On' : 'Off' }}</p>
+ </div>
+ </span>
</div>
</template>
</SettingsCard>
diff --git a/resources/js/components/video/VideoControlWrapper.vue b/resources/js/components/video/VideoControlWrapper.vue
index 973a16d7..6a6ed26b 100644
--- a/resources/js/components/video/VideoControlWrapper.vue
+++ b/resources/js/components/video/VideoControlWrapper.vue
@@ -1,8 +1,11 @@
<script setup lang="ts">
-const isBackgroundEnabled = false;
+import { useAppStore } from '@/stores/AppStore';
+import { storeToRefs } from 'pinia';
+
+const { usingPlayerModernUI: isBackgroundEnabled } = storeToRefs(useAppStore());
</script>
<template>
- <section :class="['flex items-center gap-1 rounded-full', { 'bg-neutral-900/60 p-0.5 backdrop-blur-xs xs:p-1': isBackgroundEnabled }]">
+ <section :class="['flex items-center gap-1 rounded-full', { 'xs:p-1 bg-neutral-900/60 p-0.5 backdrop-blur-xs': isBackgroundEnabled }]">
<slot></slot>
</section>
</template>
diff --git a/resources/js/stores/AppStore.ts b/resources/js/stores/AppStore.ts
index 5b0ab362..c0be8592 100644
--- a/resources/js/stores/AppStore.ts
+++ b/resources/js/stores/AppStore.ts
@@ -19,6 +19,7 @@ export const useAppStore = defineStore('App', () => {
const pageTitle = ref('');
const scrollLock = ref(false);
+ const usingPlayerModernUI = ref<boolean>();
const playbackHeatmap = ref<boolean>();
const ambientMode = ref<boolean>();
const lightMode = ref<boolean>();
@@ -85,6 +86,19 @@ export const useAppStore = defineStore('App', () => {
localStorage.setItem('playbackHeatmap', booleanToString(playbackHeatmap.value));
}
+ function initPlayerModernUI() {
+ const init = usingPlayerModernUI.value === undefined;
+ const cachedState = localStorage.getItem('playerModernUI');
+ if (!init) return;
+
+ usingPlayerModernUI.value = cachedState === 'true';
+ localStorage.setItem('playerModernUI', booleanToString(usingPlayerModernUI.value));
+ }
+
+ function setPlayerModernUI() {
+ localStorage.setItem('playerModernUI', booleanToString(usingPlayerModernUI.value));
+ }
+
function setIsPlaylist() {
localStorage.setItem('isPlaylist', booleanToString(isPlaylist.value));
}
@@ -155,6 +169,9 @@ export const useAppStore = defineStore('App', () => {
});
return {
+ usingPlayerModernUI,
+ initPlayerModernUI,
+ setPlayerModernUI,
initDarkMode,
toggleDarkMode,
lightMode,