From ad63fc4ca4aacaa2a72b158897ca07cb0e259057 Mon Sep 17 00:00:00 2001 From: henrikhaus Date: Mon, 22 Jan 2024 16:53:43 +0100 Subject: [PATCH 1/6] Squashed commit of the following: commit 8c6d9d9bcbc1e77f40706bb334f0791f531435bc Author: Anders Date: Mon Jan 22 16:37:19 2024 +0100 Pages shell for tournament wireframe --- app/tournament/[id]/page.tsx | 7 +++++++ app/tournament/create/page.tsx | 0 app/tournament/page.tsx | 1 + components/tournament/activeTournamentView.tsx | 0 components/tournament/createTeamForm.tsx | 0 components/tournament/createTournamentForm.tsx | 0 components/tournament/leaderboard.tsx | 0 components/tournament/teamDetailsModal.tsx | 0 8 files changed, 8 insertions(+) create mode 100644 app/tournament/[id]/page.tsx create mode 100644 app/tournament/create/page.tsx create mode 100644 app/tournament/page.tsx create mode 100644 components/tournament/activeTournamentView.tsx create mode 100644 components/tournament/createTeamForm.tsx create mode 100644 components/tournament/createTournamentForm.tsx create mode 100644 components/tournament/leaderboard.tsx create mode 100644 components/tournament/teamDetailsModal.tsx diff --git a/app/tournament/[id]/page.tsx b/app/tournament/[id]/page.tsx new file mode 100644 index 0000000..fbef127 --- /dev/null +++ b/app/tournament/[id]/page.tsx @@ -0,0 +1,7 @@ +interface TournamentPageProps { + params: { + id: string; + }; +} + +export default function TournamentPage(props: TournamentPageProps) {} diff --git a/app/tournament/create/page.tsx b/app/tournament/create/page.tsx new file mode 100644 index 0000000..e69de29 diff --git a/app/tournament/page.tsx b/app/tournament/page.tsx new file mode 100644 index 0000000..3653776 --- /dev/null +++ b/app/tournament/page.tsx @@ -0,0 +1 @@ +export default function BrowseTournamentsPage() {} diff --git a/components/tournament/activeTournamentView.tsx b/components/tournament/activeTournamentView.tsx new file mode 100644 index 0000000..e69de29 diff --git a/components/tournament/createTeamForm.tsx b/components/tournament/createTeamForm.tsx new file mode 100644 index 0000000..e69de29 diff --git a/components/tournament/createTournamentForm.tsx b/components/tournament/createTournamentForm.tsx new file mode 100644 index 0000000..e69de29 diff --git a/components/tournament/leaderboard.tsx b/components/tournament/leaderboard.tsx new file mode 100644 index 0000000..e69de29 diff --git a/components/tournament/teamDetailsModal.tsx b/components/tournament/teamDetailsModal.tsx new file mode 100644 index 0000000..e69de29 From ea5c6ffad9bea4b877a42cd4c6da740b570d16d2 Mon Sep 17 00:00:00 2001 From: henrikhaus Date: Mon, 5 Feb 2024 19:35:14 +0100 Subject: [PATCH 2/6] Added tournament creation page --- app/tournament/create/page.tsx | 14 ++ .../tournament/createTournamentForm.tsx | 218 ++++++++++++++++++ components/ui/switch.tsx | 29 +++ package-lock.json | 47 ++++ package.json | 3 +- 5 files changed, 310 insertions(+), 1 deletion(-) create mode 100644 components/ui/switch.tsx diff --git a/app/tournament/create/page.tsx b/app/tournament/create/page.tsx index e69de29..da56279 100644 --- a/app/tournament/create/page.tsx +++ b/app/tournament/create/page.tsx @@ -0,0 +1,14 @@ +import { ProfileForm } from '../../../components/tournament/createTournamentForm'; + +export default async function CreateTournamentPage() { + return ( +
+
+
+
Ny turnering
+ +
+
+
+ ); +} diff --git a/components/tournament/createTournamentForm.tsx b/components/tournament/createTournamentForm.tsx index e69de29..3c95e55 100644 --- a/components/tournament/createTournamentForm.tsx +++ b/components/tournament/createTournamentForm.tsx @@ -0,0 +1,218 @@ +'use client'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import { Button } from '@/components/ui/button'; +import { + Form, + FormControl, + FormDescription, + FormField, + FormItem, + FormLabel, + FormMessage, +} from '@/components/ui/form'; +import { Input } from '@/components/ui/input'; +import { Switch } from '@/components/ui/switch'; + +const formSchema = z.object({ + tournamentName: z.string().min(2, { + message: 'Minst 2 tegn', + }), + randomTeams: z.boolean().default(false).optional(), + thildeExclusive: z.boolean().default(false).optional(), + bronzeFinal: z.boolean().default(false).optional(), + maxParticipants: z.boolean().default(false).optional(), + maxParticipantsNumber: z.coerce + .number() + .min(2, { + message: 'Minst 2 spillere', + }) + .max(64, { + message: 'Max 64 spillere', + }) + .default(8) + .optional(), + privateTournament: z.boolean().default(false).optional(), +}); + +export function ProfileForm() { + const form = useForm>({ + resolver: zodResolver(formSchema), + defaultValues: { + tournamentName: '', + randomTeams: false, + thildeExclusive: false, + bronzeFinal: false, + maxParticipants: false, + maxParticipantsNumber: 8, + privateTournament: false, + }, + }); + const maxParticipantsWatch = form.watch('maxParticipants', false); + + // 2. Define a submit handler. + function onSubmit(values: z.infer) { + // Do something with the form values. + // ✅ This will be type-safe and validated. + console.log(values); + } + + return ( +
+ + ( + + + + + + + + )} + /> + ( + +
+ Tilfeldige lag? + + Alle spillere blir fordelt på tilfeldige lag + +
+ + + + + )} + /> + ( + +
+ THILDE-exclusive? + + Bare THILDE-medlemmer kan delta + +
+ + + + + )} + /> + ( + +
+ Bronsefinale? + + Arranger bronsefinale for de som taper semifinalen + +
+ + + + + )} + /> + ( + +
+ Max Spillere? + + Begrens antall spillere som kan delta + +
+ + + + + )} + /> + {maxParticipantsWatch && ( + ( + +
+ Max: + + + +
+ + + + )} + /> + )} + ( + +
+ Privat turnering? + Kun invitasjoner kan delta +
+ + + + + )} + /> +
+ +
+ + + ); +} diff --git a/components/ui/switch.tsx b/components/ui/switch.tsx new file mode 100644 index 0000000..1dd57e9 --- /dev/null +++ b/components/ui/switch.tsx @@ -0,0 +1,29 @@ +'use client'; + +import * as SwitchPrimitives from '@radix-ui/react-switch'; +import * as React from 'react'; + +import { cn } from '@/lib/utils'; + +const Switch = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + + + +)); +Switch.displayName = SwitchPrimitives.Root.displayName; + +export { Switch }; diff --git a/package-lock.json b/package-lock.json index 446d753..a7f4b98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "@radix-ui/react-label": "^2.0.2", "@radix-ui/react-separator": "^1.0.3", "@radix-ui/react-slot": "^1.0.2", + "@radix-ui/react-switch": "^1.0.3", "axios": "^1.5.1", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", @@ -956,6 +957,35 @@ } } }, + "node_modules/@radix-ui/react-switch": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.0.3.tgz", + "integrity": "sha512-mxm87F88HyHztsI7N+ZUmEoARGkC22YVW5CaC+Byc+HRpuvCrOBPTAnXgf+tZ/7i0Sg/eOePGdMhUKhPaQEqow==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.1", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-context": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-use-controllable-state": "1.0.1", + "@radix-ui/react-use-previous": "1.0.1", + "@radix-ui/react-use-size": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-use-callback-ref": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz", @@ -1026,6 +1056,23 @@ } } }, + "node_modules/@radix-ui/react-use-previous": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.0.1.tgz", + "integrity": "sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==", + "dependencies": { + "@babel/runtime": "^7.13.10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-use-rect": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz", diff --git a/package.json b/package.json index 001f6c9..ad4cbbd 100644 --- a/package.json +++ b/package.json @@ -11,12 +11,13 @@ }, "dependencies": { "@hookform/resolvers": "^3.3.4", - "@radix-ui/react-label": "^2.0.2", "@radix-ui/react-avatar": "^1.0.4", "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-dropdown-menu": "^2.0.6", + "@radix-ui/react-label": "^2.0.2", "@radix-ui/react-separator": "^1.0.3", "@radix-ui/react-slot": "^1.0.2", + "@radix-ui/react-switch": "^1.0.3", "axios": "^1.5.1", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", From f1761a770fcd94c1cdba835c306890de43909b3e Mon Sep 17 00:00:00 2001 From: henrikhaus Date: Mon, 4 Mar 2024 19:29:02 +0100 Subject: [PATCH 3/6] fix --- package-lock.json | 150 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 140 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7f4b98..77995b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "blitzed", "version": "0.1.0", "dependencies": { + "@fortawesome/fontawesome-svg-core": "^6.5.1", + "@fortawesome/free-solid-svg-icons": "^6.5.1", + "@fortawesome/react-fontawesome": "^0.2.0", "@hookform/resolvers": "^3.3.4", "@radix-ui/react-avatar": "^1.0.4", "@radix-ui/react-dialog": "^1.0.5", @@ -16,10 +19,12 @@ "@radix-ui/react-separator": "^1.0.3", "@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-switch": "^1.0.3", + "@radix-ui/react-tooltip": "^1.0.7", "axios": "^1.5.1", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", "cookie": "^0.5.0", + "embla-carousel-react": "^8.0.0-rc22", "js-cookie": "^3.0.5", "lucide-react": "^0.307.0", "next": "13.5.4", @@ -169,6 +174,51 @@ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz", + "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz", + "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.5.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.1.tgz", + "integrity": "sha512-S1PPfU3mIJa59biTtXJz1oI0+KAXW6bkAb31XKhxdxtuXDiUIFsih4JR1v5BbxY7hVHsD1RKq+jRkVRaf773NQ==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.5.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "dependencies": { + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "react": ">=16.3" + } + }, "node_modules/@hookform/resolvers": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.3.4.tgz", @@ -986,6 +1036,40 @@ } } }, + "node_modules/@radix-ui/react-tooltip": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.0.7.tgz", + "integrity": "sha512-lPh5iKNFVQ/jav/j6ZrWq3blfDJ0OH9R6FlNUHPMqdLuQ9vwDgFsRxvl8b7Asuy5c8xmoojHUxKHQSOAvMHxyw==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.1", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-context": "1.0.1", + "@radix-ui/react-dismissable-layer": "1.0.5", + "@radix-ui/react-id": "1.0.1", + "@radix-ui/react-popper": "1.1.3", + "@radix-ui/react-portal": "1.0.4", + "@radix-ui/react-presence": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-slot": "1.0.2", + "@radix-ui/react-use-controllable-state": "1.0.1", + "@radix-ui/react-visually-hidden": "1.0.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-use-callback-ref": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz", @@ -1109,6 +1193,29 @@ } } }, + "node_modules/@radix-ui/react-visually-hidden": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.3.tgz", + "integrity": "sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-primitive": "1.0.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/rect": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.1.tgz", @@ -1958,11 +2065,11 @@ } }, "node_modules/axios": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", - "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -2432,6 +2539,31 @@ "integrity": "sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ==", "dev": true }, + "node_modules/embla-carousel": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.0.0.tgz", + "integrity": "sha512-ecixcyqS6oKD2nh5Nj5MObcgoSILWNI/GtBxkidn5ytFaCCmwVHo2SecksaQZHcARMMpIR2dWOlSIdA1LkZFUA==" + }, + "node_modules/embla-carousel-react": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/embla-carousel-react/-/embla-carousel-react-8.0.0.tgz", + "integrity": "sha512-qT0dii8ZwoCtEIBE6ogjqU2+5IwnGfdt2teKjCzW88JRErflhlCpz8KjWnW8xoRZOP8g0clRtsMEFoAgS/elfA==", + "dependencies": { + "embla-carousel": "8.0.0", + "embla-carousel-reactive-utils": "8.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.1 || ^18.0.0" + } + }, + "node_modules/embla-carousel-reactive-utils": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.0.0.tgz", + "integrity": "sha512-JCw0CqCXI7tbHDRogBb9PoeMLyjEC1vpN0lDOzUjmlfVgtfF+ffLaOK8bVtXVUEbNs/3guGe3NSzA5J5aYzLzw==", + "peerDependencies": { + "embla-carousel": "8.0.0" + } + }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -3159,9 +3291,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", - "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "funding": [ { "type": "individual", @@ -4934,7 +5066,6 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dev": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -5016,8 +5147,7 @@ "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/react-remove-scroll": { "version": "2.5.5", From e92533387c646c20497deb00abd84baf6ec71f24 Mon Sep 17 00:00:00 2001 From: henrikhaus Date: Mon, 22 Jan 2024 16:53:43 +0100 Subject: [PATCH 4/6] Squashed commit of the following: commit 8c6d9d9bcbc1e77f40706bb334f0791f531435bc Author: Anders Date: Mon Jan 22 16:37:19 2024 +0100 Pages shell for tournament wireframe --- app/tournament/[id]/page.tsx | 6 +----- components/tournament/createTeamForm.tsx | 0 components/tournament/teamDetailsModal.tsx | 0 3 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 components/tournament/createTeamForm.tsx create mode 100644 components/tournament/teamDetailsModal.tsx diff --git a/app/tournament/[id]/page.tsx b/app/tournament/[id]/page.tsx index 3cecc87..fbef127 100644 --- a/app/tournament/[id]/page.tsx +++ b/app/tournament/[id]/page.tsx @@ -1,11 +1,7 @@ -import Before from './before'; - interface TournamentPageProps { params: { id: string; }; } -export default function TournamentPage(props: TournamentPageProps) { - return ; -} +export default function TournamentPage(props: TournamentPageProps) {} diff --git a/components/tournament/createTeamForm.tsx b/components/tournament/createTeamForm.tsx new file mode 100644 index 0000000..e69de29 diff --git a/components/tournament/teamDetailsModal.tsx b/components/tournament/teamDetailsModal.tsx new file mode 100644 index 0000000..e69de29 From d974b22e92440dcc18a4bf923ad8d29dfbea3659 Mon Sep 17 00:00:00 2001 From: henrikhaus Date: Mon, 4 Mar 2024 19:29:02 +0100 Subject: [PATCH 5/6] fix --- package-lock.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/package-lock.json b/package-lock.json index 188e538..030f4a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", "cookie": "^0.5.0", + "embla-carousel-react": "^8.0.0-rc22", "js-cookie": "^3.0.5", "lucide-react": "^0.307.0", "next": "13.5.4", @@ -2350,6 +2351,31 @@ "integrity": "sha512-UpyCWObBoD+nSZgOC2ToaIdZB0r9GhqT2WahPKiSki6ckkSuKhQNso8V2PrFcHBMleI/eqbKgVQgVC4Wni4ilw==", "dev": true }, + "node_modules/embla-carousel": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.0.0.tgz", + "integrity": "sha512-ecixcyqS6oKD2nh5Nj5MObcgoSILWNI/GtBxkidn5ytFaCCmwVHo2SecksaQZHcARMMpIR2dWOlSIdA1LkZFUA==" + }, + "node_modules/embla-carousel-react": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/embla-carousel-react/-/embla-carousel-react-8.0.0.tgz", + "integrity": "sha512-qT0dii8ZwoCtEIBE6ogjqU2+5IwnGfdt2teKjCzW88JRErflhlCpz8KjWnW8xoRZOP8g0clRtsMEFoAgS/elfA==", + "dependencies": { + "embla-carousel": "8.0.0", + "embla-carousel-reactive-utils": "8.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.1 || ^18.0.0" + } + }, + "node_modules/embla-carousel-reactive-utils": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.0.0.tgz", + "integrity": "sha512-JCw0CqCXI7tbHDRogBb9PoeMLyjEC1vpN0lDOzUjmlfVgtfF+ffLaOK8bVtXVUEbNs/3guGe3NSzA5J5aYzLzw==", + "peerDependencies": { + "embla-carousel": "8.0.0" + } + }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", From 40cf5568b388c835b720187f0c102bcec4eadf48 Mon Sep 17 00:00:00 2001 From: henrikhaus Date: Mon, 4 Mar 2024 19:56:02 +0100 Subject: [PATCH 6/6] bug fix --- app/tournament/[id]/ongoing.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tournament/[id]/ongoing.tsx b/app/tournament/[id]/ongoing.tsx index 4cf5235..a20db50 100644 --- a/app/tournament/[id]/ongoing.tsx +++ b/app/tournament/[id]/ongoing.tsx @@ -112,7 +112,7 @@ function MatchPages() { className={'basis-1/2 flex flex-col justify-evenly gap-2 mt-10 '} key={i.toString()} > -

Runde {i + 1}

+

Runde {i + 1}

{matches .filter((_) => _.round == i + 1) .map((t) => (