From 06eaccec864fff2d5aff7578b3f54408303580b3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Jun 2025 08:01:15 +0000 Subject: [PATCH 01/10] fix(deps): update dependency lucide-react to ^0.523.0 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 71bc8ea..d3c12e0 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "bcryptjs": "^3.0.2", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", - "lucide-react": "^0.515.0", + "lucide-react": "^0.523.0", "next": "15.3.4", "next-auth": "^5.0.0-beta.25", "next-themes": "^0.4.6", diff --git a/yarn.lock b/yarn.lock index fdbfaa1..d8f87e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7284,12 +7284,12 @@ __metadata: languageName: node linkType: hard -"lucide-react@npm:^0.515.0": - version: 0.515.0 - resolution: "lucide-react@npm:0.515.0" +"lucide-react@npm:^0.523.0": + version: 0.523.0 + resolution: "lucide-react@npm:0.523.0" peerDependencies: react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 - checksum: 10c0/00485e09ab3d0bbb34797b1f368c269e8708522b6e2f46fd84dd5bd99741546487be9a65a260f274e8049b81cc37687566e26132f5752352c8d9bc8e5d0b3dea + checksum: 10c0/dafd180d05326edc81d928f37d6574930f0592da08b91c536ae5675d0b764295368e8daf9bcc81a5283c18e2f19412060d1da475b4f26112168245e708bd562f languageName: node linkType: hard @@ -7407,7 +7407,7 @@ __metadata: eslint: "npm:9.29.0" eslint-config-next: "npm:15.3.4" eslint-config-prettier: "npm:10.1.5" - lucide-react: "npm:^0.515.0" + lucide-react: "npm:^0.523.0" next: "npm:15.3.4" next-auth: "npm:^5.0.0-beta.25" next-themes: "npm:^0.4.6" From 51fe42374d7fbb8a33db7675490d4da66709b3f7 Mon Sep 17 00:00:00 2001 From: Micha Date: Wed, 25 Jun 2025 13:10:27 +0200 Subject: [PATCH 02/10] feat(events): add event creation form components --- package.json | 10 +- src/app/globals.css | 63 +++- src/app/layout.tsx | 21 +- .../default/default-user-icon_dark.svg | 5 + .../default/default-user-icon_light.svg | 5 + .../default/defaultusericon-export.tsx | 2 + src/components/buttons/redirect-button.tsx | 6 +- src/components/custom-ui/labeled-input.tsx | 38 +- .../custom-ui/participant-list-entry.tsx | 28 ++ src/components/forms/event-form.tsx | 344 +++++++++++++++++ src/components/misc/logo.tsx | 4 +- src/components/misc/toast-inner.tsx | 160 ++++++++ src/components/misc/user-search.tsx | 96 +++++ src/components/time-picker.tsx | 86 +++++ src/components/ui/button.tsx | 5 +- src/components/ui/calendar.tsx | 213 +++++++++++ src/components/ui/card.tsx | 2 +- src/components/ui/command.tsx | 184 +++++++++ src/components/ui/dialog.tsx | 143 +++++++ src/components/ui/input.tsx | 45 ++- src/components/ui/label.tsx | 15 +- src/components/ui/popover.tsx | 48 +++ src/components/ui/sonner.tsx | 54 +++ yarn.lock | 352 ++++++++++++++++-- 24 files changed, 1868 insertions(+), 61 deletions(-) create mode 100644 src/assets/usericon/default/default-user-icon_dark.svg create mode 100644 src/assets/usericon/default/default-user-icon_light.svg create mode 100644 src/assets/usericon/default/defaultusericon-export.tsx create mode 100644 src/components/custom-ui/participant-list-entry.tsx create mode 100644 src/components/forms/event-form.tsx create mode 100644 src/components/misc/toast-inner.tsx create mode 100644 src/components/misc/user-search.tsx create mode 100644 src/components/time-picker.tsx create mode 100644 src/components/ui/calendar.tsx create mode 100644 src/components/ui/command.tsx create mode 100644 src/components/ui/dialog.tsx create mode 100644 src/components/ui/popover.tsx create mode 100644 src/components/ui/sonner.tsx diff --git a/package.json b/package.json index 71bc8ea..e18c3c4 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,8 @@ "@radix-ui/react-dropdown-menu": "^2.1.15", "@radix-ui/react-hover-card": "^1.1.13", "@radix-ui/react-label": "^2.1.6", - "@radix-ui/react-scroll-area": "^1.2.8", + "@radix-ui/react-popover": "^1.1.14", + "@radix-ui/react-scroll-area": "^1.2.9", "@radix-ui/react-select": "^2.2.4", "@radix-ui/react-separator": "^1.1.7", "@radix-ui/react-slot": "^1.2.3", @@ -48,13 +49,18 @@ "bcryptjs": "^3.0.2", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", + "cmdk": "^1.1.1", + "date-fns": "^4.1.0", "lucide-react": "^0.515.0", "next": "15.3.4", "next-auth": "^5.0.0-beta.25", + "next-swagger-doc": "^0.4.1", "next-themes": "^0.4.6", "react": "^19.0.0", + "react-day-picker": "^9.7.0", "react-dom": "^19.0.0", "react-hook-form": "^7.56.4", + "sonner": "^2.0.5", "swagger-ui-react": "^5.24.1", "tailwind-merge": "^3.2.0", "zod": "^3.25.60" @@ -80,7 +86,7 @@ "ts-node": "10.9.2", "tsconfig-paths": "4.2.0", "tw-animate-css": "1.3.4", - "typescript": "5.8.3" + "typescript": "^5.8.3" }, "packageManager": "yarn@4.9.2" } diff --git a/src/app/globals.css b/src/app/globals.css index 93a24ce..1707398 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -9,6 +9,7 @@ --font-heading: 'Comfortaa', sans-serif; --font-label: 'Varela Round', sans-serif; --font-button: 'Varela Round', sans-serif; + --font-sans: var(--font-label); --transparent: transparent; @@ -28,7 +29,7 @@ --background: var(--neutral-800); --background-reversed: var(--neutral-000); - --base: var(--neutral-800); + --basecl: var(--neutral-800); --text: var(--neutral-000); --text-alt: var(--neutral-900); --text-input: var(--text); @@ -115,6 +116,62 @@ --sidebar-ring: oklch(0.707 0.022 261.325); } +h1 { + font-family: var(--font-heading); + font-size: 40px; + font-style: normal; + font-weight: 700; + line-height: normal; +} + +h2 { + font-family: var(--font-heading); + font-size: 36px; + font-style: normal; + font-weight: 600; + line-height: normal; +} + +h3 { + font-family: var(--font-heading); + font-size: 32px; + font-style: normal; + font-weight: 600; + line-height: normal; +} + +h4 { + font-family: var(--font-heading); + font-size: 28px; + font-style: normal; + font-weight: 600; + line-height: normal; +} + +h5 { + font-family: var(--font-heading); + font-size: 26px; + font-style: normal; + font-weight: 600; + line-height: normal; +} + +h6 { + font-family: var(--font-heading); + font-size: 20px; + font-style: normal; + font-weight: 600; + line-height: normal; +} + +p { + font-family: var(--font-label); + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: normal; +} + @font-face { font-family: 'Comfortaa'; font-style: normal; @@ -153,7 +210,7 @@ --color-background: var(--neutral-750); --color-background-reversed: var(--background-reversed); - --color-base: var(--neutral-800); + --color-basecl: var(--neutral-800); --color-text: var(--text); --color-text-alt: var(--text-alt); --color-text-input: var(--text-input); @@ -277,7 +334,7 @@ --background: var(--neutral-750); --background-reversed: var(--neutral-000); - --base: var(--neutral-750); + --basecl: var(--neutral-750); --text: var(--neutral-000); --text-alt: var(--neutral-900); --text-input: var(--text); diff --git a/src/app/layout.tsx b/src/app/layout.tsx index af40867..47cec2d 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -3,6 +3,8 @@ import { ThemeProvider } from '@/components/wrappers/theme-provider'; import type { Metadata } from 'next'; import './globals.css'; import { QueryProvider } from '@/components/wrappers/query-provider'; +import { Toaster } from '@/components/ui/sonner'; +import { SessionProvider } from 'next-auth/react'; export const metadata: Metadata = { title: 'MeetUp', @@ -50,14 +52,17 @@ export default function RootLayout({ - - {children} - + + + {children} + + + ); diff --git a/src/assets/usericon/default/default-user-icon_dark.svg b/src/assets/usericon/default/default-user-icon_dark.svg new file mode 100644 index 0000000..b2a1cfb --- /dev/null +++ b/src/assets/usericon/default/default-user-icon_dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/usericon/default/default-user-icon_light.svg b/src/assets/usericon/default/default-user-icon_light.svg new file mode 100644 index 0000000..60ba6d0 --- /dev/null +++ b/src/assets/usericon/default/default-user-icon_light.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/usericon/default/defaultusericon-export.tsx b/src/assets/usericon/default/defaultusericon-export.tsx new file mode 100644 index 0000000..d1b482d --- /dev/null +++ b/src/assets/usericon/default/defaultusericon-export.tsx @@ -0,0 +1,2 @@ +export { default as user_default_dark } from '@/assets/usericon/default/default-user-icon_dark.svg'; +export { default as user_default_light } from '@/assets/usericon/default/default-user-icon_light.svg'; diff --git a/src/components/buttons/redirect-button.tsx b/src/components/buttons/redirect-button.tsx index c4bf997..e67acc1 100644 --- a/src/components/buttons/redirect-button.tsx +++ b/src/components/buttons/redirect-button.tsx @@ -1,16 +1,18 @@ -import { Button } from '../ui/button'; +import { Button } from '@/components/ui/button'; import Link from 'next/link'; export function RedirectButton({ redirectUrl, buttonText, + className, }: { redirectUrl: string; buttonText: string; + className?: string; }) { return ( - + ); } diff --git a/src/components/custom-ui/labeled-input.tsx b/src/components/custom-ui/labeled-input.tsx index ea26e51..4746a31 100644 --- a/src/components/custom-ui/labeled-input.tsx +++ b/src/components/custom-ui/labeled-input.tsx @@ -1,4 +1,4 @@ -import { Input } from '@/components/ui/input'; +import { Input, Textarea } from '@/components/ui/input'; import { Label } from '@/components/ui/label'; export default function LabeledInput({ @@ -7,6 +7,7 @@ export default function LabeledInput({ placeholder, value, name, + variantSize = 'default', autocomplete, error, ...rest @@ -16,22 +17,37 @@ export default function LabeledInput({ placeholder?: string; value?: string; name?: string; + variantSize?: 'default' | 'big' | 'textarea'; autocomplete?: string; error?: string; } & React.InputHTMLAttributes) { return (
- - + {variantSize === 'textarea' ? ( +