Merge remote-tracking branch 'origin/dev/guerby' into dev/cedric
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
"use server";
|
||||
|
||||
import Features, { FeatureItem } from "@/components/features";
|
||||
import Gallery6 from "@/components/gallery";
|
||||
import Gallery from "@/components/gallery";
|
||||
import Hero from "@/components/hero";
|
||||
import Testimonial from "@/components/testimonial";
|
||||
|
||||
@@ -9,7 +9,7 @@ export default async function Home() {
|
||||
return (
|
||||
<main>
|
||||
<Hero />
|
||||
<div className="flex flex-col">
|
||||
<div className="flex flex-col p-12">
|
||||
<Features
|
||||
title="DÉVELOPPEMENT DU SYSTÈME"
|
||||
description="Latosa Escrima Concepts est un système martial dynamique et en constante évolution. Ce système repose sur une approche logique, qui progresse au fil du développement des compétences techniques des pratiquants."
|
||||
@@ -112,10 +112,10 @@ export default async function Home() {
|
||||
</ul>
|
||||
</FeatureItem>
|
||||
</Features>
|
||||
</div>
|
||||
<Gallery6 />
|
||||
<Gallery6 />
|
||||
<Gallery />
|
||||
<Gallery />
|
||||
<Testimonial />
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ const Features: React.FC<
|
||||
}>
|
||||
> = ({ title, description, cta, children }) => {
|
||||
return (
|
||||
<section className="py-32 px-4 container self-center">
|
||||
<div className="flex flex-col gap-16 lg:px-16">
|
||||
<section className="lg:md:py-24 sm:py-12 container self-center">
|
||||
<div className="flex flex-col gap-16">
|
||||
<div className="lg:max-w-sm">
|
||||
<h2 className="mb-3 text-xl font-semibold md:mb-4 md:text-4xl lg:mb-6">
|
||||
{title}
|
||||
|
||||
@@ -54,7 +54,7 @@ const data = [
|
||||
},
|
||||
];
|
||||
|
||||
const Gallery6 = () => {
|
||||
const Gallery = () => {
|
||||
const [carouselApi, setCarouselApi] = useState<CarouselApi>();
|
||||
const [canScrollPrev, setCanScrollPrev] = useState(false);
|
||||
const [canScrollNext, setCanScrollNext] = useState(false);
|
||||
@@ -73,7 +73,7 @@ const Gallery6 = () => {
|
||||
};
|
||||
}, [carouselApi]);
|
||||
return (
|
||||
<section className="py-32 py-32 flex flex-col items-center overflow-visible">
|
||||
<section className="lg:md:py-24 sm:py-12 flex flex-col items-center overflow-visible">
|
||||
<div className="container">
|
||||
<div className="mb-8 flex flex-col justify-between md:mb-14 md:flex-row md:items-end lg:mb-16">
|
||||
<div>
|
||||
@@ -171,4 +171,4 @@ const Gallery6 = () => {
|
||||
);
|
||||
};
|
||||
|
||||
export default Gallery6;
|
||||
export default Gallery;
|
||||
|
||||
@@ -36,7 +36,7 @@ const testimonials = [
|
||||
},
|
||||
];
|
||||
|
||||
const Testimonial14 = () => {
|
||||
const Testimonial = () => {
|
||||
const [api, setApi] = useState<CarouselApi>();
|
||||
const [current, setCurrent] = useState(0);
|
||||
|
||||
@@ -109,4 +109,4 @@ const Testimonial14 = () => {
|
||||
);
|
||||
};
|
||||
|
||||
export default Testimonial14;
|
||||
export default Testimonial;
|
||||
|
||||
15
latosa-frontend/deno.lock
generated
15
latosa-frontend/deno.lock
generated
@@ -3,6 +3,7 @@
|
||||
"specifiers": {
|
||||
"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-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-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",
|
||||
@@ -340,6 +341,19 @@
|
||||
"react-dom"
|
||||
]
|
||||
},
|
||||
"@radix-ui/react-avatar@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": {
|
||||
"integrity": "sha512-GaC7bXQZ5VgZvVvsJ5mu/AEbjYLnhhkoidOboC50Z6FFlLA03wG2ianUoH+zgDQ31/9gCF59bE4+2bBgTyMiig==",
|
||||
"dependencies": [
|
||||
"@radix-ui/react-context",
|
||||
"@radix-ui/react-primitive",
|
||||
"@radix-ui/react-use-callback-ref",
|
||||
"@radix-ui/react-use-layout-effect",
|
||||
"@types/react",
|
||||
"@types/react-dom",
|
||||
"react",
|
||||
"react-dom"
|
||||
]
|
||||
},
|
||||
"@radix-ui/react-collapsible@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": {
|
||||
"integrity": "sha512-PliMB63vxz7vggcyq0IxNYk8vGDrLXVWw4+W4B8YnwI1s18x7YZYqlG9PLX7XxAJUi0g2DxP4XKJMFHh/iVh9A==",
|
||||
"dependencies": [
|
||||
@@ -2917,6 +2931,7 @@
|
||||
"dependencies": [
|
||||
"npm:@eslint/eslintrc@3",
|
||||
"npm:@radix-ui/react-accordion@^1.2.2",
|
||||
"npm:@radix-ui/react-avatar@^1.1.2",
|
||||
"npm:@radix-ui/react-dialog@^1.1.4",
|
||||
"npm:@radix-ui/react-label@^2.1.1",
|
||||
"npm:@radix-ui/react-navigation-menu@^1.2.3",
|
||||
|
||||
Reference in New Issue
Block a user