From 6aad01c96fa130ccb4998003767a02fe73bd9ca3 Mon Sep 17 00:00:00 2001 From: Alexis Date: Sun, 3 Aug 2025 19:42:43 +0200 Subject: [PATCH] Updated color scheme and identity --- app/app.vue | 27 ++----- app/assets/_colors.css | 5 ++ app/assets/_typography.css | 6 ++ app/assets/main.css | 1 + app/assets/theme.css | 26 +++--- app/components/calendar/form/Create.vue | 2 +- app/components/calendar/form/CreateEvent.vue | 6 +- app/components/calendar/form/Update.vue | 2 +- app/components/calendar/form/UpdateEvent.vue | 6 +- .../calendar/state/monthly/DayTile.vue | 6 +- app/components/global/sidebar/Sidebar.vue | 76 +++--------------- app/components/global/user/CTA.vue | 15 +++- app/components/ui/button/index.ts | 6 +- .../dropdown-menu/DropdownMenuSubTrigger.vue | 2 +- app/components/world/form/Create.vue | 4 +- app/components/world/form/Update.vue | 4 +- app/layouts/default.vue | 23 ++++++ app/layouts/public.vue | 7 ++ app/pages/about.vue | 4 + app/pages/explore.vue | 2 +- app/pages/index.vue | 43 +++++++++- public/images/sidebar-min.png | Bin 77133 -> 0 bytes public/images/sidebar-min.webp | Bin 14242 -> 0 bytes public/images/sidebar.png | Bin 1432123 -> 0 bytes 24 files changed, 146 insertions(+), 127 deletions(-) create mode 100644 app/layouts/default.vue create mode 100644 app/layouts/public.vue delete mode 100644 public/images/sidebar-min.png delete mode 100644 public/images/sidebar-min.webp delete mode 100644 public/images/sidebar.png diff --git a/app/app.vue b/app/app.vue index 769d005..eee5fcf 100644 --- a/app/app.vue +++ b/app/app.vue @@ -1,6 +1,5 @@ - - diff --git a/app/components/global/user/CTA.vue b/app/components/global/user/CTA.vue index fb686ae..667ff4e 100644 --- a/app/components/global/user/CTA.vue +++ b/app/components/global/user/CTA.vue @@ -59,7 +59,12 @@ function pushRoute(to: AvailableRoutes) { - + - + diff --git a/app/components/ui/button/index.ts b/app/components/ui/button/index.ts index 6cdc5fa..bb58ee1 100644 --- a/app/components/ui/button/index.ts +++ b/app/components/ui/button/index.ts @@ -7,11 +7,11 @@ export const buttonVariants = cva( { variants: { variant: { - default: "bg-primary text-primary-foreground hover:bg-primary/90", + default: "bg-primary text-primary-foreground hover:bg-primary/70", destructive: "bg-destructive text-destructive-foreground hover:bg-destructive/90", - outline: "border border-input hover:bg-accent hover:text-accent-foreground", + outline: "border border-input hover:bg-primary hover:text-primary-foreground", secondary: "bg-secondary text-secondary-foreground hover:bg-primary/20", - ghost: "hover:bg-accent hover:text-accent-foreground", + ghost: "hover:bg-primary/70 hover:text-primary-foreground", link: "text-primary underline-offset-4 hover:underline" }, size: { diff --git a/app/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue b/app/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue index ed27f95..7ed04a7 100644 --- a/app/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue +++ b/app/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue @@ -24,7 +24,7 @@ const forwardedProps = useForwardProps(delegatedProps) v-bind="forwardedProps" :class=" cn( - 'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-hidden focus:bg-accent data-[state=open]:bg-accent', + 'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-hidden focus:bg-accent data-[state=open]:text-accent-foreground data-[state=open]:bg-accent transition-colors', props.class ) " diff --git a/app/components/world/form/Create.vue b/app/components/world/form/Create.vue index 74899e2..f121918 100644 --- a/app/components/world/form/Create.vue +++ b/app/components/world/form/Create.vue @@ -67,7 +67,7 @@ function handleFormCancel() { name="new-world-name" required :placeholder="$t('common.title')" - class="w-full -my-1 mb-4 py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" + class="w-full -my-1 mb-4 py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-primary invalid:border-destructive" @input="handleNameChange" > @@ -76,7 +76,7 @@ function handleFormCancel() { v-model="worldSkeleton.description" name="new-world-description" :placeholder="$t('entity.addDescription')" - class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" + class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-primary invalid:border-destructive" />
diff --git a/app/components/world/form/Update.vue b/app/components/world/form/Update.vue index 0c3e593..563da5d 100644 --- a/app/components/world/form/Update.vue +++ b/app/components/world/form/Update.vue @@ -81,7 +81,7 @@ function handleFormCancel() { name="new-world-name" required :placeholder="$t('common.title')" - class="w-full -my-1 py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" + class="w-full -my-1 py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-primary invalid:border-destructive" @input="handleNameChange" > @@ -90,7 +90,7 @@ function handleFormCancel() { v-model="worldSkeleton.description" name="new-world-description" :placeholder="$t('entity.addDescription')" - class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" + class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-primary invalid:border-destructive" />
diff --git a/app/layouts/default.vue b/app/layouts/default.vue new file mode 100644 index 0000000..b6fb7db --- /dev/null +++ b/app/layouts/default.vue @@ -0,0 +1,23 @@ + + + diff --git a/app/layouts/public.vue b/app/layouts/public.vue new file mode 100644 index 0000000..880278c --- /dev/null +++ b/app/layouts/public.vue @@ -0,0 +1,7 @@ + diff --git a/app/pages/about.vue b/app/pages/about.vue index aa3b2f3..0fda9b2 100644 --- a/app/pages/about.vue +++ b/app/pages/about.vue @@ -3,6 +3,10 @@ import { PhCircleNotch } from '@phosphor-icons/vue' const { locale } = useI18n() +definePageMeta({ + layout: "public" +}) + const { data: page, refresh, status } = useLazyAsyncData(`about-content-${locale}`, () => { return queryCollection("sections").path(`/sections/${locale.value}/legal`).first() }) diff --git a/app/pages/explore.vue b/app/pages/explore.vue index 0a3e1ea..958ffc1 100644 --- a/app/pages/explore.vue +++ b/app/pages/explore.vue @@ -2,7 +2,7 @@ import type { Calendar } from "@@/models/CalendarConfig"; definePageMeta({ - middleware: ["reset-menu"] + layout: "public" }) // const { data: availableCalendars, status: calendarStatus } = useLazyFetch<{ data: Calendar[] }>("/api/calendars/query", { key: "explore-calendars", query: { full: true } }) diff --git a/app/pages/index.vue b/app/pages/index.vue index 94cfaab..5a12b49 100644 --- a/app/pages/index.vue +++ b/app/pages/index.vue @@ -4,12 +4,33 @@ useHead({ }) definePageMeta({ - middleware: ["reset-menu"] + layout: "public" }) + +const { auth } = useSupabaseClient() +const user = useSupabaseUser() +const profileUrl: string = `${useRequestURL().origin}/my/` + +async function handleGoogleLogin() { + const { error } = await auth.signInWithOAuth({ + provider: "google", + options: { + queryParams: { + access_type: "offline", + prompt: "consent" + }, + redirectTo: profileUrl + } + }) + + if (error) { + console.log(error.message) + } +}