Skip to content

A self-hosted media server and file management system

feat: general styling improvements and button style variants

aminnausined3554bfd256
diff --git a/resources/js/components/inputs/ButtonForm.vue b/resources/js/components/inputs/ButtonForm.vue
index eb9fd3c6..757e6bf2 100644
--- a/resources/js/components/inputs/ButtonForm.vue
+++ b/resources/js/components/inputs/ButtonForm.vue
@@ -1,25 +1,45 @@
<script setup lang="ts">
-withDefaults(
+import { computed } from 'vue';
+
+const props = withDefaults(
defineProps<{
disabled?: boolean;
type?: 'button' | 'submit' | 'reset';
+ variant?: 'default' | 'submit' | 'reset';
+ class?: string;
}>(),
{
disabled: false,
type: 'button',
+ class: '',
},
);
+const variantClass = computed(() => {
+ switch (props.variant) {
+ case 'submit':
+ return [
+ 'inline-flex items-center justify-center h-10 max-h-full px-4 py-2 font-medium text-white transition-colors border border-transparent rounded-md focus:outline-none',
+ 'focus:ring-1 focus:ring-violet-900 focus:ring-offset-1 bg-neutral-950 hover:bg-neutral-800 dark:hover:bg-neutral-900',
+ 'disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:hover:ring-1 disabled:opacity-60',
+ ];
+ case 'reset':
+ return [
+ 'inline-flex items-center justify-center h-10 max-h-full px-4 py-2 font-medium transition-colors border dark:border-neutral-600 rounded-md focus:outline-none',
+ 'focus:ring-1 focus:ring-neutral-100 dark:focus:ring-neutral-400 focus:ring-offset-1 hover:bg-neutral-100 dark:hover:bg-neutral-900',
+ 'disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:hover:ring-1 disabled:opacity-60',
+ ];
+ default:
+ return [
+ 'inline-flex items-center justify-center px-4 py-2 text-sm transition-colors border dark:border-neutral-600 rounded-md focus:outline-none',
+ 'focus:ring-1 focus:ring-neutral-100 dark:focus:ring-neutral-400 focus:ring-offset-1 hover:bg-neutral-100 dark:hover:bg-neutral-900',
+ 'disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:hover:ring-1 disabled:opacity-60',
+ ];
+ }
+});
</script>
<template>
- <button
- :type="type"
- :class="[
- 'inline-flex items-center justify-center px-4 py-2 text-sm transition-colors border dark:border-neutral-600 rounded-md focus:outline-none',
- 'focus:ring-1 focus:ring-neutral-100 dark:focus:ring-neutral-400 focus:ring-offset-1 hover:bg-neutral-100 dark:hover:bg-neutral-900',
- 'disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:hover:ring-1 disabled:opacity-60',
- ]"
- :disabled="disabled"
- >
+ <button :type="type" :class="[...variantClass, props.class]" :disabled="disabled">
<slot name="text"></slot>
+ <slot></slot>
</button>
</template>
diff --git a/resources/js/components/inputs/ButtonText.vue b/resources/js/components/inputs/ButtonText.vue
index 3f0b864c..7394be83 100755
--- a/resources/js/components/inputs/ButtonText.vue
+++ b/resources/js/components/inputs/ButtonText.vue
@@ -58,7 +58,7 @@ const variantClass = computed(() => {
<router-link
v-if="to"
:to="to"
- :class="['flex items-center justify-center cursor-pointer', props.class, variantClass]"
+ :class="['flex gap-2 items-center justify-center cursor-pointer', props.class, variantClass]"
:type="type"
:title="title"
:aria-disabled="disabled"
@@ -69,7 +69,7 @@ const variantClass = computed(() => {
</slot>
<slot name="icon"> </slot>
</router-link>
- <button v-else :class="['flex items-center justify-center cursor-pointer', props.class, variantClass]" :type="type" :disabled="disabled" :title="title ?? 'Button'">
+ <button v-else :class="['flex gap-2 items-center justify-center cursor-pointer', props.class, variantClass]" :type="type" :disabled="disabled" :title="title ?? 'Button'">
<slot name="text">
<p class="line-clamp-1 flex-1 text-left" v-if="text">{{ text }}</p>
</slot>
diff --git a/resources/js/components/pinesUI/DropdownMenu.vue b/resources/js/components/pinesUI/DropdownMenu.vue
index c8fc3b4a..4a400e85 100755
--- a/resources/js/components/pinesUI/DropdownMenu.vue
+++ b/resources/js/components/pinesUI/DropdownMenu.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
-import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch, type Component } from 'vue';
import type { DropdownMenuItem } from '@/types/types';
+import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch } from 'vue';
import { handleStartTask } from '@/service/taskService';
import { useContentStore } from '@/stores/ContentStore';
import { OnClickOutside } from '@vueuse/components';
@@ -14,8 +14,8 @@ import LucideLayoutDashboard from '~icons/lucide/layout-dashboard';
import LucideTvMinimalPlay from '~icons/lucide/tv-minimal-play';
import LucideFolderSearch from '~icons/lucide/folder-search';
import LucideFolderCheck from '~icons/lucide/folder-check';
+import ProiconsTaskList from '~icons/proicons/task-list';
import LucideFolderSync from '~icons/lucide/folder-sync';
-import CircumHardDrive from '~icons/circum/hard-drive';
import ProiconsLibrary from '~icons/proicons/library';
import LucideUserPlus from '~icons/lucide/user-plus';
import ProiconsScript from '~icons/proicons/script';
@@ -60,7 +60,7 @@ const dropDownItemsAuth = computed<DropdownMenuItem[][]>(() => {
{ ...defaults, name: 'overview', url: '/dashboard/overview', text: 'Analytics', icon: ProiconsGraph },
{ ...defaults, name: 'libraries', url: '/dashboard/libraries', text: 'Libraries', icon: ProiconsLibrary },
{ ...defaults, name: 'users', url: '/dashboard/users', text: 'Users', icon: LucideUsers },
- { ...defaults, name: 'tasks', url: '/dashboard/tasks', text: 'Tasks', icon: CircumHardDrive, hidden: userData.value?.id !== 1 },
+ { ...defaults, name: 'tasks', url: '/dashboard/tasks', text: 'Tasks', icon: ProiconsTaskList, hidden: userData.value?.id !== 1 },
{ ...defaults, name: 'logs', url: '/log-viewer', text: 'Logs', icon: ProiconsScript, hidden: userData.value?.id !== 1, external: true },
],
[
diff --git a/resources/js/components/profile/ProfileHeader.vue b/resources/js/components/profile/ProfileHeader.vue
index 68955389..23e4d559 100644
--- a/resources/js/components/profile/ProfileHeader.vue
+++ b/resources/js/components/profile/ProfileHeader.vue
@@ -21,7 +21,7 @@ onMounted(async () => {
<section
id="banner"
style="background-image: url('https://s4.anilist.co/file/anilistcdn/user/banner/b6792701-mBLPRvzr3xPL.jpg')"
- class="bg-cover flex rounded-md overflow-clip h-52 lg:h-64 text-white items-end"
+ class="bg-cover flex rounded-md overflow-clip h-52 lg:h-64 text-white items-end shadow-md"
>
<section id="user-header" class="p-3 flex gap-4 bg-gradient-to-b from-transparent to-neutral-950/40 w-full items-end flex-wrap text-center">
<img
diff --git a/resources/js/views/ProfileView.vue b/resources/js/views/ProfileView.vue
index e7eb48f3..2dfa81ec 100755
--- a/resources/js/views/ProfileView.vue
+++ b/resources/js/views/ProfileView.vue
@@ -20,7 +20,10 @@ onMounted(() => {
<template #content>
<section id="content-profile" class="flex flex-col gap-3">
<ProfileHeader />
- <section id="user-info" class="w-full flex justify-between">
+ <section
+ id="user-info"
+ class="w-full flex justify-between gap-4 p-3 rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-primary-800 z-[3] text-neutral-600 dark:text-neutral-400"
+ >
<div class="flex flex-col gap-1">
<p class="whitespace-pre">
{{
diff --git a/resources/js/views/RegisterView.vue b/resources/js/views/RegisterView.vue
index 9ccab647..04caf492 100755
--- a/resources/js/views/RegisterView.vue
+++ b/resources/js/views/RegisterView.vue
@@ -6,13 +6,14 @@ import { register } from '@/service/authAPI';
import { ref } from 'vue';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import FormErrorList from '@/components/labels/FormErrorList.vue';
import LayoutAuth from '@/layouts/LayoutAuth.vue';
import FormInput from '@/components/inputs/FormInput.vue';
import useForm from '@/composables/useForm';
+const { userData } = storeToRefs(useAuthStore());
+
const router = useRouter();
-const authStore = useAuthStore();
-const { userData } = storeToRefs(authStore);
const fields = ref([
{ name: 'name', text: 'Name', type: 'text', required: true, autocomplete: 'name' },
@@ -50,9 +51,7 @@ const handleRegister = async () => {
<template>
<LayoutAuth>
<template #content>
- <div
- class="flex items-center pt-8 sm:justify-start sm:pt-0 text-gray-500 border-gray-400 dark:text-gray-400 dark:border-gray-400"
- >
+ <div class="flex items-center pt-8 sm:justify-start sm:pt-0 text-gray-500 border-gray-400 dark:text-gray-400 dark:border-gray-400">
<div class="px-4 text-lg tracking-wider">Media Server</div>
</div>
<div class="w-full sm:max-w-md mt-6 px-6 py-4 bg-white dark:bg-neutral-800 sm:shadow-md overflow-hidden sm:rounded-lg">
@@ -60,9 +59,9 @@ const handleRegister = async () => {
<div v-for="(field, index) in fields" :key="index">
<FormInputLabel :field="field" />
<FormInput v-model="form.fields[field.name]" :field="field" />
- <ul class="text-sm text-rose-600 dark:text-rose-400">
+ <FormErrorList>
<li v-for="(item, index) in form.errors[field.name]" :key="index">{{ item }}</li>
- </ul>
+ </FormErrorList>
</div>
<div class="flex items-center justify-end mt-4">