Skip to content

Commit

Permalink
Re-organising, integrating feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
édouard wautier authored and édouard wautier committed Apr 4, 2024
1 parent 1136163 commit f38885f
Show file tree
Hide file tree
Showing 23 changed files with 557 additions and 166 deletions.
256 changes: 256 additions & 0 deletions front/components/home/Car.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
"use client";

import { Button, ChevronLeftIcon, ChevronRightIcon } from "@dust-tt/sparkle";
import type { UseEmblaCarouselType } from "embla-carousel-react";
import useEmblaCarousel from "embla-carousel-react";
import * as React from "react";

import { classNames } from "@app/lib/utils";

type CarouselApi = UseEmblaCarouselType[1];
type UseCarouselParameters = Parameters<typeof useEmblaCarousel>;
type CarouselOptions = UseCarouselParameters[0];
type CarouselPlugin = UseCarouselParameters[1];

type CarouselProps = {
opts?: CarouselOptions;
plugins?: CarouselPlugin;
orientation?: "horizontal" | "vertical";
setApi?: (api: CarouselApi) => void;
};

type CarouselContextProps = {
carouselRef: ReturnType<typeof useEmblaCarousel>[0];
api: ReturnType<typeof useEmblaCarousel>[1];
scrollPrev: () => void;
scrollNext: () => void;
canScrollPrev: boolean;
canScrollNext: boolean;
} & CarouselProps;

const CarouselContext = React.createContext<CarouselContextProps | null>(null);

function useCarousel() {
const context = React.useContext(CarouselContext);

if (!context) {
throw new Error("useCarousel must be used within a <Carousel />");
}

return context;
}

const Carousel = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement> & CarouselProps
>(
(
{
orientation = "horizontal",
opts,
setApi,
plugins,
className,
children,
...props
},
ref
) => {
const [carouselRef, api] = useEmblaCarousel(
{
...opts,
axis: orientation === "horizontal" ? "x" : "y",
},
plugins
);
const [canScrollPrev, setCanScrollPrev] = React.useState(false);
const [canScrollNext, setCanScrollNext] = React.useState(false);

const onSelect = React.useCallback((api: CarouselApi) => {
if (!api) {
return;
}

setCanScrollPrev(api.canScrollPrev());
setCanScrollNext(api.canScrollNext());
}, []);

const scrollPrev = React.useCallback(() => {
api?.scrollPrev();
}, [api]);

const scrollNext = React.useCallback(() => {
api?.scrollNext();
}, [api]);

const handleKeyDown = React.useCallback(
(event: React.KeyboardEvent<HTMLDivElement>) => {
if (event.key === "ArrowLeft") {
event.preventDefault();
scrollPrev();
} else if (event.key === "ArrowRight") {
event.preventDefault();
scrollNext();
}
},
[scrollPrev, scrollNext]
);

React.useEffect(() => {
if (!api || !setApi) {
return;
}

setApi(api);
}, [api, setApi]);

React.useEffect(() => {
if (!api) {
return;
}

onSelect(api);
api.on("reInit", onSelect);
api.on("select", onSelect);

return () => {
api?.off("select", onSelect);
};
}, [api, onSelect]);

return (
<CarouselContext.Provider
value={{
carouselRef,
api: api,
opts,
orientation:
orientation || (opts?.axis === "y" ? "vertical" : "horizontal"),
scrollPrev,
scrollNext,
canScrollPrev,
canScrollNext,
}}
>
<div
ref={ref}
onKeyDownCapture={handleKeyDown}
className={classNames("relative", className ? className : "")}
role="region"
aria-roledescription="carousel"
{...props}
>
{children}
</div>
</CarouselContext.Provider>
);
}
);
Carousel.displayName = "Carousel";

const CarouselContent = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => {
const { carouselRef, orientation } = useCarousel();

return (
<div ref={carouselRef} className="overflow-hidden">
<div
ref={ref}
className={classNames(
"flex",
orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col",
className ? className : ""
)}
{...props}
/>
</div>
);
});
CarouselContent.displayName = "CarouselContent";

const CarouselItem = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => {
const { orientation } = useCarousel();

return (
<div
ref={ref}
role="group"
aria-roledescription="slide"
className={classNames(
"min-w-0 shrink-0 grow-0 basis-full",
orientation === "horizontal" ? "pl-4" : "pt-4",
className ? className : ""
)}
{...props}
/>
);
});
CarouselItem.displayName = "CarouselItem";

const CarouselPrevious = React.forwardRef<
HTMLButtonElement,
React.ComponentProps<typeof Button>
>(({ className, variant = "secondary", size = "sm", ...props }, ref) => {
const { orientation, scrollPrev, canScrollPrev } = useCarousel();

return (
<Button
ref={ref}
variant={variant}
size={size}
className={classNames(
"absolute h-8 w-8 rounded-full",
orientation === "horizontal"
? "-left-12 top-1/2 -translate-y-1/2"
: "-top-12 left-1/2 -translate-x-1/2 rotate-90",
className ? className : ""
)}
disabled={!canScrollPrev}
icon={ChevronLeftIcon}
onClick={scrollPrev}
{...props}
/>
);
});
CarouselPrevious.displayName = "CarouselPrevious";

const CarouselNext = React.forwardRef<
HTMLButtonElement,
React.ComponentProps<typeof Button>
>(({ className, variant = "secondary", size = "sm", ...props }, ref) => {
const { orientation, scrollNext, canScrollNext } = useCarousel();

return (
<Button
ref={ref}
variant={variant}
size={size}
className={classNames(
"absolute h-8 w-8 rounded-full",
orientation === "horizontal"
? "-right-12 top-1/2 -translate-y-1/2"
: "-bottom-12 left-1/2 -translate-x-1/2 rotate-90",
className ? className : ""
)}
disabled={!canScrollNext}
icon={ChevronRightIcon}
onClick={scrollNext}
{...props}
/>
);
});
CarouselNext.displayName = "CarouselNext";

export {
Carousel,
type CarouselApi,
CarouselContent,
CarouselItem,
CarouselNext,
CarouselPrevious,
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ChevronDownIcon, Icon } from "@dust-tt/sparkle";
import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu";
import * as React from "react";

import { A } from "@app/components/home/contentComponents";
import { A } from "@app/components/home/components/contentComponents";
import { classNames } from "@app/lib/utils";

const NavigationMenu = React.forwardRef<
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
H4,
H5,
P,
} from "@app/components/home/contentComponents";
} from "@app/components/home/components/contentComponents";
import { classNames } from "@app/lib/utils";

interface ImgBlockProps {
Expand Down Expand Up @@ -121,10 +121,10 @@ interface BlockProps {
}

const blockColors = {
pink: { block: "bg-pink-300/80", title: "text-pink-800" },
sky: { block: "bg-sky-300/80", title: "text-sky-800" },
emerald: { block: "bg-emerald-300/80", title: "text-emerald-800" },
amber: { block: "bg-amber-300/80", title: "text-amber-800" },
pink: { block: "bg-pink-300", title: "text-pink-700" },
sky: { block: "bg-sky-300", title: "text-sky-700" },
emerald: { block: "bg-emerald-300", title: "text-emerald-700" },
amber: { block: "bg-amber-300", title: "text-amber-700" },
};

export const Block = ({ children, title, color }: BlockProps) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const Span = ({ children, className = "" }: ContentProps) => (
const pClasses = {
xxs: "font-objektiv text-xs text-slate-500 md:text-sm leading-relaxed",
xs: "font-objektiv text-sm text-slate-400 md:text-base leading-relaxed",
sm: "font-objektiv text-base text-slate-300 md:text-lg leading-relaxed",
sm: "font-objektiv text-base text-slate-400 md:text-lg leading-relaxed",
md: "font-objektiv text-base md:text-lg text-slate-300 lg:text-xl drop-shadow leading-relaxed",
lg: "font-objektiv text-lg md:text-xl text-slate-300 lg:text-2xl drop-shadow leading-relaxed",
};
Expand Down Expand Up @@ -171,9 +171,7 @@ export const A = ({
};

export const Strong = ({ children, className = "" }: ContentProps) => (
<strong className={classNames(className, "font-semibold text-slate-200")}>
{children}
</strong>
<strong className={classNames(className, "font-semibold")}>{children}</strong>
);

interface ReactImgProps {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React from "react";

import { avatars, DroidItem } from "@app/components/home/carousel";
import { avatars, DroidItem } from "@app/components/home/components/carousel";
import {
Block,
Conversation,
Handle,
HeaderContentBlock,
Message,
} from "@app/components/home/contentBlocks";
import { Grid, H1, P } from "@app/components/home/contentComponents";
} from "@app/components/home/components/contentBlocks";
import { Grid, H1, P } from "@app/components/home/components/contentComponents";
import { classNames } from "@app/lib/utils";

const defaultFlexClasses = "flex flex-col gap-4";
Expand All @@ -35,19 +35,6 @@ export function ForCustomerSupport() {
}
/>

<Grid>
<H1 className="col-span-12 text-center text-white">
Links to Blog articles around Marketing use cases
</H1>
</Grid>
<Grid>
<H1 className="col-span-12 text-center text-white">
Structured referal specific to Marketing
<br />
(post from our users, quotes)
</H1>
</Grid>
{/* <SimpleSlider slides={customerSupportSlides} /> */}
<Grid>
<div
className={classNames(
Expand Down Expand Up @@ -155,6 +142,18 @@ export function ForCustomerSupport() {
</Conversation>
</div>
</Grid>
<Grid>
<H1 className="col-span-12 text-center text-white">
Links to Blog articles around Marketing use cases
</H1>
</Grid>
<Grid>
<H1 className="col-span-12 text-center text-white">
Structured referal specific to Marketing
<br />
(post from our users, quotes)
</H1>
</Grid>
</>
);
}
Expand Down
Loading

0 comments on commit f38885f

Please sign in to comment.