Merge branch 'main' of https://github.com/batyr-Ashyrberdiyev/turkmen-textile-react
This commit is contained in:
commit
f78d16181f
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -66,10 +66,10 @@
|
|||
})(window, document, "script", "dataLayer", "GTM-NK394LVK");
|
||||
</script>
|
||||
<title>Turkmen Textile</title>
|
||||
<script type="module" crossorigin src="/assets/index-D5Mf7w2W.js"></script>
|
||||
<script type="module" crossorigin src="/assets/index-CSy9NDuf.js"></script>
|
||||
<link rel="modulepreload" crossorigin href="/assets/react-vendor-CE_Ks92h.js">
|
||||
<link rel="modulepreload" crossorigin href="/assets/ui-library-4YgHSYgx.js">
|
||||
<link rel="stylesheet" crossorigin href="/assets/index-skojl2Dn.css">
|
||||
<link rel="modulepreload" crossorigin href="/assets/ui-library-DnfAJi3B.js">
|
||||
<link rel="stylesheet" crossorigin href="/assets/index-BqqKTpCf.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import {
|
|||
} from "../ui/navigation-menu";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { Link } from "react-router-dom";
|
||||
import { useUiStore } from "@/store/ui";
|
||||
|
||||
interface Props {
|
||||
className?: string;
|
||||
|
|
@ -26,6 +27,8 @@ export const HoverMenu: FC<Props> = ({
|
|||
hoverItems,
|
||||
setIsOpen,
|
||||
}) => {
|
||||
const setSheet = useUiStore((state) => state.setSheet);
|
||||
|
||||
return (
|
||||
<NavigationMenu>
|
||||
<NavigationMenuList>
|
||||
|
|
@ -42,7 +45,10 @@ export const HoverMenu: FC<Props> = ({
|
|||
{hoverItems?.map((item, i) => (
|
||||
<NavigationMenuLink
|
||||
key={i}
|
||||
onClick={() => setIsOpen(false)}
|
||||
onClick={() => {
|
||||
setIsOpen(false);
|
||||
setSheet(false);
|
||||
}}
|
||||
className="h-14 py-2 flex items-center w-40 cursor-pointer px-4 hover:bg-slate-300/50 transition-all"
|
||||
>
|
||||
<Link to={item.link ?? ""}>{item.text}</Link>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ const Designers = () => {
|
|||
const [emblaRef, emblaApi] = useEmblaCarousel({
|
||||
align: "center",
|
||||
skipSnaps: true,
|
||||
slidesToScroll: 3,
|
||||
slidesToScroll: 2,
|
||||
dragFree: true,
|
||||
});
|
||||
const [activeIndex, setActiveIndex] = useState(0);
|
||||
|
|
@ -60,6 +60,12 @@ const Designers = () => {
|
|||
text2: string;
|
||||
};
|
||||
|
||||
const sortedItems = [...(data?.designers ?? [])]?.sort(
|
||||
(a, b) => a?.order_id - b?.order_id
|
||||
);
|
||||
|
||||
console.log(sortedItems);
|
||||
|
||||
return (
|
||||
<section className="md:py-20 py-10">
|
||||
<Container className="flex flex-col md:gap-10 gap-6">
|
||||
|
|
@ -75,7 +81,7 @@ const Designers = () => {
|
|||
{isPending ? (
|
||||
<Loader />
|
||||
) : (
|
||||
data?.designers?.map((item, i) => (
|
||||
sortedItems?.map((item, i) => (
|
||||
<DesignerCard
|
||||
key={i}
|
||||
{...item}
|
||||
|
|
@ -97,7 +103,11 @@ const Designers = () => {
|
|||
</button>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
{[...Array(3)].map((_, i) => (
|
||||
{[
|
||||
...Array(
|
||||
sortedItems?.length ? Math.round(sortedItems?.length / 2) : 5
|
||||
),
|
||||
].map((_, i) => (
|
||||
<div
|
||||
key={i}
|
||||
onClick={() => scrollToSnap?.(i)}
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ export const Menu: FC<PropsWithChildren<Props>> = ({
|
|||
onMouseEnter={() => setIsHover(item.hover ? true : false)}
|
||||
onMouseLeave={() => setIsHover(false)}
|
||||
className="relative"
|
||||
key={i}
|
||||
>
|
||||
<div
|
||||
key={item.text}
|
||||
|
|
|
|||
|
|
@ -84,10 +84,14 @@ const NavigationMenuViewport = React.forwardRef<
|
|||
React.ElementRef<typeof NavigationMenuPrimitive.Viewport>,
|
||||
React.ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Viewport>
|
||||
>(({ className, ...props }, ref) => (
|
||||
<div className={cn("absolute left-full top-0 flex justify-center w-40")}>
|
||||
<div
|
||||
className={cn(
|
||||
"absolute xl:left-full xl:top-0 -top-36 flex justify-center w-40"
|
||||
)}
|
||||
>
|
||||
<NavigationMenuPrimitive.Viewport
|
||||
className={cn(
|
||||
"origin-top-center relative mt-1.5 h-[var(--radix-navigation-menu-viewport-height)] w-40 overflow-hidden rounded-md text-popover-foreground shadow data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90",
|
||||
"origin-top-center relative mt-1.5 h-[var(--radix-navigation-menu-viewport-height)] w-40 rounded-md text-popover-foreground shadow data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90",
|
||||
className
|
||||
)}
|
||||
ref={ref}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ export interface Designer {
|
|||
updated_at: string;
|
||||
category_designer_id: number;
|
||||
achievements: Achievement[];
|
||||
order_id: number | null;
|
||||
order_id: number;
|
||||
image: DesignerImage;
|
||||
images: DesignerImage[];
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue