cdricms/latosa-escrima
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/guerby' into dev/cedric

Browse Source
This commit is contained in:
cdricms
2025-01-14 14:51:43 +01:00
parent 8f89f236e7 e9bbeb62dc
commit 1f83cf25f5
12 changed files with 278 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/app/(main)/about/page.tsx Normal file
View File

@@ -0,0 +1,16 @@
"use server"
export default async function About() {
return (
<div>
<div>
About us
will :
+explain what we
+pricing
+plannign for what will come next
</div>
</div>
)
}

11
frontend/components/nav-bar.tsx
View File

@@ -69,7 +69,7 @@ const subMenuItemsTwo = [
const Navbar = () => {
return (
<section className="p-4 bg-white top-0 sticky z-[100]">
<div className="">
<div>
<nav className="hidden justify-between lg:flex">
<div className="flex items-center gap-6">
<div className="flex items-center gap-2">
@@ -103,9 +103,8 @@ const Navbar = () => {
variant: "ghost",
}),
)}
href="/"
>
Calendar
href="/">
Planning
</a>
<a
className={cn(
@@ -115,9 +114,9 @@ const Navbar = () => {
variant: "ghost",
}),
)}
href="#"
href="/about"
>
Pricing
A propos
</a>
<a
className={cn(

108
frontend/deno.lock generated
View File

@@ -4,11 +4,15 @@
"npm:@eslint/eslintrc@3": "3.2.0",
"npm:@radix-ui/react-accordion@^1.2.2": "1.2.2_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-avatar@^1.1.2": "1.1.2_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-collapsible@^1.1.2": "1.1.2_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-dialog@^1.1.4": "1.1.4_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-dropdown-menu@^2.1.4": "2.1.4_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-label@^2.1.1": "2.1.1_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-navigation-menu@^1.2.3": "1.2.3_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-select@^2.1.4": "2.1.4_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-separator@^1.1.1": "1.1.1_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@radix-ui/react-slot@^1.1.1": "1.1.1_@types+react@19.0.5_react@19.0.0",
"npm:@radix-ui/react-tooltip@^1.1.6": "1.1.6_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@types/node@20": "20.17.12",
"npm:@types/react-dom@19": "19.0.3_@types+react@19.0.5",
"npm:@types/react@19": "19.0.5",
@@ -17,7 +21,7 @@
"npm:embla-carousel-react@^8.5.2": "8.5.2_react@19.0.0_embla-carousel@8.5.2",
"npm:eslint-config-next@15.1.4": "15.1.4_eslint@9.18.0_typescript@5.7.3_@typescript-eslint+parser@8.19.1__eslint@9.18.0__typescript@5.7.3_eslint-plugin-import@2.31.0__eslint@9.18.0",
"npm:eslint@9": "9.18.0",
"npm:lucide-react@0.471": "0.471.0_react@19.0.0",
"npm:lucide-react@~0.471.1": "0.471.1_react@19.0.0",
"npm:next@15.1.4": "15.1.4_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:postcss@8": "8.4.49",
"npm:react-dom@19": "19.0.0_react@19.0.0",
@@ -442,6 +446,22 @@
"react-dom"
]
},
"@radix-ui/react-dropdown-menu@2.1.4_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-iXU1Ab5ecM+yEepGAWK8ZhMyKX4ubFdCNtol4sT9D0OVErG9PNElfx3TQhjw7n7BC5nFVz68/5//clWy+8TXzA==",
"dependencies": [
"@radix-ui/primitive",
"@radix-ui/react-compose-refs",
"@radix-ui/react-context",
"@radix-ui/react-id",
"@radix-ui/react-menu",
"@radix-ui/react-primitive",
"@radix-ui/react-use-controllable-state",
"@types/react",
"@types/react-dom",
"react",
"react-dom"
]
},
"@radix-ui/react-focus-guards@1.1.1_@types+react@19.0.5_react@19.0.0": {
"integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==",
"dependencies": [
@@ -479,6 +499,33 @@
"react-dom"
]
},
"@radix-ui/react-menu@2.1.4_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-BnOgVoL6YYdHAG6DtXONaR29Eq4nvbi8rutrV/xlr3RQCMMb3yqP85Qiw/3NReozrSW+4dfLkK+rc1hb4wPU/A==",
"dependencies": [
"@radix-ui/primitive",
"@radix-ui/react-collection",
"@radix-ui/react-compose-refs",
"@radix-ui/react-context",
"@radix-ui/react-direction",
"@radix-ui/react-dismissable-layer",
"@radix-ui/react-focus-guards",
"@radix-ui/react-focus-scope",
"@radix-ui/react-id",
"@radix-ui/react-popper",
"@radix-ui/react-portal",
"@radix-ui/react-presence",
"@radix-ui/react-primitive",
"@radix-ui/react-roving-focus",
"@radix-ui/react-slot",
"@radix-ui/react-use-callback-ref",
"@types/react",
"@types/react-dom",
"aria-hidden",
"react",
"react-dom",
"react-remove-scroll"
]
},
"@radix-ui/react-navigation-menu@1.2.3_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-IQWAsQ7dsLIYDrn0WqPU+cdM7MONTv9nqrLVYoie3BPiabSfUVDe6Fr+oEt0Cofsr9ONDcDe9xhmJbL1Uq1yKg==",
"dependencies": [
@@ -553,6 +600,24 @@
"react-dom"
]
},
"@radix-ui/react-roving-focus@1.1.1_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-QE1RoxPGJ/Nm8Qmk0PxP8ojmoaS67i0s7hVssS7KuI2FQoc/uzVlZsqKfQvxPE6D8hICCPHJ4D88zNhT3OOmkw==",
"dependencies": [
"@radix-ui/primitive",
"@radix-ui/react-collection",
"@radix-ui/react-compose-refs",
"@radix-ui/react-context",
"@radix-ui/react-direction",
"@radix-ui/react-id",
"@radix-ui/react-primitive",
"@radix-ui/react-use-callback-ref",
"@radix-ui/react-use-controllable-state",
"@types/react",
"@types/react-dom",
"react",
"react-dom"
]
},
"@radix-ui/react-select@2.1.4_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-pOkb2u8KgO47j/h7AylCj7dJsm69BXcjkrvTqMptFqsE2i0p8lHkfgneXKjAgPzBMivnoMyt8o4KiV4wYzDdyQ==",
"dependencies": [
@@ -583,6 +648,16 @@
"react-remove-scroll"
]
},
"@radix-ui/react-separator@1.1.1_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-RRiNRSrD8iUiXriq/Y5n4/3iE8HzqgLHsusUSg5jVpU2+3tqcUFPJXHDymwEypunc2sWxDUS3UC+rkZRlHedsw==",
"dependencies": [
"@radix-ui/react-primitive",
"@types/react",
"@types/react-dom",
"react",
"react-dom"
]
},
"@radix-ui/react-slot@1.1.1_@types+react@19.0.5_react@19.0.0": {
"integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==",
"dependencies": [
@@ -591,6 +666,27 @@
"react"
]
},
"@radix-ui/react-tooltip@1.1.6_@types+react@19.0.5_@types+react-dom@19.0.3__@types+react@19.0.5_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-TLB5D8QLExS1uDn7+wH/bjEmRurNMTzNrtq7IjaS4kjion9NtzsTGkvR5+i7yc9q01Pi2KMM2cN3f8UG4IvvXA==",
"dependencies": [
"@radix-ui/primitive",
"@radix-ui/react-compose-refs",
"@radix-ui/react-context",
"@radix-ui/react-dismissable-layer",
"@radix-ui/react-id",
"@radix-ui/react-popper",
"@radix-ui/react-portal",
"@radix-ui/react-presence",
"@radix-ui/react-primitive",
"@radix-ui/react-slot",
"@radix-ui/react-use-controllable-state",
"@radix-ui/react-visually-hidden",
"@types/react",
"@types/react-dom",
"react",
"react-dom"
]
},
"@radix-ui/react-use-callback-ref@1.1.0_@types+react@19.0.5_react@19.0.0": {
"integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==",
"dependencies": [
@@ -2006,8 +2102,8 @@
"lru-cache@10.4.3": {
"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
},
"lucide-react@0.471.0_react@19.0.0": {
"integrity": "sha512-3L0OOJClsKDETJGK7nABqW8ftaVmUjWzluzPpw/6dGdI1bOmzsLsCjZpAEpg24Xs/U7xdYveQU+CBkHxWy7MrA==",
"lucide-react@0.471.1_react@19.0.0": {
"integrity": "sha512-syOxwPhf62gg2YOsz72HRn+CIpeudFy67AeKnSR8Hn/fIIF4ubhNbRF+pQ2CaJrl+X9Os4PL87z2DXQi3DVeDA==",
"dependencies": [
"react"
]
@@ -2932,11 +3028,15 @@
"npm:@eslint/eslintrc@3",
"npm:@radix-ui/react-accordion@^1.2.2",
"npm:@radix-ui/react-avatar@^1.1.2",
"npm:@radix-ui/react-collapsible@^1.1.2",
"npm:@radix-ui/react-dialog@^1.1.4",
"npm:@radix-ui/react-dropdown-menu@^2.1.4",
"npm:@radix-ui/react-label@^2.1.1",
"npm:@radix-ui/react-navigation-menu@^1.2.3",
"npm:@radix-ui/react-select@^2.1.4",
"npm:@radix-ui/react-separator@^1.1.1",
"npm:@radix-ui/react-slot@^1.1.1",
"npm:@radix-ui/react-tooltip@^1.1.6",
"npm:@types/node@20",
"npm:@types/react-dom@19",
"npm:@types/react@19",
@@ -2945,7 +3045,7 @@
"npm:embla-carousel-react@^8.5.2",
"npm:eslint-config-next@15.1.4",
"npm:eslint@9",
"npm:lucide-react@0.471",
"npm:lucide-react@~0.471.1",
"npm:next@15.1.4",
"npm:postcss@8",
"npm:react-dom@19",