Updated packages and some other colours
This commit is contained in:
@@ -24,7 +24,7 @@
|
|||||||
--accent: hsl(11, 100%, 86%);
|
--accent: hsl(11, 100%, 86%);
|
||||||
--accent-foreground: hsl(222.2 84% 4.9%);
|
--accent-foreground: hsl(222.2 84% 4.9%);
|
||||||
|
|
||||||
--destructive: hsl(0, 62%, 49%);
|
--destructive: hsl(0, 100%, 63%);
|
||||||
--destructive-foreground: hsl(210 40% 98%);
|
--destructive-foreground: hsl(210 40% 98%);
|
||||||
|
|
||||||
--success: hsl(156 72% 67%);
|
--success: hsl(156 72% 67%);
|
||||||
@@ -59,8 +59,8 @@
|
|||||||
--secondary: hsl(222.2 47.4% 11.2%);
|
--secondary: hsl(222.2 47.4% 11.2%);
|
||||||
--secondary-foreground: hsl(210 40% 98%);
|
--secondary-foreground: hsl(210 40% 98%);
|
||||||
|
|
||||||
--accent: hsl(11, 78%, 67%);
|
--accent: hsl(11, 87%, 69%);
|
||||||
--accent-foreground: hsl(210 40% 98%);
|
--accent-foreground: hsl(222.2 84% 4.9%);
|
||||||
|
|
||||||
--destructive: hsl(0, 62%, 49%);
|
--destructive: hsl(0, 62%, 49%);
|
||||||
--destructive-foreground: hsl(210 40% 98%);
|
--destructive-foreground: hsl(210 40% 98%);
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ const filteredCategories = computed(() =>
|
|||||||
role="combobox"
|
role="combobox"
|
||||||
:aria-expanded="isPopoverOpen"
|
:aria-expanded="isPopoverOpen"
|
||||||
aria-controls="event-categories"
|
aria-controls="event-categories"
|
||||||
class="relative w-full max-w-full h-fit justify-between"
|
class="relative w-full max-w-full h-fit justify-between hover:bg-secondary hover:text-primary-foreground"
|
||||||
>
|
>
|
||||||
<template v-if="!model.length">
|
<template v-if="!model.length">
|
||||||
{{ props.placeholder }}
|
{{ props.placeholder }}
|
||||||
@@ -57,7 +57,7 @@ const filteredCategories = computed(() =>
|
|||||||
</UiPopoverTrigger>
|
</UiPopoverTrigger>
|
||||||
<UiPopoverContent
|
<UiPopoverContent
|
||||||
id="event-categories"
|
id="event-categories"
|
||||||
align="start"
|
:align="'start'"
|
||||||
side="bottom"
|
side="bottom"
|
||||||
:collision-padding="50"
|
:collision-padding="50"
|
||||||
class="w-fit h-[33vh] p-0"
|
class="w-fit h-[33vh] p-0"
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ const filteredCategories = computed(() =>
|
|||||||
role="combobox"
|
role="combobox"
|
||||||
:aria-expanded="isPopoverOpen"
|
:aria-expanded="isPopoverOpen"
|
||||||
aria-controls="event-category"
|
aria-controls="event-category"
|
||||||
class="w-full max-w-full justify-between"
|
class="w-full max-w-full justify-between hover:bg-secondary hover:text-primary-foreground"
|
||||||
>
|
>
|
||||||
<template v-if="!model">
|
<template v-if="!model">
|
||||||
{{ props.placeholder }}
|
{{ props.placeholder }}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import type { RPGDate } from "@@/models/Date";
|
|||||||
import {
|
import {
|
||||||
PhXCircle
|
PhXCircle
|
||||||
} from "@phosphor-icons/vue"
|
} from "@phosphor-icons/vue"
|
||||||
|
import { cn } from "~/lib/utils";
|
||||||
|
|
||||||
const model = defineModel<RPGDate | null>()
|
const model = defineModel<RPGDate | null>()
|
||||||
|
|
||||||
@@ -134,7 +135,7 @@ function handleValueReset() {
|
|||||||
|
|
||||||
<UiInput v-model="model.year" type="number" />
|
<UiInput v-model="model.year" type="number" />
|
||||||
|
|
||||||
<hr class="col-span-2" >
|
<hr class="col-span-2" />
|
||||||
|
|
||||||
<div class="col-span-2">
|
<div class="col-span-2">
|
||||||
<div v-if="monthData" class="grid grid-cols-7 gap-1">
|
<div v-if="monthData" class="grid grid-cols-7 gap-1">
|
||||||
@@ -142,10 +143,10 @@ function handleValueReset() {
|
|||||||
v-for="day in monthData.days"
|
v-for="day in monthData.days"
|
||||||
:key="`popover-day-grid-${id}-${day}`"
|
:key="`popover-day-grid-${id}-${day}`"
|
||||||
class="aspect-square rounded-full text-[.8em] transition-colors"
|
class="aspect-square rounded-full text-[.8em] transition-colors"
|
||||||
:class="{
|
:class="cn({
|
||||||
'hover:bg-indigo-200 dark:hover:bg-indigo-700': day !== model.day,
|
'hover:bg-accent hover:text-accent-foreground': day !== model.day,
|
||||||
'bg-indigo-500 hover:bg-indigo-700 text-white': day === model.day
|
'bg-primary text-primary-foreground hover:bg-accent hover:text-accent-foreground': day === model.day
|
||||||
}"
|
})"
|
||||||
@click="setModelDay(day)"
|
@click="setModelDay(day)"
|
||||||
>
|
>
|
||||||
{{ day }}
|
{{ day }}
|
||||||
|
|||||||
@@ -13,7 +13,15 @@ const model = defineModel<RPGColor>({ default: "white" });
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<UiSelect v-model="model">
|
<UiSelect v-model="model">
|
||||||
<UiSelectTrigger :id :class="cn({ 'h-9': theme === 'subtle' })">
|
<UiSelectTrigger
|
||||||
|
:id
|
||||||
|
:class="cn(
|
||||||
|
['hover:bg-secondary hover:text-primary-foreground'],
|
||||||
|
{
|
||||||
|
'h-9': theme === 'subtle'
|
||||||
|
}
|
||||||
|
)"
|
||||||
|
>
|
||||||
<UiSelectValue
|
<UiSelectValue
|
||||||
:placeholder="$t('ui.colors.selectOne')"
|
:placeholder="$t('ui.colors.selectOne')"
|
||||||
class="bgc"
|
class="bgc"
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
|
|||||||
style="max-height: var(--radix-select-content-available-height)"
|
style="max-height: var(--radix-select-content-available-height)"
|
||||||
:class="
|
:class="
|
||||||
cn(
|
cn(
|
||||||
'select-content relative z-50 max-h-96 min-w-32 overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
|
'select-content relative z-50 max-h-96 min-w-32 overflow-hidden rounded-md border border-popover-border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
|
||||||
position === 'popper' &&
|
position === 'popper' &&
|
||||||
'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
|
'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
|
||||||
props.class
|
props.class
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const forwardedProps = useForwardProps(delegatedProps)
|
|||||||
v-bind="forwardedProps"
|
v-bind="forwardedProps"
|
||||||
:class="
|
:class="
|
||||||
cn(
|
cn(
|
||||||
'flex h-10 w-full items-center justify-between rounded-md border border-input bg-background dark:bg-slate-950 contrast-more:dark:bg-slate-900 px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
|
'flex h-10 w-full items-center justify-between rounded-md border border-input bg-background hover:bg-secondary hover:text-primary-foreground px-3 py-2 text-sm ring-offset-background transition-colors placeholder:text-muted-foreground focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 cursor-pointer disabled:cursor-not-allowed disabled:opacity-50',
|
||||||
props.class
|
props.class
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
|||||||
20
package.json
20
package.json
@@ -16,7 +16,7 @@
|
|||||||
"@intlify/message-compiler": "^11.1.11",
|
"@intlify/message-compiler": "^11.1.11",
|
||||||
"@nuxt/content": "3.6.3",
|
"@nuxt/content": "3.6.3",
|
||||||
"@nuxt/eslint": "^1.7.1",
|
"@nuxt/eslint": "^1.7.1",
|
||||||
"@nuxt/image": "1.10.0",
|
"@nuxt/image": "1.11.0",
|
||||||
"@nuxthub/core": "^0.9.0",
|
"@nuxthub/core": "^0.9.0",
|
||||||
"@nuxtjs/i18n": "^10.0.3",
|
"@nuxtjs/i18n": "^10.0.3",
|
||||||
"@phosphor-icons/vue": "^2.2.1",
|
"@phosphor-icons/vue": "^2.2.1",
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
"better-sqlite3": "^12.2.0",
|
"better-sqlite3": "^12.2.0",
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"lucide-vue-next": "^0.534.0",
|
"lucide-vue-next": "^0.536.0",
|
||||||
"luxon": "^3.7.1",
|
"luxon": "^3.7.1",
|
||||||
"nuxt": "^4.0.2",
|
"nuxt": "^4.0.2",
|
||||||
"pinia": "^3.0.3",
|
"pinia": "^3.0.3",
|
||||||
@@ -39,26 +39,26 @@
|
|||||||
"tailwindcss-animate": "^1.0.7",
|
"tailwindcss-animate": "^1.0.7",
|
||||||
"vue": "^3.5.18",
|
"vue": "^3.5.18",
|
||||||
"vue-router": "^4.5.1",
|
"vue-router": "^4.5.1",
|
||||||
"zod": "^4.0.13"
|
"zod": "^4.0.14"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nuxtjs/color-mode": "^3.5.2",
|
"@nuxtjs/color-mode": "^3.5.2",
|
||||||
"@nuxtjs/supabase": "^1.6.0",
|
"@nuxtjs/supabase": "^1.6.0",
|
||||||
"@nuxtjs/tailwindcss": "^6.14.0",
|
"@nuxtjs/tailwindcss": "^6.14.0",
|
||||||
"@stylistic/eslint-plugin-js": "^4.4.1",
|
"@stylistic/eslint-plugin-js": "^4.4.1",
|
||||||
"@types/luxon": "^3.7.0",
|
"@types/luxon": "^3.7.1",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.38.0",
|
"@typescript-eslint/eslint-plugin": "^8.39.0",
|
||||||
"@typescript-eslint/parser": "^8.38.0",
|
"@typescript-eslint/parser": "^8.39.0",
|
||||||
"eslint": "^9.32.0",
|
"eslint": "^9.32.0",
|
||||||
"eslint-config-prettier": "^10.1.8",
|
"eslint-config-prettier": "^10.1.8",
|
||||||
"eslint-plugin-prettier": "^5.5.3",
|
"eslint-plugin-prettier": "^5.5.3",
|
||||||
"eslint-plugin-vue": "^10.3.0",
|
"eslint-plugin-vue": "^10.4.0",
|
||||||
"postcss": "^8.5.6",
|
"postcss": "^8.5.6",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"sass": "^1.89.2",
|
"sass": "^1.89.2",
|
||||||
"supabase": "^2.33.5",
|
"supabase": "^2.33.9",
|
||||||
"tailwindcss": "^4.1.11",
|
"tailwindcss": "^4.1.11",
|
||||||
"typescript": "^5.8.3",
|
"typescript": "^5.9.2",
|
||||||
"wrangler": "^4.26.1"
|
"wrangler": "^4.27.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1054
pnpm-lock.yaml
generated
1054
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -43,7 +43,7 @@ create table public.worlds (
|
|||||||
id bigint generated by default as identity primary key,
|
id bigint generated by default as identity primary key,
|
||||||
name text not null,
|
name text not null,
|
||||||
description text,
|
description text,
|
||||||
color app_colors default 'black',
|
color app_colors default 'emerald',
|
||||||
state world_state default 'draft',
|
state world_state default 'draft',
|
||||||
created_at timestamptz default now(),
|
created_at timestamptz default now(),
|
||||||
updated_at timestamptz,
|
updated_at timestamptz,
|
||||||
@@ -69,7 +69,7 @@ create table public.calendars (
|
|||||||
short_id text unique,
|
short_id text unique,
|
||||||
name text not null,
|
name text not null,
|
||||||
today json not null,
|
today json not null,
|
||||||
color app_colors default 'black',
|
color app_colors default 'emerald',
|
||||||
state calendar_state default 'draft',
|
state calendar_state default 'draft',
|
||||||
created_at timestamptz default now(),
|
created_at timestamptz default now(),
|
||||||
updated_at timestamptz,
|
updated_at timestamptz,
|
||||||
|
|||||||
Reference in New Issue
Block a user