Skip to content

A self-hosted media server and file management system

feat: swap to cedar-ui toasts

aminnausin7b3d952ddc48
diff --git a/resources/css/app.css b/resources/css/app.css
index ac5e2f4c..f6255406 100755
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -1,11 +1,15 @@
@import 'tailwindcss';
+
+@import './theme.css';
+@import './cedar-base.css';
+@import './cedar-theme.css';
+
@plugin '@tailwindcss/forms';
@plugin '@tailwindcss/aspect-ratio';
@plugin 'tailwind-scrollbar-hide';
@config '../../tailwind.config.ts';
-@import './cedar-theme.css';
/*
The default border color has changed to `currentcolor` in Tailwind CSS v4,
so we've added these compatibility styles to make sure everything still
@@ -15,14 +19,6 @@
color utility to any element that depends on these defaults.
*/
@layer base {
- *,
- ::after,
- ::before,
- ::backdrop,
- ::file-selector-button {
- border-color: var(--color-gray-200, currentcolor);
- }
-
[v-cloak] {
display: none;
}
@@ -38,242 +34,45 @@
}
}
-@layer utilities {
- input[type='number']::-webkit-inner-spin-button,
- input[type='number']::-webkit-outer-spin-button {
- -webkit-appearance: none;
- margin: 0;
- }
-
- input[type='number'] {
- appearance: textfield;
- }
-
- @supports (scrollbar-width: thin) {
- .scrollbar-thin {
- scrollbar-width: thin;
- }
- }
-
- @supports selector(::-webkit-scrollbar) {
- .scrollbar-minimal::-webkit-scrollbar {
- width: 0.35rem;
- }
-
- .scrollbar-minimal-x::-webkit-scrollbar {
- height: 0.35rem;
- }
-
- .scrollbar-minimal::-webkit-scrollbar-track,
- .scrollbar-minimal-x::-webkit-scrollbar-track {
- background: transparent;
- border-radius: 9999px;
- }
-
- .scrollbar-minimal::-webkit-scrollbar-thumb,
- .scrollbar-minimal-x::-webkit-scrollbar-thumb {
- background: #8a8a8a;
- border-radius: 9999px;
- }
-
- .scrollbar-minimal::-webkit-scrollbar-thumb:hover,
- .scrollbar-minimal-x::-webkit-scrollbar-thumb:hover {
- background: #636363;
- }
-
- .scrollbar-minimal:is(.dark *)::-webkit-scrollbar-thumb,
- .scrollbar-minimal-x:is(.dark *)::-webkit-scrollbar-thumb {
- background: #9e9e9e;
- }
-
- .scrollbar-minimal:is(.dark *)::-webkit-scrollbar-thumb:hover,
- .scrollbar-minimal-x:is(.dark *)::-webkit-scrollbar-thumb:hover {
- background: #d0d0d0;
- }
-
- .scrollbar-minimal.scrollbar-hover::-webkit-scrollbar,
- .scrollbar-minimal-x.scrollbar-hover::-webkit-scrollbar {
- width: 0rem;
- height: 0rem;
- }
-
- .group:hover .scrollbar-minimal.scrollbar-hover::-webkit-scrollbar {
- width: 0.35rem;
- }
-
- .group:hover .scrollbar-minimal-x.scrollbar-hover::-webkit-scrollbar {
- height: 0.35rem;
- }
- }
-}
-
-@layer components {
- /* PULSE */
- @keyframes detect-scroll {
- from,
- to {
- --can-scroll: ;
- }
- }
-
- .supports-scrollbars {
- animation: detect-scroll linear;
- animation-timeline: scroll(self);
-
- padding-right: var(--can-scroll) --spacing(3);
- }
-
- /* Range Inputs */
- .slider {
- --thumb-size: 2;
- --thumb-rounded: 9999px;
- --track-color: rgba(255, 255, 255, 0.3);
- --track-rounded: 9999px;
- --progress-color: #111827;
- --buffer-color: rgba(255, 255, 255, 0.3);
- --thumb-color: #ffffff;
- --buffer: 0;
-
- appearance: none;
- cursor: pointer;
- overflow: hidden;
-
- background-color: var(--track-color);
- border-radius: var(--track-rounded);
-
- transition:
- height 200ms ease-in-out,
- border-radius 200ms ease-in-out,
- margin 200ms ease-in-out;
- will-change: transform;
- }
-
- .slider.volume {
- --progress-color: #9333eaca;
- }
-
- .slider.timeline {
- --thumb-size: 1;
- height: calc(var(--thumb-size) * 0.25rem);
- margin-top: calc(var(--thumb-size) * 0.125rem);
- margin-bottom: calc(var(--thumb-size) * 0.125rem);
- }
-
- .slider.timeline:hover {
- --thumb-size: 2;
- height: calc(var(--thumb-size) * 0.25rem);
- margin-top: 0rem;
- margin-bottom: 0rem;
- border-radius: 1px;
- }
-
- /* WebKit (Chrome, Safari) */
- .slider::-webkit-slider-thumb {
- transition: all 200ms ease-in-out;
- appearance: none;
- border: 0;
- background: var(--thumb-color);
- border-radius: var(--thumb-rounded);
- width: calc(var(--thumb-size) * 0.25rem);
- height: calc(var(--thumb-size) * 0.25rem);
- box-shadow: -995px 0 0 992px var(--progress-color);
- }
-
- .slider.timeline::-webkit-slider-thumb,
- .slider.timeline::-moz-range-thumb {
- box-shadow: -995px 0 0 993px var(--progress-color);
- }
-
- .slider.timeline:hover::-webkit-slider-thumb,
- .slider.timeline:hover::-moz-range-thumb {
- box-shadow: -995px 0 0 991px var(--progress-color);
- }
-
- .slider::-webkit-slider-runnable-track {
- background: linear-gradient(
- to right,
- var(--buffer-color) 0%,
-
- var(--buffer-color) calc(var(--buffer, 0) * 1%),
- rgba(0, 0, 0, 0) calc(var(--buffer, 0) * 1%),
- rgba(0, 0, 0, 0) 100%
- );
- }
-
- /* Firefox */
- .slider::-moz-range-thumb {
- transition: all 200ms ease-in-out;
- appearance: none;
- border: 0;
- background: var(--thumb-color);
- border-radius: var(--thumb-rounded);
- width: calc(var(--thumb-size) * 0.25rem);
- height: calc(var(--thumb-size) * 0.25rem);
- box-shadow: -995px 0 0 992px var(--progress-color);
- }
-
- .slider::-moz-range-track {
- background: linear-gradient(
- to right,
-
- var(--buffer-color) 0%,
- var(--buffer-color) calc(var(--buffer, 0) * 1%),
- transparent calc(var(--buffer, 0) * 1%),
- transparent 100%
- );
-
- border-radius: var(--track-rounded);
- height: calc(var(--thumb-size) * 0.25rem);
- transition: all 200ms ease-in-out;
- }
-
- .slider::-moz-range-progress {
- transition: all 200ms ease-in-out;
-
- background: transparent;
- height: calc(var(--thumb-size) * 0.25rem);
+@layer base {
+ @theme {
+ /* Colors */
+ --color-primary-800: #f4f4f5;
+ --color-primary-900: #fafafa;
+ --color-primary-950: #fcf9f8;
+
+ --color-primary-dark-600: #2a2a2d;
+ --color-primary-dark-700: #26262a;
+ --color-primary-dark-800: #27272a;
+ --color-primary-dark-900: #18181b;
+ --color-primary-dark-950: #101014;
+
+ --color-accent-500: #f59e0b;
+ --color-accent-600: #ea580c;
+
+ /* Fonts */
+ --font-quicksand: 'Quicksand', sans-serif;
+ --font-figtree: 'Figtree', sans-serif;
+ --font-rubik: 'Rubik', sans-serif;
+ --font-dm-sans: 'DM Sans', sans-serif;
+ --font-klee-one: 'Klee One', 'DM Sans', sans-serif;
+ --font-sans: 'Figtree', ui-sans-serif, system-ui, sans-serif;
+
+ /* Aspect ratios */
+ --aspect-video: 16 / 9;
+ --aspect-square: 1 / 1;
+ --aspect-portrait: 9 / 16;
+ --aspect-1-2: 1 / 2;
+ --aspect-2-3: 2 / 3;
+ --aspect-3-4: 3 / 4;
+
+ /* Breakpoints */
+ --breakpoint-xs: 20rem;
+ --breakpoint-xms: 22.5rem;
+ --breakpoint-xsm: 25rem;
+ --breakpoint-3xl: 125rem;
}
-}
-@theme {
- /* Colors */
- --color-primary-800: #f4f4f5;
- --color-primary-900: #fafafa;
- --color-primary-950: #fcf9f8;
-
- --color-primary-dark-600: #2a2a2d;
- --color-primary-dark-700: #26262a;
- --color-primary-dark-800: #27272a;
- --color-primary-dark-900: #18181b;
- --color-primary-dark-950: #101014;
-
- --color-accent-500: #f59e0b;
- --color-accent-600: #ea580c;
-
- /* Fonts */
- --font-quicksand: 'Quicksand', sans-serif;
- --font-figtree: 'Figtree', sans-serif;
- --font-rubik: 'Rubik', sans-serif;
- --font-dm-sans: 'DM Sans', sans-serif;
- --font-klee-one: 'Klee One', 'DM Sans', sans-serif;
- --font-sans: 'Figtree', ui-sans-serif, system-ui, sans-serif;
-
- /* Aspect ratios */
- --aspect-video: 16 / 9;
- --aspect-square: 1 / 1;
- --aspect-portrait: 9 / 16;
- --aspect-1-2: 1 / 2;
- --aspect-2-3: 2 / 3;
- --aspect-3-4: 3 / 4;
-
- /* Breakpoints */
- --breakpoint-xs: 20rem;
- --breakpoint-xms: 22.5rem;
- --breakpoint-xsm: 25rem;
- --breakpoint-3xl: 125rem;
-}
-
-@layer base {
/* ?
.dark {
--color-primary-800: #27272a;
diff --git a/resources/css/cedar-base.css b/resources/css/cedar-base.css
index 5f5e314e..23c41aaf 100644
--- a/resources/css/cedar-base.css
+++ b/resources/css/cedar-base.css
@@ -1,31 +1,16 @@
@import 'tailwindcss';
-@config '../../tailwind.config.js';
+@config '../../tailwind.config.ts';
/* Global Defaults */
@layer base {
- *,
+ /* *,
::after,
::before,
::backdrop,
::file-selector-button {
- /* @apply border-border; */
- border-color: var(--color-gray-200, currentcolor);
- }
-
- [v-cloak] {
- display: none;
- }
-
- input[type='number']::-webkit-inner-spin-button,
- input[type='number']::-webkit-outer-spin-button {
- -webkit-appearance: none;
- margin: 0;
- }
-
- input[type='number'] {
- appearance: textfield;
- }
+ @apply border-border;
+ } */
}
/* Custom Base Themes */
@@ -59,7 +44,7 @@
/* Scrollbar */
-@layer base {
+/* @layer base {
::-webkit-scrollbar {
width: var(--scrollbar-width);
}
@@ -83,22 +68,17 @@
scrollbar-width: var(--width-scrollbar);
}
- /* Hide until hover */
.scrollbar-hover {
scrollbar-width: none;
- /* scrollbar-color: color-mix(in oklab, oklch(26.9% 0 0) 10%, transparent) color-mix(in oklab, oklch(26.9% 0 0) 00%, transparent); */
}
.group:hover .scrollbar-hover {
scrollbar-width: var(--width-scrollbar);
- /* scrollbar-color: color-mix(in oklab, var(--color-scrollbar-thumb) 100%, transparent)
- color-mix(in oklab, var(--color-scrollbar-track) 00%, transparent); */
}
.scrollable-input {
--color-scrollbar-thumb: var(--color-scrollbar-thumb-2);
--color-scrollbar-track: var(--color-scrollbar-track-2);
- /* scrollbar-color: var(--color-scrollbar-thumb-2) var(--color-scrollbar-track-2); */
}
@supports selector(::-webkit-scrollbar) {
@@ -117,7 +97,7 @@
height: var(--default-scrollbar-width);
}
}
-}
+} */
/* Other Classes */
diff --git a/resources/css/cedar-theme.css b/resources/css/cedar-theme.css
index 4fce04e8..3107e5b6 100644
--- a/resources/css/cedar-theme.css
+++ b/resources/css/cedar-theme.css
@@ -5,6 +5,10 @@
/* Custom Colour Themes */
@layer base {
@theme {
+ --radius: 0.5rem;
+
+ --color-border: hsl(240 5.9% 90%);
+
/* Border radius */
--radius-xl: calc(var(--radius) + 4px);
--radius-lg: var(--radius);
@@ -106,6 +110,8 @@
}
.dark {
+ --color-border: hsl(240 3.7% 15.9%);
+
/* Surfaces (0 is page) */
--color-surface-i: oklch(0.9841 0.0035 39.48); /* primary-950 #fcf9f8 */
--color-surface-0: oklch(0.1749 0.0082 285.52); /* primary-dark-950 #101014 */
diff --git a/resources/css/theme.css b/resources/css/theme.css
new file mode 100644
index 00000000..52228f5d
--- /dev/null
+++ b/resources/css/theme.css
@@ -0,0 +1,203 @@
+@import 'tailwindcss';
+
+@config '../../tailwind.config.ts';
+
+@layer base {
+}
+
+@layer utilities {
+ input[type='number']::-webkit-inner-spin-button,
+ input[type='number']::-webkit-outer-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+ }
+
+ input[type='number'] {
+ appearance: textfield;
+ }
+
+ @supports (scrollbar-width: thin) {
+ .scrollbar-thin {
+ scrollbar-width: thin;
+ }
+ }
+
+ @supports selector(::-webkit-scrollbar) {
+ .scrollbar-minimal::-webkit-scrollbar {
+ width: 0.35rem;
+ }
+
+ .scrollbar-minimal-x::-webkit-scrollbar {
+ height: 0.35rem;
+ }
+
+ .scrollbar-minimal::-webkit-scrollbar-track,
+ .scrollbar-minimal-x::-webkit-scrollbar-track {
+ background: transparent;
+ border-radius: 9999px;
+ }
+
+ .scrollbar-minimal::-webkit-scrollbar-thumb,
+ .scrollbar-minimal-x::-webkit-scrollbar-thumb {
+ background: #8a8a8a;
+ border-radius: 9999px;
+ }
+
+ .scrollbar-minimal::-webkit-scrollbar-thumb:hover,
+ .scrollbar-minimal-x::-webkit-scrollbar-thumb:hover {
+ background: #636363;
+ }
+
+ .scrollbar-minimal:is(.dark *)::-webkit-scrollbar-thumb,
+ .scrollbar-minimal-x:is(.dark *)::-webkit-scrollbar-thumb {
+ background: #9e9e9e;
+ }
+
+ .scrollbar-minimal:is(.dark *)::-webkit-scrollbar-thumb:hover,
+ .scrollbar-minimal-x:is(.dark *)::-webkit-scrollbar-thumb:hover {
+ background: #d0d0d0;
+ }
+
+ .scrollbar-minimal.scrollbar-hover::-webkit-scrollbar,
+ .scrollbar-minimal-x.scrollbar-hover::-webkit-scrollbar {
+ width: 0rem;
+ height: 0rem;
+ }
+
+ .group:hover .scrollbar-minimal.scrollbar-hover::-webkit-scrollbar {
+ width: 0.35rem;
+ }
+
+ .group:hover .scrollbar-minimal-x.scrollbar-hover::-webkit-scrollbar {
+ height: 0.35rem;
+ }
+ }
+}
+
+@layer components {
+ /* PULSE */
+ @keyframes detect-scroll {
+ from,
+ to {
+ --can-scroll: ;
+ }
+ }
+
+ .supports-scrollbars {
+ animation: detect-scroll linear;
+ animation-timeline: scroll(self);
+
+ padding-right: var(--can-scroll) --spacing(3);
+ }
+
+ /* Range Inputs */
+ .slider {
+ --thumb-size: 2;
+ --thumb-rounded: 9999px;
+ --track-color: rgba(255, 255, 255, 0.3);
+ --track-rounded: 9999px;
+ --progress-color: #111827;
+ --buffer-color: rgba(255, 255, 255, 0.3);
+ --thumb-color: #ffffff;
+ --buffer: 0;
+
+ appearance: none;
+ cursor: pointer;
+ overflow: hidden;
+
+ background-color: var(--track-color);
+ border-radius: var(--track-rounded);
+
+ transition:
+ height 200ms ease-in-out,
+ border-radius 200ms ease-in-out,
+ margin 200ms ease-in-out;
+ will-change: transform;
+ }
+
+ .slider.volume {
+ --progress-color: #9333eaca;
+ }
+
+ .slider.timeline {
+ --thumb-size: 1;
+ height: calc(var(--thumb-size) * 0.25rem);
+ margin-top: calc(var(--thumb-size) * 0.125rem);
+ margin-bottom: calc(var(--thumb-size) * 0.125rem);
+ }
+
+ .slider.timeline:hover {
+ --thumb-size: 2;
+ height: calc(var(--thumb-size) * 0.25rem);
+ margin-top: 0rem;
+ margin-bottom: 0rem;
+ border-radius: 1px;
+ }
+
+ /* WebKit (Chrome, Safari) */
+ .slider::-webkit-slider-thumb {
+ transition: all 200ms ease-in-out;
+ appearance: none;
+ border: 0;
+ background: var(--thumb-color);
+ border-radius: var(--thumb-rounded);
+ width: calc(var(--thumb-size) * 0.25rem);
+ height: calc(var(--thumb-size) * 0.25rem);
+ box-shadow: -995px 0 0 992px var(--progress-color);
+ }
+
+ .slider.timeline::-webkit-slider-thumb,
+ .slider.timeline::-moz-range-thumb {
+ box-shadow: -995px 0 0 993px var(--progress-color);
+ }
+
+ .slider.timeline:hover::-webkit-slider-thumb,
+ .slider.timeline:hover::-moz-range-thumb {
+ box-shadow: -995px 0 0 991px var(--progress-color);
+ }
+
+ .slider::-webkit-slider-runnable-track {
+ background: linear-gradient(
+ to right,
+ var(--buffer-color) 0%,
+
+ var(--buffer-color) calc(var(--buffer, 0) * 1%),
+ rgba(0, 0, 0, 0) calc(var(--buffer, 0) * 1%),
+ rgba(0, 0, 0, 0) 100%
+ );
+ }
+
+ /* Firefox */
+ .slider::-moz-range-thumb {
+ transition: all 200ms ease-in-out;
+ appearance: none;
+ border: 0;
+ background: var(--thumb-color);
+ border-radius: var(--thumb-rounded);
+ width: calc(var(--thumb-size) * 0.25rem);
+ height: calc(var(--thumb-size) * 0.25rem);
+ box-shadow: -995px 0 0 992px var(--progress-color);
+ }
+
+ .slider::-moz-range-track {
+ background: linear-gradient(
+ to right,
+
+ var(--buffer-color) 0%,
+ var(--buffer-color) calc(var(--buffer, 0) * 1%),
+ transparent calc(var(--buffer, 0) * 1%),
+ transparent 100%
+ );
+
+ border-radius: var(--track-rounded);
+ height: calc(var(--thumb-size) * 0.25rem);
+ transition: all 200ms ease-in-out;
+ }
+
+ .slider::-moz-range-progress {
+ transition: all 200ms ease-in-out;
+
+ background: transparent;
+ height: calc(var(--thumb-size) * 0.25rem);
+ }
+}
diff --git a/resources/js/App.vue b/resources/js/App.vue
index ff558900..89d9d978 100755
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -1,7 +1,8 @@
<script setup lang="ts">
-import type { ToastPostion } from '@/types/pinesTypes';
+import type { ToastPostion } from '@aminnausin/cedar-ui';
import { onMounted, onUnmounted, ref, watch } from 'vue';
+import { ToastController } from '@/components/cedar-ui/toast';
import { useFullscreen } from '@/composables/useFullscreen';
import { getScreenSize } from '@/service/util';
import { useAuthStore } from '@/stores/AuthStore';
@@ -9,7 +10,6 @@ import { storeToRefs } from 'pinia';
import { useAppStore } from '@/stores/AppStore';
import { RouterView } from 'vue-router';
-import ToastController from '@/components/pinesUI/ToastController.vue';
import ContextMenu from '@/components/pinesUI/ContextMenu.vue';
import GlobalModal from '@/components/modals/GlobalModal.vue';
diff --git a/resources/js/components/cards/LibraryCard.vue b/resources/js/components/cards/LibraryCard.vue
index fda059ae..c8749d78 100644
--- a/resources/js/components/cards/LibraryCard.vue
+++ b/resources/js/components/cards/LibraryCard.vue
@@ -6,7 +6,7 @@ import { startScanFilesTask, startVerifyFilesTask, toggleCategoryPrivacy } from
import { computed, ref, useTemplateRef, watch } from 'vue';
import { useQueryClient } from '@tanstack/vue-query';
import { updateCategory } from '@/service/mediaAPI.ts';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import LibraryCardMenu from '@/components/cards/LibraryCardMenu.vue';
import BasePopover from '@/components/pinesUI/BasePopover.vue';
diff --git a/resources/js/components/dashboard/DashboardActivity.vue b/resources/js/components/dashboard/DashboardActivity.vue
index 3d25d65e..b114b1b4 100644
--- a/resources/js/components/dashboard/DashboardActivity.vue
+++ b/resources/js/components/dashboard/DashboardActivity.vue
@@ -4,7 +4,7 @@ import type { CategoryResource } from '@/types/resources';
import { computed, ref } from 'vue';
import { sortObject } from '@/service/sort/baseSort';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import LibraryCard from '@/components/cards/LibraryCard.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
@@ -51,7 +51,7 @@ const handleSort = async (column: keyof CategoryResource = 'created_at', dir: -1
</script>
<template>
- <div class="flex items-center gap-2 justify-between flex-wrap">
+ <div class="flex flex-wrap items-center justify-between gap-2">
<p class="uppercase">Running: {{ categories?.length }}</p>
<div class="flex flex-wrap items-center gap-2 *:h-8">
<ButtonText title="Start New Task" @click="toast.add('Success', { type: 'success', description: 'Submitted Scan Request!', life: 3000 })" disabled>
diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vue
index a379c04d..a28f9dc2 100644
--- a/resources/js/components/dashboard/DashboardLibraries.vue
+++ b/resources/js/components/dashboard/DashboardLibraries.vue
@@ -11,7 +11,7 @@ import { useQueryClient } from '@tanstack/vue-query';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { sortObject } from '@/service/sort/baseSort';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import LibraryFolderCard from '@/components/cards/LibraryFolderCard.vue';
import LibraryCard from '@/components/cards/LibraryCard.vue';
diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vue
index 75820c27..e32e0ede 100644
--- a/resources/js/components/dashboard/DashboardTasks.vue
+++ b/resources/js/components/dashboard/DashboardTasks.vue
@@ -10,7 +10,7 @@ import { useQueryClient } from '@tanstack/vue-query';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { sortObject } from '@/service/sort/baseSort';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import DashboardTaskMenu from '@/components/dashboard/DashboardTaskMenu.vue';
import BasePopover from '@/components/pinesUI/BasePopover.vue';
@@ -206,14 +206,14 @@ onUnmounted(async () => {
</script>
<template>
- <div class="flex items-center gap-2 justify-between flex-wrap">
+ <div class="flex flex-wrap items-center justify-between gap-2">
<BreadCrumbs :bread-crumbs="breadCrumbs" />
- <span class="flex overflow-clip gap-2 capitalize font-medium">
+ <span class="flex gap-2 overflow-clip font-medium capitalize">
<p class="">Running Tasks: {{ stateTaskStats?.count_running }}</p>
<p class="">Total Tasks: {{ stateTasks.length ?? stateTaskStats?.count_tasks }}</p>
</span>
- <div class="flex flex-wrap items-center gap-2 *:h-fit xs:*:h-8 w-full">
+ <div class="xs:*:h-8 flex w-full flex-wrap items-center gap-2 *:h-fit">
<BasePopover popoverClass="w-52! rounded-lg mt-10" :button-attributes="{ title: 'Start New Task' }" ref="taskPopover">
<template #buttonText>New Task</template>
<template #buttonIcon>
@@ -227,7 +227,7 @@ onUnmounted(async () => {
<template #text>Refresh</template>
<template #icon><ProiconsArrowSync /></template>
</ButtonText>
- <ButtonText :to="'/horizon'" text="Horizon" class="flex-1 xs:flex-initial" :title="'Redis task management (Linux/Docker Only)'">
+ <ButtonText :to="'/horizon'" text="Horizon" class="xs:flex-initial flex-1" :title="'Redis task management (Linux/Docker Only)'">
<template #icon><IconHorizon class="aspect-1 h-full" /></template>
</ButtonText>
</div>
diff --git a/resources/js/components/dashboard/DashboardUsers.vue b/resources/js/components/dashboard/DashboardUsers.vue
index 2250dded..cca59cee 100644
--- a/resources/js/components/dashboard/DashboardUsers.vue
+++ b/resources/js/components/dashboard/DashboardUsers.vue
@@ -8,7 +8,7 @@ import { computed, ref } from 'vue';
import { storeToRefs } from 'pinia';
import { deleteUser } from '@/service/siteAPI';
import { sortObject } from '@/service/sort/baseSort';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import BreadCrumbs from '@/components/pinesUI/BreadCrumbs.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
@@ -116,14 +116,14 @@ const loadData = async (refresh: boolean = false) => {
</script>
<template>
- <div class="flex items-center gap-2 justify-between flex-wrap">
+ <div class="flex flex-wrap items-center justify-between gap-2">
<BreadCrumbs :bread-crumbs="breadCrumbs" />
- <span class="flex overflow-clip gap-2">
- <p class="capitalize font-medium">Users: {{ stateUsers.length }}</p>
- <p class="capitalize font-medium">Active: {{ stateActiveSessions ?? 0 }}</p>
+ <span class="flex gap-2 overflow-clip">
+ <p class="font-medium capitalize">Users: {{ stateUsers.length }}</p>
+ <p class="font-medium capitalize">Active: {{ stateActiveSessions ?? 0 }}</p>
</span>
- <div class="flex flex-wrap items-center gap-2 *:h-fit xs:*:h-8 w-full">
+ <div class="xs:*:h-8 flex w-full flex-wrap items-center gap-2 *:h-fit">
<ButtonText title="Create new user" @click="toast.add('Success', { type: 'success', description: 'User Created!', life: 3000 })" disabled>
<template #text>New User</template>
<template #icon><ProiconsAdd /></template>
diff --git a/resources/js/components/forms/ChangeEmail.vue b/resources/js/components/forms/ChangeEmail.vue
index 0ecce875..b8db2281 100644
--- a/resources/js/components/forms/ChangeEmail.vue
+++ b/resources/js/components/forms/ChangeEmail.vue
@@ -4,7 +4,7 @@ import type { FormField } from '@/types/types';
import { changeEmail } from '@/service/authAPI';
import { reactive } from 'vue';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
@@ -73,14 +73,14 @@ const handleSubmit = async () => {
<h3 class="text-base font-medium">Update Email</h3>
<p class="text-neutral-600 dark:text-neutral-400">Ensure you have secure access to this email.</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 Email </ButtonForm>
</div>
diff --git a/resources/js/components/forms/ChangePassword.vue b/resources/js/components/forms/ChangePassword.vue
index b08c0c71..31133a29 100644
--- a/resources/js/components/forms/ChangePassword.vue
+++ b/resources/js/components/forms/ChangePassword.vue
@@ -4,7 +4,7 @@ import type { FormField } from '@/types/types';
import { changePassword } from '@/service/authAPI';
import { reactive } from 'vue';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vue
index 1a1ff467..fd8366bb 100644
--- a/resources/js/components/forms/EditFolder.vue
+++ b/resources/js/components/forms/EditFolder.vue
@@ -7,7 +7,7 @@ import { handleStorageURL, toCalendarFormattedDate } from '@/service/util';
import { computed, reactive, ref, watch } from 'vue';
import { useGetAllTags } from '@/service/queries';
import { UseCreateTag } from '@/service/mutations';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import FormInputNumber from '@/components/inputs/FormInputNumber.vue';
import InputMultiChip from '@/components/pinesUI/InputMultiChip.vue';
@@ -202,7 +202,7 @@ watch(tagsQuery, () => {
</script>
<template>
- <form class="flex flex-col sm:flex-row sm:justify-between flex-wrap gap-4" @submit.prevent="handleSubmit">
+ <form class="flex flex-col flex-wrap gap-4 sm:flex-row sm:justify-between" @submit.prevent="handleSubmit">
<div v-for="(field, index) in fields" :key="index" class="w-full" :class="field.class">
<FormInputLabel :field="field" />
@@ -223,12 +223,12 @@ watch(tagsQuery, () => {
<FormErrorList :errors="form.errors" :field-name="field.name" />
</div>
- <div class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2 pt-1 w-full">
+ <div class="relative flex w-full flex-col-reverse gap-2 pt-1 sm:flex-row sm:justify-end">
<button
@click="$emit('handleFinish')"
type="button"
- class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors border dark:border-neutral-600 rounded-md focus:outline-hidden"
- :class="'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'"
+ class="inline-flex h-10 items-center justify-center rounded-md border px-4 py-2 text-sm font-medium transition-colors focus:outline-hidden dark:border-neutral-600"
+ :class="'hover:bg-neutral-100 focus:ring-1 focus:ring-neutral-100 focus:ring-offset-1 dark:hover:bg-neutral-900 dark:focus:ring-neutral-400'"
:disabled="form.processing"
>
Cancel
@@ -236,8 +236,8 @@ watch(tagsQuery, () => {
<button
@click="handleSubmit"
type="button"
- class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium text-white transition-colors border border-transparent rounded-md focus:outline-hidden"
- :class="'focus:ring-1 focus:ring-violet-900 focus:ring-offset-1 bg-neutral-950 hover:bg-neutral-800 dark:hover:bg-neutral-900 '"
+ class="inline-flex h-10 items-center justify-center rounded-md border border-transparent px-4 py-2 text-sm font-medium text-white transition-colors focus:outline-hidden"
+ :class="'bg-neutral-950 hover:bg-neutral-800 focus:ring-1 focus:ring-violet-900 focus:ring-offset-1 dark:hover:bg-neutral-900'"
:disabled="form.processing"
>
Submit Details
diff --git a/resources/js/components/forms/EditLyrics.vue b/resources/js/components/forms/EditLyrics.vue
index 6f777537..3665680c 100644
--- a/resources/js/components/forms/EditLyrics.vue
+++ b/resources/js/components/forms/EditLyrics.vue
@@ -8,7 +8,7 @@ import { onMounted, reactive, watch } from 'vue';
import { toFormattedDuration } from '@/service/util';
import { useLyricStore } from '@/stores/LyricStore';
import { storeToRefs } from 'pinia';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import FormInputNumber from '@/components/inputs/FormInputNumber.vue';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vue
index c1812d80..9e5ef4f2 100755
--- a/resources/js/components/forms/EditVideo.vue
+++ b/resources/js/components/forms/EditVideo.vue
@@ -10,7 +10,7 @@ import { useGetAllTags } from '@/service/queries';
import { UseCreateTag } from '@/service/mutations';
import { storeToRefs } from 'pinia';
import { MediaType } from '@/types/types';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import FormInputNumber from '@/components/inputs/FormInputNumber.vue';
import InputMultiChip from '@/components/pinesUI/InputMultiChip.vue';
diff --git a/resources/js/components/forms/PasswordConfirm.vue b/resources/js/components/forms/PasswordConfirm.vue
index 5ff73eca..b78d495e 100644
--- a/resources/js/components/forms/PasswordConfirm.vue
+++ b/resources/js/components/forms/PasswordConfirm.vue
@@ -3,7 +3,7 @@ import type { PasswordRequest } from '@/types/requests';
import type { AxiosResponse } from 'axios';
import type { FormField } from '@/types/types';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
import FormErrorList from '@/components/labels/FormErrorList.vue';
@@ -75,7 +75,7 @@ const handleSubmit = async () => {
<template #footer>
<ButtonForm variant="reset" type="button" :disabled="form.processing" class="capitalize!" @click="$emit('cancel')">{{ cancelText }}</ButtonForm>
- <ButtonForm variant="submit" type="button" @click="handleSubmit" :disabled="form.processing" class="capitalize! bg-rose-600! hover:bg-rose-500!">
+ <ButtonForm variant="submit" type="button" @click="handleSubmit" :disabled="form.processing" class="bg-rose-600! capitalize! hover:bg-rose-500!">
{{ confirmText }}
</ButtonForm>
</template>
diff --git a/resources/js/components/forms/RecoveryForm.vue b/resources/js/components/forms/RecoveryForm.vue
index d08160ac..76b5951f 100644
--- a/resources/js/components/forms/RecoveryForm.vue
+++ b/resources/js/components/forms/RecoveryForm.vue
@@ -3,7 +3,7 @@ import type { FormField } from '@/types/types';
import { recoverAccount } from '@/service/authAPI';
import { RouterLink } from 'vue-router';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
@@ -45,12 +45,12 @@ const handleSubmit = async () => {
<FormErrorList :errors="form.errors" :field-name="field.name" />
</FormItem>
- <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="justify-center! capitalize! w-full">Email password reset link</ButtonForm>
+ <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="w-full justify-center! capitalize!">Email password reset link</ButtonForm>
</BaseForm>
<span class="mx-auto text-gray-600 dark:text-gray-400">
Or, return to
<RouterLink
- class="underline hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+ class="rounded-md underline hover:text-gray-900 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:hover:text-gray-100 dark:focus:ring-offset-gray-800"
to="/login"
>
log in
diff --git a/resources/js/components/forms/ResetPassword.vue b/resources/js/components/forms/ResetPassword.vue
index d589762c..6ad9c673 100644
--- a/resources/js/components/forms/ResetPassword.vue
+++ b/resources/js/components/forms/ResetPassword.vue
@@ -3,7 +3,7 @@ import type { FormField } from '@/types/types';
import { useRoute, useRouter } from 'vue-router';
import { resetPassword } from '@/service/authAPI';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
@@ -78,7 +78,7 @@ const handleSubmit = async () => {
</FormItem>
<template #footer>
- <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="justify-center! capitalize! w-full">Reset Password</ButtonForm>
+ <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="w-full justify-center! capitalize!">Reset Password</ButtonForm>
</template>
</BaseForm>
</template>
diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vue
index 7acdfa6a..9b0761e3 100644
--- a/resources/js/components/pinesUI/InputMultiChip.vue
+++ b/resources/js/components/pinesUI/InputMultiChip.vue
@@ -3,7 +3,7 @@ import { computed, onMounted, ref, useTemplateRef, watch } from 'vue';
import { isInputLikeElement } from '@/service/util';
import { OnClickOutside } from '@vueuse/components';
import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import useMultiSelect from '@/composables/useMultiSelect';
import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
@@ -181,20 +181,20 @@ watch(
ref="selectButton"
@click="select.toggleSelect(true)"
:class="[
- 'relative h-10 py-2 pl-3 pr-10 rounded-md shadow-xs mt-1 w-full flex items-center justify-between text-sm',
- 'focus:outline-hidden border-none cursor-pointer',
+ 'relative mt-1 flex h-10 w-full items-center justify-between rounded-md py-2 pr-10 pl-3 text-sm shadow-xs',
+ 'cursor-pointer border-none focus:outline-hidden',
'disabled:cursor-not-allowed disabled:opacity-50',
- 'text-left text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400',
- 'ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700',
- `${select.selectOpen ? 'hocus:ring-0' : 'hocus:ring-2'} hover:ring-violet-400 dark:hover:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500 focus:outline-hidden`,
+ 'bg-white text-left text-gray-900 placeholder:text-neutral-400 dark:bg-neutral-700 dark:text-neutral-100',
+ 'ring-1 ring-neutral-200 ring-inset dark:ring-neutral-700',
+ `${select.selectOpen ? 'hocus:ring-0' : 'hocus:ring-2'} hover:ring-violet-400 focus:ring-indigo-400 focus:outline-hidden dark:hover:ring-violet-700 dark:focus:ring-indigo-500`,
]"
:disabled="disabled"
type="button"
:title="title ?? 'Make Selection'"
>
<span class="truncate">{{ placeholder }}</span>
- <span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="w-5 h-5 text-gray-400">
+ <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="h-5 w-5 text-gray-400">
<path
fill-rule="evenodd"
d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"
@@ -210,7 +210,7 @@ watch(
'bottom-0 mb-11': select.selectDropdownPosition == 'top',
'top-0 mt-11': select.selectDropdownPosition == 'bottom',
}"
- class="z-30 absolute w-full mt-1 text-sm rounded-md shadow-md focus:outline-hidden ring-1 ring-opacity-5 ring-black dark:ring-neutral-700 bg-white dark:bg-neutral-800/70 backdrop-blur-lg"
+ class="ring-opacity-5 absolute z-30 mt-1 w-full rounded-md bg-white text-sm shadow-md ring-1 ring-black backdrop-blur-lg focus:outline-hidden dark:bg-neutral-800/70 dark:ring-neutral-700"
:options="{ allowOutsideClick: true, initialFocus: selectInput?.$el, returnFocusOnDeactivate: false }"
>
<OnClickOutside
@@ -246,7 +246,7 @@ watch(
@keydown="select.selectKeydown($event)"
v-cloak
>
- <section class="p-2 flex gap-2 w-full" @focusin="lastActiveItemId = -1">
+ <section class="flex w-full gap-2 p-2" @focusin="lastActiveItemId = -1">
<TextInput
:placeholder="'Search for a tag'"
v-model="newValue"
@@ -265,19 +265,19 @@ watch(
/>
<ButtonIcon :type="'button'" :disabled="!newValue" @click="handleCreate" class="ring-inset" title="Add a new tag">
<template #icon>
- <MdiLightPlus class="w-6 h-6" />
+ <MdiLightPlus class="h-6 w-6" />
</template>
</ButtonIcon>
</section>
<section
v-show="filteredItemsList.length == 0"
- class="text-gray-700 dark:text-neutral-300 relative flex items-center h-full py-2 pl-8 select-none"
+ class="relative flex h-full items-center py-2 pl-8 text-gray-700 select-none dark:text-neutral-300"
@focusin="lastActiveItemId = -1"
>
<span class="block truncate">No Results... Add New?</span>
</section>
<ul
- class="max-h-48 overflow-auto scrollbar-thin last:rounded-b-md"
+ class="scrollbar-thin max-h-48 overflow-auto last:rounded-b-md"
aria-describedby="selectable-items-list"
ref="selectableItemsList"
role="listbox"
@@ -293,11 +293,11 @@ watch(
:id="item.id + '-' + select.selectId"
:data-disabled="item.disabled ? item.disabled : ''"
:class="{
- 'bg-neutral-100 dark:bg-neutral-900/70 text-gray-900 dark:text-neutral-100': select.selectableItemActive === item,
+ 'bg-neutral-100 text-gray-900 dark:bg-neutral-900/70 dark:text-neutral-100': select.selectableItemActive === item,
'text-gray-700 dark:text-neutral-300': !select.selectableItemActive === item,
}"
:tabindex="'0'"
- class="relative flex items-center focus:rounded-md h-full py-2 pl-8 cursor-pointer select-none data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"
+ class="relative flex h-full cursor-pointer items-center py-2 pl-8 select-none focus:rounded-md data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50"
role="option"
:aria-selected="select.selectableItemActive === item ? 'true' : 'false'"
>
diff --git a/resources/js/components/video/VideoPartyPanel.vue b/resources/js/components/video/VideoPartyPanel.vue
index f56b5fdb..b74f616e 100644
--- a/resources/js/components/video/VideoPartyPanel.vue
+++ b/resources/js/components/video/VideoPartyPanel.vue
@@ -3,7 +3,7 @@ import type { UserResource } from '@/types/resources';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
import VideoPartyItem from '@/components/video/VideoPartyItem.vue';
@@ -57,7 +57,7 @@ const handleKickUser = (id: number) => {
<p>{{ 1 + partyUsers.length }}</p>
</template>
<template #content>
- <section class="scrollbar-minimal flex h-12 flex-col gap-2 overflow-y-auto p-1 text-xs transition-transform xs:h-24 md:h-fit">
+ <section class="scrollbar-minimal xs:h-24 flex h-12 flex-col gap-2 overflow-y-auto p-1 text-xs transition-transform md:h-fit">
<section class="flex justify-between">
<h3>Party ({{ 1 + partyUsers.length }}/8)</h3>
<span class="flex justify-end gap-1">
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 183c2bdf..53872380 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -19,7 +19,7 @@ import { getMediaUrl } from '@/service/api';
import { useRecord } from '@/service/records/useRecords';
import { MediaType } from '@/types/types';
import { onSeek } from '@/service/player/seekBus';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import { cn } from '@aminnausin/cedar-ui';
import VideoControlWrapper from '@/components/video/VideoControlWrapper.vue';
diff --git a/resources/js/composables/useClipboard.ts b/resources/js/composables/useClipboard.ts
index af57b281..f0516208 100644
--- a/resources/js/composables/useClipboard.ts
+++ b/resources/js/composables/useClipboard.ts
@@ -1,6 +1,6 @@
import type { Ref } from 'vue';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
interface UseClipboard {
diff --git a/resources/js/router/index.ts b/resources/js/router/index.ts
index 6ae88bfb..e97d9fd6 100644
--- a/resources/js/router/index.ts
+++ b/resources/js/router/index.ts
@@ -4,7 +4,7 @@ import { createRouter, createWebHistory } from 'vue-router';
import { useAuthStore } from '@/stores/AuthStore';
import { toTitleCase } from '@/service/util';
import { logout } from '@/service/authAPI';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import ErrorView from '@/views/ErrorView.vue';
import nProgress from 'nprogress';
diff --git a/resources/js/service/api.ts b/resources/js/service/api.ts
index fa89befb..aa8add35 100644
--- a/resources/js/service/api.ts
+++ b/resources/js/service/api.ts
@@ -1,5 +1,5 @@
import { useAuthStore } from '@/stores/AuthStore';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import axios, { AxiosError } from 'axios';
import nProgress from 'nprogress';
diff --git a/resources/js/service/taskService.ts b/resources/js/service/taskService.ts
index 19bb6e45..1fcd9e01 100644
--- a/resources/js/service/taskService.ts
+++ b/resources/js/service/taskService.ts
@@ -2,7 +2,7 @@ import { startIndexFilesTask, startScanFilesTask, startSyncFilesTask, startVerif
import { subscribeToTask } from '@/service/wsService';
import { queryClient } from '@/service/vue-query';
import { useAppStore } from '@/stores/AppStore';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
declare type Job = 'index' | 'sync' | 'verify' | 'scan' | 'verifyFolders';
diff --git a/resources/js/service/wsService.ts b/resources/js/service/wsService.ts
index 88643459..f6453dbf 100644
--- a/resources/js/service/wsService.ts
+++ b/resources/js/service/wsService.ts
@@ -1,5 +1,5 @@
import { useDashboardStore } from '@/stores/DashboardStore';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import { useAppStore } from '@/stores/AppStore';
/**
diff --git a/resources/js/stores/AuthStore.ts b/resources/js/stores/AuthStore.ts
index c16556c9..b3f8cdab 100644
--- a/resources/js/stores/AuthStore.ts
+++ b/resources/js/stores/AuthStore.ts
@@ -3,7 +3,7 @@ import type { UserResource } from '@/types/resources';
import { authenticate } from '@/service/authAPI';
import { defineStore } from 'pinia';
import { AxiosError } from 'axios';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
// This code is not good
diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.ts
index 273d0253..d6547094 100644
--- a/resources/js/stores/ContentStore.ts
+++ b/resources/js/stores/ContentStore.ts
@@ -8,7 +8,7 @@ import { CompareStrategies } from '@/service/sort/strategies';
import { sortObjectNew } from '@/service/sort/baseSort';
import { toParamNumber } from '@/util/route';
import { defineStore } from 'pinia';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import mediaAPI from '@/service/mediaAPI.ts';
diff --git a/resources/js/stores/LyricStore.ts b/resources/js/stores/LyricStore.ts
index 93f48683..f0fd5bdf 100644
--- a/resources/js/stores/LyricStore.ts
+++ b/resources/js/stores/LyricStore.ts
@@ -5,7 +5,7 @@ import { fetchSyncedLyrics, searchSyncedLyrics } from '@/service/lyricsService';
import { defineStore, storeToRefs } from 'pinia';
import { computed, ref, watch } from 'vue';
import { useContentStore } from '@/stores/ContentStore';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import useModal from '@/composables/useModal';
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index 258c5971..bfbc1d8f 100755
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -8,7 +8,7 @@ import { useRecord, useRecords } from '@/service/records/useRecords';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { sortObject } from '@/service/sort/baseSort';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import RecordCardDetails from '@/components/cards/RecordCardDetails.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
diff --git a/resources/js/views/ProfileView.vue b/resources/js/views/ProfileView.vue
index 6a4de9f6..a0ffeef8 100755
--- a/resources/js/views/ProfileView.vue
+++ b/resources/js/views/ProfileView.vue
@@ -2,7 +2,7 @@
import { onMounted, ref } from 'vue';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
import ProfileHeader from '@/components/profile/ProfileHeader.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
@@ -25,7 +25,7 @@ onMounted(() => {
<ProfileHeader />
<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"
+ class="dark:bg-primary-dark-800/70 bg-primary-800 z-3 flex w-full justify-between gap-4 rounded-xl p-3 text-neutral-600 shadow-lg dark:text-neutral-400"
>
<div class="flex flex-col gap-1">
<p class="whitespace-pre">
@@ -45,9 +45,9 @@ Socials:
Stats: 12 items watched | 9 hours total`
}}
</p>
- <p class="text-xs mt-16">This page is a work in progress if it wasn't obvious</p>
+ <p class="mt-16 text-xs">This page is a work in progress if it wasn't obvious</p>
</div>
- <div class="h-6 flex gap-2 text-sm">
+ <div class="flex h-6 gap-2 text-sm">
<ButtonText text="Add Friend" @click="toast.error('Friend not added...', { description: 'You do not know why...' })" />
<ButtonText
text="Block"
diff --git a/resources/js/views/RootView.vue b/resources/js/views/RootView.vue
index 3d97d8b4..bdbb98c3 100644
--- a/resources/js/views/RootView.vue
+++ b/resources/js/views/RootView.vue
@@ -2,7 +2,7 @@
import { onBeforeMount } from 'vue';
import { getCategories } from '@/service/mediaAPI';
import { useRouter } from 'vue-router';
-import { toast } from '@/service/toaster/toastService';
+import { toast } from '@aminnausin/cedar-ui';
const router = useRouter();