Skip to content

A self-hosted media server and file management system

feat: redo sidebar cards with cedar-ui components

aminnausin1114f6bf8a5d
diff --git a/package-lock.json b/package-lock.json
index a30b92a8..54994897 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
- "@aminnausin/cedar-ui": "^0.0.12",
+ "@aminnausin/cedar-ui": "^0.0.13",
"@tanstack/vue-query": "^5.77.2",
"@vueuse/components": "^10.11.0",
"@vueuse/core": "^10.11.0",
@@ -95,9 +95,9 @@
}
},
"node_modules/@aminnausin/cedar-ui": {
- "version": "0.0.12",
- "resolved": "https://registry.npmjs.org/@aminnausin/cedar-ui/-/cedar-ui-0.0.12.tgz",
- "integrity": "sha512-iHEI8RnyfwdIubEPlOJp/dzFme6uSUsjLtl2AZSRUKfF6oEtuAFitiD9gPVY01jLG+P5i/gYmaYfnS44NyUs5w==",
+ "version": "0.0.13",
+ "resolved": "https://registry.npmjs.org/@aminnausin/cedar-ui/-/cedar-ui-0.0.13.tgz",
+ "integrity": "sha512-TlsyrxS6NOSSmG+eJN1na7/3k5RBK/DU18hgLVSkH1c3yXANwa7qjFuNiaCLucdsT7+XHHL8x0OE0h/pTq88+A==",
"license": "MIT",
"dependencies": {
"clsx": "^2.1.1",
@@ -339,7 +339,6 @@
}
],
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=18"
},
@@ -363,7 +362,6 @@
}
],
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=18"
}
@@ -2270,7 +2268,6 @@
"integrity": "sha512-tK3GPFWbirvNgsNKto+UmB/cRtn6TZfyw0D6IKrW55n6Vbs7KJoZtI//kpTKzE/DUmmnAFD8/Ca46s7Obs92/w==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"@typescript-eslint/scope-manager": "8.46.4",
"@typescript-eslint/types": "8.46.4",
@@ -2917,7 +2914,6 @@
"resolved": "https://registry.npmjs.org/@vueuse/components/-/components-10.11.1.tgz",
"integrity": "sha512-ThcreQCX/eq61sLkLKjigD4PQvs3Wy4zglICvQH9tP6xl87y5KsQEoizn6OI+R3hrOgwQHLJe7Y0wLLh3fBKcg==",
"license": "MIT",
- "peer": true,
"dependencies": {
"@vueuse/core": "10.11.1",
"@vueuse/shared": "10.11.1",
@@ -2955,7 +2951,6 @@
"resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz",
"integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==",
"license": "MIT",
- "peer": true,
"dependencies": {
"@types/web-bluetooth": "^0.0.20",
"@vueuse/metadata": "10.11.1",
@@ -2997,7 +2992,6 @@
"resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-11.3.0.tgz",
"integrity": "sha512-5fzRl0apQWrDezmobchoiGTkGw238VWESxZHazfhP3RM7pDSiyXy18QbfYkILoYNTd23HPAfQTJpkUc5QbkwTw==",
"license": "MIT",
- "peer": true,
"dependencies": {
"@vueuse/core": "11.3.0",
"@vueuse/shared": "11.3.0",
@@ -3174,7 +3168,6 @@
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"dev": true,
"license": "MIT",
- "peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -3306,7 +3299,6 @@
"integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
"devOptional": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"follow-redirects": "^1.15.6",
"form-data": "^4.0.4",
@@ -3503,7 +3495,6 @@
}
],
"license": "MIT",
- "peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.8.25",
"caniuse-lite": "^1.0.30001754",
@@ -3646,7 +3637,6 @@
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.1.tgz",
"integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
"license": "MIT",
- "peer": true,
"dependencies": {
"@kurkle/color": "^0.3.0"
},
@@ -4235,8 +4225,7 @@
"version": "0.0.1521046",
"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1521046.tgz",
"integrity": "sha512-vhE6eymDQSKWUXwwA37NtTTVEzjtGVfDr3pRbsWEQ5onH/Snp2c+2xZHWJJawG/0hCCJLRGt4xVtEVUVILol4w==",
- "license": "BSD-3-Clause",
- "peer": true
+ "license": "BSD-3-Clause"
},
"node_modules/dom-serializer": {
"version": "2.0.0",
@@ -4547,7 +4536,6 @@
"integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.8.0",
"@eslint-community/regexpp": "^4.12.1",
@@ -4608,7 +4596,6 @@
"integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
"dev": true,
"license": "MIT",
- "peer": true,
"bin": {
"eslint-config-prettier": "bin/cli.js"
},
@@ -4656,7 +4643,6 @@
"integrity": "sha512-A5dRYc3eQ5i2rJFBW8J6F69ur/H7YfYg+5SCg6v829FU0BhM4fUTrRVR2d4MdZgzw0ioJEk6otYHEAnoGFqO4A==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
"natural-compare": "^1.4.0",
@@ -6425,8 +6411,7 @@
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
"integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==",
- "license": "MIT",
- "peer": true
+ "license": "MIT"
},
"node_modules/nth-check": {
"version": "2.1.1",
@@ -6749,7 +6734,6 @@
}
],
"license": "MIT",
- "peer": true,
"dependencies": {
"nanoid": "^3.3.11",
"picocolors": "^1.1.1",
@@ -7304,7 +7288,6 @@
"integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
"dev": true,
"license": "MIT",
- "peer": true,
"bin": {
"prettier": "bin/prettier.cjs"
},
@@ -8135,8 +8118,7 @@
"version": "4.1.17",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.17.tgz",
"integrity": "sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q==",
- "license": "MIT",
- "peer": true
+ "license": "MIT"
},
"node_modules/tapable": {
"version": "2.3.0",
@@ -8259,7 +8241,6 @@
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=12"
},
@@ -8417,7 +8398,6 @@
"integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
"devOptional": true,
"license": "Apache-2.0",
- "peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -8653,7 +8633,6 @@
"integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"esbuild": "^0.25.0",
"fdir": "^6.4.4",
@@ -8796,7 +8775,6 @@
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=12"
},
@@ -8810,7 +8788,6 @@
"integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"@types/chai": "^5.2.2",
"@vitest/expect": "3.2.4",
@@ -8910,7 +8887,6 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz",
"integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==",
"license": "MIT",
- "peer": true,
"dependencies": {
"@vue/compiler-dom": "3.5.24",
"@vue/compiler-sfc": "3.5.24",
@@ -8979,7 +8955,6 @@
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.3.tgz",
"integrity": "sha512-ARBedLm9YlbvQomnmq91Os7ck6efydTSpRP3nuOKCvgJOHNrhRoJDSKtee8kcL1Vf7nz6U+PMBL+hTvR3bTVQg==",
"license": "MIT",
- "peer": true,
"dependencies": {
"@vue/devtools-api": "^6.6.4"
},
diff --git a/package.json b/package.json
index 0b6b4c69..0c14fc53 100755
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
"vue-tsc": "^2.2.8"
},
"dependencies": {
- "@aminnausin/cedar-ui": "^0.0.12",
+ "@aminnausin/cedar-ui": "^0.0.13",
"@tanstack/vue-query": "^5.77.2",
"@vueuse/components": "^10.11.0",
"@vueuse/core": "^10.11.0",
diff --git a/resources/css/cedar-theme.css b/resources/css/cedar-theme.css
index f384d74b..1587e672 100644
--- a/resources/css/cedar-theme.css
+++ b/resources/css/cedar-theme.css
@@ -40,6 +40,8 @@
--color-surface-2: var(--color-white); /* white */
--color-surface-3: oklch(0.9674 0.0013 286.35); /* primary-800 #f4f4f5 */
--color-surface-4: oklch(0.9841 0.0035 39.48);
+ --color-surface-5: var(--color-neutral-200);
+ --color-surface-6: var(--color-neutral-300);
/* Toasts Menus Popovers Dropdowns */
--color-overlay: var(--color-white);
diff --git a/resources/js/components/cards/sidebar/DashboardSidebarCard.vue b/resources/js/components/cards/sidebar/DashboardSidebarCard.vue
index 1a8861fa..869a0ea6 100644
--- a/resources/js/components/cards/sidebar/DashboardSidebarCard.vue
+++ b/resources/js/components/cards/sidebar/DashboardSidebarCard.vue
@@ -7,13 +7,7 @@ import SidebarCard from '@/components/cards/sidebar/SidebarCard.vue';
<template>
<SidebarCard
:class="
- cn(
- 'gap-2',
- 'items-center justify-between',
- 'hover:bg-primary-800 overflow-hidden bg-white capitalize',
- 'ring-primary hover:ring-primary/50 ring-inset hover:ring-2',
- 'aria-disabled:button-disabled',
- )
+ cn('gap-2', 'items-center justify-between', 'overflow-hidden capitalize', 'ring-primary hover:ring-primary/50 ring-inset hover:ring-2', 'aria-disabled:button-disabled')
"
>
<template #header><slot name="header" /></template>
diff --git a/resources/js/components/cards/sidebar/FolderCard.vue b/resources/js/components/cards/sidebar/FolderCard.vue
index fc03bcc7..32b7224c 100644
--- a/resources/js/components/cards/sidebar/FolderCard.vue
+++ b/resources/js/components/cards/sidebar/FolderCard.vue
@@ -2,15 +2,16 @@
import type { FolderResource } from '@/types/resources';
import { formatFileSize, handleStorageURL, toFormattedDate } from '@/service/util';
+import { RelativeHoverCard } from '@/components/cedar-ui/hover-card';
+import { ButtonCorner } from '@/components/cedar-ui/button';
import { useAuthStore } from '@/stores/AuthStore';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
+import { BadgeTag } from '@/components/cedar-ui/badge';
import { computed } from 'vue';
+import { cn } from '@aminnausin/cedar-ui';
-import RelativeHoverCard from '@/components/cards/RelativeHoverCard.vue';
-import ButtonCorner from '@/components/inputs/ButtonCorner.vue';
import SidebarCard from '@/components/cards/sidebar/SidebarCard.vue';
-import ChipTag from '@/components/labels/ChipTag.vue';
import CircumFolderOn from '~icons/circum/folder-on';
import CircumShare1 from '~icons/circum/share-1';
@@ -46,7 +47,7 @@ const mediaType = computed(() => {
</script>
<template>
- <RelativeHoverCard class="w-full" positionClasses="p-0! border-none! z-50 -top-5 lg:-left-24" iconHidden :hoverCardDelay="50" :hoverCardLeaveDelay="50">
+ <RelativeHoverCard class="w-full" positionClasses="p-0 border-none z-50 -top-5 lg:-left-24" iconHidden :hoverCardDelay="50" :hoverCardLeaveDelay="50">
<template #content>
<img
:src="handleStorageURL(data.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
@@ -58,7 +59,7 @@ const mediaType = computed(() => {
<template #trigger>
<SidebarCard
:to="`/${categoryName}/${data.name}`"
- class="dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 hover:bg-gray-200 sm:p-3"
+ class="text-foreground-1 p-0 sm:p-3"
@contextmenu="
(e: any) => {
setContextMenu(e, { items: contextMenuItems });
@@ -74,29 +75,31 @@ const mediaType = computed(() => {
<span class="relative flex w-full flex-1 flex-col flex-wrap gap-4 p-3 text-left sm:flex-row sm:p-0 lg:gap-2">
<section class="flex w-full items-center justify-between gap-4">
<h3
- class="w-full truncate text-gray-900 dark:text-white"
- :title="`${data.id}: ${props.data.series?.title || props.data.name}\nCreated: ${toFormattedDate(props.data.created_at || '')}\nUpdated: ${toFormattedDate(props.data.updated_at || '')}\nScanned: ${toFormattedDate(props.data.scanned_at || '')}`"
+ class="text-foreground-0 w-full truncate"
+ :title="`${data.id}: ${data.series?.title || data.name}\nCreated: ${toFormattedDate(data.created_at || '')}\nUpdated: ${toFormattedDate(data.updated_at || '')}\nScanned: ${toFormattedDate(data.scanned_at || '')}`"
>
- {{ props.data.series?.title || props.data.name }}
+ {{ data.series?.title || data.name }}
</h3>
<div class="flex justify-end gap-1">
<ButtonCorner
- :positionClasses="'w-7 h-7'"
- :textClasses="'hover:text-violet-600 dark:hover:text-violet-500'"
- :colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"
+ class="hover:text-primary dark:hover:text-primary-muted hover:dark:bg-surface-1 hover:bg-surface-6 size-7"
:label="'Share Folder'"
- @click.stop.prevent="emit('otherAction', props.data.id, 'share')"
+ :use-default-style="false"
+ @click.stop.prevent="emit('otherAction', data.id, 'share')"
>
<template #icon>
<CircumShare1 width="20" height="20" stroke-width="1" stroke="currentColor" />
</template>
</ButtonCorner>
<ButtonCorner
- :positionClasses="'w-7 h-7'"
- :textClasses="`${props.data.name === props.stateFolderName ? 'text-violet-600' : 'hover:text-violet-600'} dark:hover:text-violet-500`"
- :colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"
- :to="''"
:label="'Open Folder'"
+ :class="
+ cn(
+ data.name === props.stateFolderName ? 'text-primary' : 'hover:text-primary',
+ 'dark:hover:text-primary-muted hover:dark:bg-surface-1 hover:bg-surface-6 size-7',
+ )
+ "
+ :use-default-style="false"
>
<template #icon>
<CircumFolderOn width="20" height="20" stroke-width="1" stroke="currentColor" />
@@ -104,26 +107,32 @@ const mediaType = computed(() => {
</ButtonCorner>
</div>
</section>
- <section class="text-foreground-1 flex w-full flex-col flex-wrap gap-2 text-sm sm:flex-row sm:justify-between">
- <h4 class="w-full flex-1 truncate text-wrap sm:text-nowrap" :title="`${props.data.file_count} ${mediaType}${props.data.file_count !== 1 ? 's' : ''}`">
- {{ props.data.file_count }} {{ mediaType }}{{ props.data.file_count !== 1 ? 's' : '' }}
+ <section class="flex w-full flex-col flex-wrap gap-2 text-sm sm:flex-row sm:justify-between">
+ <h4 class="w-full flex-1 truncate text-wrap sm:text-nowrap" :title="`${data.file_count} ${mediaType}${data.file_count !== 1 ? 's' : ''}`">
+ {{ data.file_count }} {{ mediaType }}{{ data.file_count !== 1 ? 's' : '' }}
</h4>
<h4 class="w-fit truncate text-nowrap sm:text-right lg:hidden xl:block">
- <!-- some other folder statistic or data like number of seasons or if its popular or something -->
- {{ props.data.total_size ? formatFileSize(props.data.total_size) : '' }}
+ {{ data.total_size ? formatFileSize(data.total_size) : '' }}
</h4>
</section>
</span>
+
<section
- v-if="props.data.series?.folder_tags?.length"
+ v-if="data.series?.folder_tags?.length"
class="flex w-full flex-wrap gap-1 overflow-clip p-3 pt-0 transition-all group-hover:[overflow-clip-margin:4px] sm:max-h-0 sm:p-0 sm:group-hover:max-h-[26px] sm:group-hover:pt-1"
title="Tags"
>
- <ChipTag
- v-for="(tag, index) in props.data.series.folder_tags"
+ <BadgeTag
+ v-for="(tag, index) in data.series.folder_tags"
:key="index"
:label="tag.name"
- :colour="'bg-neutral-200 leading-none shadow-sm dark:bg-neutral-900 hover:bg-violet-600 text-neutral-500 hover:text-neutral-50 dark:hover:bg-violet-600/90 max-h-[22px]!'"
+ :class="
+ cn(
+ 'dark:hover:bg-primary/90 dark:hover:text-foreground-0 dark:bg-neutral-900',
+ 'hover:text-foreground-i text-foreground-7 hover:bg-primary bg-neutral-200',
+ 'max-h-[22px]! leading-none shadow-sm select-none',
+ )
+ "
/>
</section>
</SidebarCard>
diff --git a/resources/js/components/cards/sidebar/RecordCard.vue b/resources/js/components/cards/sidebar/RecordCard.vue
index 8e5cc43d..e483f7f6 100644
--- a/resources/js/components/cards/sidebar/RecordCard.vue
+++ b/resources/js/components/cards/sidebar/RecordCard.vue
@@ -3,12 +3,12 @@ import { type RecordResource } from '@/types/resources';
import { toFormattedDate, toTimeSpan } from '@/service/util';
import { computed, ref, watch } from 'vue';
+import { ButtonCorner } from '@/components/cedar-ui/button';
-import ButtonCorner from '@/components/inputs/ButtonCorner.vue';
+import SidebarCard from '@/components/cards/sidebar/SidebarCard.vue';
import CircumShare1 from '~icons/circum/share-1';
import CircumPlay1 from '~icons/circum/play-1';
-import SidebarCard from '@/components/cards/sidebar/SidebarCard.vue';
const props = defineProps<{
record: RecordResource;
@@ -18,7 +18,7 @@ const props = defineProps<{
const rawDate = new Date((props.record.created_at ?? '').replace(' ', 'T'));
const timeSpan = ref(toTimeSpan(rawDate));
const videoLink = computed(() => {
- if (!(props.record.video_id ?? props.record.metadata?.video_id) || !props.record.category?.name || !props.record.folder_name) return false;
+ if (!(props.record.video_id ?? props.record.metadata?.video_id) || !props.record.category?.name || !props.record.folder_name) return undefined;
return `/${encodeURIComponent(props.record?.category?.name ?? '')}/${encodeURIComponent(props.record.folder_name ?? '')}?video=${props.record.video_id ?? props.record.metadata?.video_id}`;
});
@@ -31,20 +31,16 @@ watch(
</script>
<template>
- <SidebarCard
- :to="videoLink ? videoLink : ''"
- class="dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 group relative flex w-full cursor-pointer flex-col flex-wrap gap-4 divide-gray-300 rounded-lg p-3 text-left text-neutral-600 shadow-sm hover:bg-gray-200 sm:flex-row lg:gap-2 dark:divide-gray-400 dark:text-neutral-400"
- >
+ <SidebarCard :to="videoLink" class="text-foreground-1 gap-4 lg:gap-2">
<section class="flex w-full items-center justify-between gap-4">
- <h3 class="w-full truncate text-gray-900 dark:text-white" :title="props.record.video_name">
- {{ props.record.video_name }}
+ <h3 class="text-foreground-0 w-full truncate" :title="record.video_name">
+ {{ record.video_name }}
</h3>
<div class="flex justify-end gap-1" v-if="videoLink">
<ButtonCorner
- :positionClasses="'w-7 h-7'"
- :textClasses="'hover:text-gray-900 dark:hover:text-violet-400'"
- :colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"
+ :class="'hover:text-primary dark:hover:text-primary-muted hover:dark:bg-surface-1 hover:bg-surface-6 size-7'"
:label="'Share Video'"
+ :use-default-style="false"
@click.stop.prevent="$emit('clickAction', videoLink)"
>
<template #icon>
@@ -52,11 +48,10 @@ watch(
</template>
</ButtonCorner>
<ButtonCorner
- :positionClasses="'w-7 h-7'"
- :textClasses="`hover:text-violet-600 dark:hover:text-violet-500`"
- :colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"
+ :class="'hover:text-primary dark:hover:text-primary-muted hover:dark:bg-surface-1 hover:bg-surface-6 size-7'"
:to="videoLink"
:label="'Watch Video'"
+ :use-default-style="false"
>
<template #icon>
<CircumPlay1 width="20" height="20" stroke-width="1" stroke="currentColor" />
@@ -68,23 +63,23 @@ watch(
</div>
</section>
<section class="flex w-full flex-wrap gap-x-2 text-sm sm:flex-nowrap sm:justify-between">
- <h4 class="hidden w-full shrink-0 truncate text-wrap sm:shrink sm:text-nowrap lg:block" :title="props.record.folder_name">
- {{ props.record.folder_name }}
+ <h4 class="hidden w-full shrink-0 truncate text-wrap sm:shrink sm:text-nowrap lg:block" :title="record.folder_name">
+ {{ record.folder_name }}
</h4>
<h4 class="line-clamp-2 hidden w-full truncate text-right lg:block" :title="toFormattedDate(rawDate)">
{{ timeSpan }}
</h4>
- <h4 class="mr-auto truncate text-wrap sm:text-nowrap lg:hidden">{{ props.record.folder_name }} · {{ timeSpan }}</h4>
+ <h4 class="mr-auto truncate text-wrap sm:text-nowrap lg:hidden">{{ record.folder_name }} · {{ timeSpan }}</h4>
<h4 class="line-clamp-2 truncate text-wrap sm:text-right sm:text-nowrap lg:hidden">
{{
- `${rawDate.toLocaleDateString('en-ca', {
+ rawDate.toLocaleDateString('en-ca', {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
hour12: false,
minute: '2-digit',
- })}`
+ })
}}
</h4>
</section>
diff --git a/resources/js/components/cards/sidebar/SidebarCard.vue b/resources/js/components/cards/sidebar/SidebarCard.vue
index d39ef10e..661340f6 100644
--- a/resources/js/components/cards/sidebar/SidebarCard.vue
+++ b/resources/js/components/cards/sidebar/SidebarCard.vue
@@ -13,6 +13,12 @@ const props = defineProps<{
const wrapper = computed(() => (props.to ? RouterLink : 'a')); // Component is set here but props are set 1 level above
+const wrapperProps = computed(() => {
+ if (props.to) return { to: props.to };
+ if (props.href) return { href: props.href };
+ return {};
+});
+
const slots = useSlots();
const isCompleteElement = computed(() => !!slots.header && !!slots.body);
</script>
@@ -25,16 +31,15 @@ const isCompleteElement = computed(() => !!slots.header && !!slots.body);
cn(
'relative flex flex-col flex-wrap sm:flex-row',
'group w-full cursor-pointer rounded-lg p-3 shadow-sm',
- 'dark:bg-primary-dark-800/70 bg-primary-800',
- 'dark:hover:bg-primary-dark-600 hover:bg-gray-200',
+ 'bg-surface-2 hover:bg-surface-3',
+ 'dark:hover:bg-primary-dark-600 dark:bg-surface-2/70',
{ 'gap-4 lg:gap-2': isCompleteElement },
props.class,
)
"
:target="target"
:aria-disabled="disabled ?? false"
- :href="href"
- :to="to"
+ v-bind="wrapperProps"
>
<slot>
<section class="flex w-full items-center justify-between gap-4">
diff --git a/resources/js/components/cedar-ui/badge/BadgeTag.vue b/resources/js/components/cedar-ui/badge/BadgeTag.vue
new file mode 100644
index 00000000..626892b7
--- /dev/null
+++ b/resources/js/components/cedar-ui/badge/BadgeTag.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import { ButtonCorner } from '../button';
+import { RouterLink } from 'vue-router';
+import { computed } from 'vue';
+import { cn } from '@aminnausin/cedar-ui';
+
+const props = defineProps<{
+ label?: string;
+ removeable?: boolean;
+ btnClass?: string;
+ class?: string;
+ URL?: string;
+}>();
+
+const wrapper = computed(() => (props.URL ? RouterLink : 'p'));
+const wrapperProps = computed(() => (props.URL ? { to: props.URL } : {}));
+</script>
+<template>
+ <component
+ :is="wrapper"
+ :class="
+ cn(
+ 'p-1 px-2 text-sm leading-none rounded-xl truncate lowercase text-foreground-4 bg-primary dark:bg-primary-dark shrink-0 transition-colors duration-300',
+ {
+ 'cursor-default': props.URL,
+ 'flex gap-1 items-center justify-between': removeable,
+ },
+ props.class,
+ )
+ "
+ v-bind="wrapperProps"
+ >
+ <slot> {{ label }}</slot>
+ <ButtonCorner
+ v-if="removeable"
+ :positionClasses="'w-4 h-4'"
+ :colourClasses="''"
+ :class="
+ cn(
+ 'text-white hover:text-white hover:bg-danger-2',
+ 'dark:text-danger-2 dark:hover:text-foreground bg-neutral-900/20 dark:hover:bg-danger-2 drop-shadow-sm',
+ btnClass,
+ )
+ "
+ :label="'Remove'"
+ @click.stop.prevent="$emit('clickAction')"
+ />
+ </component>
+</template>
diff --git a/resources/js/components/cedar-ui/badge/index.ts b/resources/js/components/cedar-ui/badge/index.ts
new file mode 100644
index 00000000..4f0f9b92
--- /dev/null
+++ b/resources/js/components/cedar-ui/badge/index.ts
@@ -0,0 +1 @@
+export { default as BadgeTag } from './BadgeTag.vue';
diff --git a/resources/js/components/cedar-ui/button/ButtonCorner.vue b/resources/js/components/cedar-ui/button/ButtonCorner.vue
index 2d267068..1faa9801 100644
--- a/resources/js/components/cedar-ui/button/ButtonCorner.vue
+++ b/resources/js/components/cedar-ui/button/ButtonCorner.vue
@@ -13,6 +13,7 @@ const props = withDefaults(
colourClasses?: string; // legacy
textClasses?: string; // legacy
useDefaultStyle?: boolean;
+ class?: string;
}>(),
{
useDefaultStyle: true,
@@ -43,14 +44,7 @@ const defaultClasses = computed(() => {
<ButtonBase
:disabled="disabled"
:use-size="false"
- :class="
- cn(
- 'rounded-full p-0',
- positionClasses ?? defaultClasses.position,
- colourClasses ?? defaultClasses.colour,
- textClasses ?? defaultClasses.text,
- )
- "
+ :class="cn('rounded-full p-0', positionClasses ?? defaultClasses.position, colourClasses ?? defaultClasses.colour, textClasses ?? defaultClasses.text, props.class)"
v-bind="wrapperProps"
>
<slot name="icon">
diff --git a/resources/js/components/cedar-ui/button/ButtonForm.vue b/resources/js/components/cedar-ui/button/ButtonForm.vue
index 0d605b1d..399edaf5 100644
--- a/resources/js/components/cedar-ui/button/ButtonForm.vue
+++ b/resources/js/components/cedar-ui/button/ButtonForm.vue
@@ -20,10 +20,7 @@ const props = withDefaults(
const variantClass = computed(() => {
switch (props.variant) {
case 'submit':
- return [
- 'text-foreground-i font-medium border-transparent',
- 'focus:ring-primary bg-surface-i hocus:bg-surface-i/90 dark:hover:bg-foreground-4',
- ];
+ return ['text-foreground-i font-medium border-transparent', 'focus:ring-primary bg-surface-i hocus:bg-surface-i/90 dark:hover:bg-foreground-4'];
case 'reset':
return ['font-medium', 'hocus:ring-foreground-4-hover', 'hocus:bg-surface-3'];
case 'auth': // This one is styled from Laravel
@@ -42,9 +39,7 @@ const variantClass = computed(() => {
<template>
<ButtonBase
:type="type"
- :class="
- cn('px-4', 'border-r-button ring-offset-surface-0 border', 'inline-flex', 'focus:ring-1 focus:ring-offset-1', ...variantClass)
- "
+ :class="cn('px-4', 'border-r-button ring-offset-surface-0 border', 'inline-flex', 'focus:ring-1 focus:ring-offset-1', ...variantClass)"
:disabled="disabled"
:aria-label="label"
>
diff --git a/resources/js/components/cedar-ui/button/ButtonIcon.vue b/resources/js/components/cedar-ui/button/ButtonIcon.vue
index 29ee1dc1..9fba4d42 100644
--- a/resources/js/components/cedar-ui/button/ButtonIcon.vue
+++ b/resources/js/components/cedar-ui/button/ButtonIcon.vue
@@ -26,7 +26,7 @@ const variantClass = computed(() => {
case 'transparent':
return ['hover:ring-1 focus:ring-1 hover:ring-surface-1 focus:ring-surface-1 focus:bg-transparent hover:bg-transparent'];
default:
- return ['shadow-xs', 'ring-1 ring-r-button hover:ring-primary-active focus:ring-primary hocus:ring-2', 'bg-surface-2'];
+ return ['shadow-xs', 'ring-1 ring-r-button hover:ring-primary-muted focus:ring-primary hocus:ring-2', 'bg-surface-2'];
}
});
diff --git a/resources/js/components/cedar-ui/button/ButtonText.vue b/resources/js/components/cedar-ui/button/ButtonText.vue
index bcb663c7..bd283df1 100644
--- a/resources/js/components/cedar-ui/button/ButtonText.vue
+++ b/resources/js/components/cedar-ui/button/ButtonText.vue
@@ -42,7 +42,7 @@ const variantClass = computed(() => {
case 'form':
return ['inline-flex px-4', 'border border-r-button', 'focus:ring-primary focus:ring-1 focus:ring-offset-1'];
default:
- return ['shadow-xs', 'ring-1 ring-r-button hover:ring-primary-active focus:ring-primary hocus:ring-2', 'bg-surface-2'];
+ return ['shadow-xs', 'ring-1 ring-r-button hover:ring-primary-muted focus:ring-primary hocus:ring-2', 'bg-surface-2'];
}
});
</script>
diff --git a/resources/js/components/cedar-ui/hover-card/HoverCard.vue b/resources/js/components/cedar-ui/hover-card/HoverCard.vue
new file mode 100644
index 00000000..f0d94d8f
--- /dev/null
+++ b/resources/js/components/cedar-ui/hover-card/HoverCard.vue
@@ -0,0 +1,119 @@
+<script setup lang="ts">
+import type { HoverCardProps } from '@aminnausin/cedar-ui';
+
+import { ProiconsCommentExclamation } from '../icons';
+import { ref, watch } from 'vue';
+import { cn } from '@aminnausin/cedar-ui';
+
+const props = withDefaults(defineProps<HoverCardProps>(), {
+ hoverCardDelay: 600,
+ hoverCardLeaveDelay: 500,
+ margin: 0,
+ paddingLeft: 0,
+ scrollContainer: 'body',
+ disabled: false,
+ icon: ProiconsCommentExclamation,
+});
+
+const hoverCardHovered = ref<boolean>(false);
+const hoverCardTimout = ref<number | null>(null);
+const hoverCardLeaveTimeout = ref<number | null>(null);
+const tooltipStyles = ref<Record<string, string>>({});
+
+const init = ref(false);
+
+const hoverCardEnter = (event: MouseEvent) => {
+ if (props.content === '' || props.disabled) return;
+
+ if (hoverCardLeaveTimeout.value) clearTimeout(hoverCardLeaveTimeout.value);
+
+ if (hoverCardHovered.value) return;
+
+ if (hoverCardTimout.value) clearTimeout(hoverCardTimout.value);
+
+ if (!init.value) init.value = true; // Loads into Dom after hover for the first time
+
+ hoverCardTimout.value = window.setTimeout(() => {
+ hoverCardHovered.value = true;
+ updateTooltipPosition(event);
+ }, props.hoverCardDelay);
+};
+
+const hoverCardLeave = () => {
+ if (hoverCardTimout.value) clearTimeout(hoverCardTimout.value);
+
+ if (!hoverCardHovered.value) return;
+ if (hoverCardLeaveTimeout.value) clearTimeout(hoverCardLeaveTimeout.value);
+
+ hoverCardLeaveTimeout.value = window.setTimeout(() => {
+ hoverCardHovered.value = false;
+ }, props.hoverCardLeaveDelay);
+};
+
+const updateTooltipPosition = (event: MouseEvent) => {
+ const elem = event.target as HTMLElement;
+ const parentRect = elem.parentElement?.getBoundingClientRect();
+
+ let rect = elem.getBoundingClientRect();
+
+ if (parentRect && parentRect.height < rect.height) {
+ rect = parentRect;
+ }
+
+ const scrollY = props.scrollContainer === 'body' ? document.body.scrollTop : window.scrollY;
+ const scrollX = props.scrollContainer === 'body' ? document.body.scrollLeft : window.scrollX;
+
+ tooltipStyles.value = { left: `${rect.left + scrollX + props.paddingLeft}px`, top: `${rect.bottom + props.margin + scrollY}px` };
+};
+
+watch(
+ () => props.content,
+ () => {
+ if (!props.content || props.content.trim() === '') hoverCardLeave();
+ },
+);
+//relative
+</script>
+
+<template>
+ <div class="" @mouseover="hoverCardEnter" @mouseleave="hoverCardLeave">
+ <slot name="trigger">
+ <a href="#_" class="hover:underline"></a>
+ </slot>
+ <Teleport to="body" v-if="init">
+ <Transition enter-from-class="opacity-0" enter-to-class="opacity-100" leave-from-class="opacity-100" leave-to-class="opacity-0">
+ <div
+ @mouseover="hoverCardEnter"
+ @mouseleave="hoverCardLeave"
+ v-show="hoverCardHovered"
+ v-cloak
+ :class="
+ cn(
+ 'absolute z-30',
+ 'transition-opacity duration-200 ease-in-out',
+ 'flex h-fit max-h-[50vh] items-center gap-2 overflow-auto p-3',
+ 'border border-neutral-200/70 dark:border-none',
+ 'dark:odd:bg-primary-dark-600/70 bg-white dark:bg-neutral-800/70',
+ 'scrollbar-minimal rounded-md text-sm shadow-md backdrop-blur-lg',
+ 'md:max-w-xl xl:max-w-3xl',
+ positionClasses,
+ )
+ "
+ :style="tooltipStyles"
+ >
+ <slot name="icon">
+ <template v-if="!iconHidden">
+ <component class="mb-auto h-5 w-5 shrink-0" :is="icon" />
+ </template>
+ </slot>
+ <slot name="content">
+ <div class="flex flex-col gap-2">
+ <h4 v-if="contentTitle">{{ contentTitle }}</h4>
+ <p class="w-full text-pretty whitespace-pre-wrap dark:text-neutral-400" v-if="content">{{ content }}</p>
+ </div>
+ </slot>
+ </div>
+ </Transition>
+ </Teleport>
+ </div>
+</template>
diff --git a/resources/js/components/cedar-ui/hover-card/RelativeHoverCard.vue b/resources/js/components/cedar-ui/hover-card/RelativeHoverCard.vue
new file mode 100644
index 00000000..7f36caae
--- /dev/null
+++ b/resources/js/components/cedar-ui/hover-card/RelativeHoverCard.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import type { RelativeHoverCardProps } from '@aminnausin/cedar-ui';
+
+import { ProiconsCommentExclamation } from '../icons';
+import { ref } from 'vue';
+import { cn } from '@aminnausin/cedar-ui';
+
+const props = withDefaults(defineProps<RelativeHoverCardProps>(), {
+ hoverCardDelay: 600,
+ hoverCardLeaveDelay: 500,
+ icon: ProiconsCommentExclamation,
+});
+
+const hoverCardHovered = ref<boolean>(false);
+const hoverCardTimout = ref<number | null>(null);
+const hoverCardLeaveTimeout = ref<number | null>(null);
+const tooltipStyles = ref<Record<string, string>>({});
+
+const init = ref(false);
+
+const hoverCardEnter = () => {
+ if (props.content === '') return;
+
+ if (hoverCardLeaveTimeout.value) clearTimeout(hoverCardLeaveTimeout.value);
+
+ if (hoverCardHovered.value) return;
+
+ if (hoverCardTimout.value) clearTimeout(hoverCardTimout.value);
+
+ if (!init.value) init.value = true; // Loads into Dom after hover for the first time
+
+ hoverCardTimout.value = window.setTimeout(() => {
+ hoverCardHovered.value = true;
+ }, props.hoverCardDelay);
+};
+
+const hoverCardLeave = () => {
+ if (props.content === '') return;
+ if (hoverCardTimout.value) clearTimeout(hoverCardTimout.value);
+
+ if (!hoverCardHovered.value) return;
+ if (hoverCardLeaveTimeout.value) clearTimeout(hoverCardLeaveTimeout.value);
+
+ hoverCardLeaveTimeout.value = window.setTimeout(() => {
+ hoverCardHovered.value = false;
+ }, props.hoverCardLeaveDelay);
+};
+</script>
+
+<template>
+ <div class="relative" @mouseover="hoverCardEnter" @mouseleave="hoverCardLeave">
+ <slot name="trigger">
+ <a href="#_" class="hover:underline">@aminnausin</a>
+ </slot>
+ <Transition enter-from-class="opacity-0" enter-to-class="opacity-100" leave-from-class="opacity-100" leave-to-class="opacity-0">
+ <div
+ @mouseover="hoverCardEnter"
+ @mouseleave="hoverCardLeave"
+ v-show="hoverCardHovered"
+ v-cloak
+ :class="
+ cn(
+ 'absolute z-30',
+ 'transition-opacity duration-200 ease-in-out',
+ 'flex h-fit items-center gap-2 overflow-auto p-3',
+ 'border-overlay-2-t border dark:border-none',
+ 'bg-overlay-t text-foreground-0',
+ 'rounded-md text-sm shadow-md backdrop-blur-lg',
+ 'md:max-w-xl xl:max-w-3xl',
+ positionClasses,
+ )
+ "
+ :style="tooltipStyles"
+ v-if="init"
+ >
+ <slot name="icon">
+ <template v-if="!iconHidden">
+ <component class="mb-auto size-5 shrink-0" :is="icon" />
+ </template>
+ </slot>
+ <slot name="content">
+ <p class="h-fit w-full text-pretty wrap-break-word whitespace-pre-wrap">
+ {{ content }}
+ </p>
+ </slot>
+ </div>
+ </Transition>
+ </div>
+</template>
diff --git a/resources/js/components/cedar-ui/hover-card/index.ts b/resources/js/components/cedar-ui/hover-card/index.ts
new file mode 100644
index 00000000..57aa2752
--- /dev/null
+++ b/resources/js/components/cedar-ui/hover-card/index.ts
@@ -0,0 +1,2 @@
+export { default as RelativeHoverCard } from './RelativeHoverCard.vue';
+export { default as HoverCard } from './HoverCard.vue';