Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bun run build
pnpm lint-staged
4 changes: 2 additions & 2 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
bun run build
# git pull --rebase origin main
pnpm build

4 changes: 3 additions & 1 deletion apps/core/app/(landing)/_components/PurchaseCard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { Button, Select, Typography } from "@repo/ui/components";
import { Button } from "@repo/ui/components/atoms/button";
import { Select } from "@repo/ui/components/molecules/select";
import { Typography } from "@repo/ui/components/atoms/typography";
import { IconDownload } from "@tabler/icons-react";
import Image from "next/image";

Expand Down
6 changes: 3 additions & 3 deletions apps/core/app/(landing)/_components/TextGenerateEffect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { useEffect } from "react";
import { motion, stagger, useAnimate } from "framer-motion";
import { cn } from "@repo/ui/lib/utils";
import { Typography } from "@repo/ui/components";
import { Typography } from "@repo/ui/components/atoms/typography";

export const TextGenerateEffect = ({
words,
Expand All @@ -27,7 +27,7 @@ export const TextGenerateEffect = ({
{
duration: duration ? duration : 1,
delay: stagger(0.2),
}
},
);
}, [scope.current]);

Expand All @@ -54,7 +54,7 @@ export const TextGenerateEffect = ({
return (
<div className={cn("font-bold", className)}>
<div className="mt-4">
<Typography
<Typography
variant="display/sm"
weight="normal"
className="text-center hidden md:block tracking-wide"
Expand Down
24 changes: 17 additions & 7 deletions apps/core/app/(landing)/_components/addtoCard.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
"use client";

import Card from "./card";
import { Button } from "@repo/ui/components";
import { Button } from "@repo/ui/components/atoms/button";
import Securityicon from "@repo/icons/security";
import { useState } from "react";
import CardSkeleton from "./card-cart-skeleton";
import { useCartStore } from "../store/cart-store";
import { Typography } from "@repo/ui/components";
import { Typography } from "@repo/ui/components/atoms/typography";
import { useRouter } from "next/navigation";

const Addtocard = () => {
const { closeAddToCart } = useCartStore();
const router = useRouter();

const [cards, setCards] = useState([
{ id: 2, title: "Traveler - Travel Agency", price: 15, image: "/cart-1.png" },
{ id: 3, title: "Traveler - Travel Agency", price: 15, image: "/cart-2.png" },
{
id: 2,
title: "Traveler - Travel Agency",
price: 15,
image: "/cart-1.png",
},
{
id: 3,
title: "Traveler - Travel Agency",
price: 15,
image: "/cart-2.png",
},
]);

const temp = [1, 2, 3];
Expand Down Expand Up @@ -57,12 +67,12 @@ const Addtocard = () => {

{/* Pay Now Button */}

<Button
size="lg"
<Button
size="lg"
className="w-full bg-primary text-white text-lg font-semibold rounded-xl mt-2"
onClick={() => router.push("/payment")}
>
Pay Now
Pay Now
</Button>

{/* Secure Payment Message */}
Expand Down
2 changes: 1 addition & 1 deletion apps/core/app/(landing)/_components/background-landing.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Image from "next/image";
import { DashedCircles } from "@repo/ui/components";
import { DashedCircles } from "@repo/ui/components/atoms/dashed-circles";
import blender from "../_assets/blender.svg";
import planet from "../_assets/planet.svg";
import figma from "../_assets/figma.svg";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Typography } from "@repo/ui/components";
import { Typography } from "@repo/ui/components/atoms/typography";
import IllustratorIcon from "@repo/icons/Illustrator";
import Adobexdicon from "@repo/icons/adobexd";
import Belendericon from "@repo/icons/belender";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useMegaMenuStore } from "../../store/mega-menu";
import { BottomPartMenu } from "./bottomPart/bottom-part-menu";
import { TopPartMenu } from "./topPart/top-part-menu";
import { RetroGrid } from "@repo/ui/components";
import { RetroGrid } from "@repo/ui/components/atoms/retroGrid";

const BrowseMegaMenu = () => {
const { closeMegaMenu } = useMegaMenuStore();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import IllustrationIcon from "@repo/icons/illustration";
import MockUpsIcon from "@repo/icons/mockups";
import PolygonIcon from "@repo/icons/polygon";
import WireFrameIcon from "@repo/icons/wire-frame";
import { Typography } from "@repo/ui/components";
import { Typography } from "@repo/ui/components/atoms/typography";
import Link from "next/link";

interface CategoryItemProps {
Expand Down
2 changes: 1 addition & 1 deletion apps/core/app/(landing)/_components/card.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Removeicon from "@repo/icons/remove";
import { Typography } from "@repo/ui/components";
import { Typography } from "@repo/ui/components/atoms/typography";
import Image from "next/image";

interface CardProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import {
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@repo/ui/components";
} from "@repo/ui/components/atoms/dropdown-menu";
import Image from "next/image";
import Link from "next/link";
import Useractionpixelicon from "@repo/icons/useractionpixel";
import {
AvatarImage,
AvatarFallback,
Avatar,
} from "@repo/ui/components";
} from "@repo/ui/components/atoms/avatar";
import { useMegaMenuStore } from "./../../store/mega-menu";

const FeatureNavbarAuthenticated = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
import IconShoppingBag from "@repo/icons/shopping-bag";
import { Typography } from "@repo/ui/components";
import { Typography } from "@repo/ui/components/atoms/typography";
import Link from "next/link";
import { useCartStore } from "./../../store/cart-store";



const FeatureNavbarGuest = () => {


const { toggleAddToCart } = useCartStore();

const onClick = () => {

toggleAddToCart();
};
};

return (
<div className="flex items-center gap-3 shrink-0 ">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Typography } from "@repo/ui/components";
import { Typography } from "@repo/ui/components/atoms/typography";
import { useMegaMenuStore } from "./../../store/mega-menu";
import { useCartStore } from "./../../store/cart-store";
import Link from "next/link";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import PixelIcon from "@repo/icons/pxiel";
import SearchIcon from "@repo/icons/serach";
import XIcon from "@repo/icons/x";
import { BaseInput, Chip } from "@repo/ui/components";
import { BaseInput } from "@repo/ui/components/atoms/base-input";
import { Chip } from "@repo/ui/components/atoms/chip";
import { cn } from "@repo/ui/lib/utils";
import { AnimatePresence, motion } from "framer-motion";
import Image from "next/image";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ProductCard } from "@repo/ui/components";
import { ProductCard } from "@repo/ui/components/molecules/prodoct-card";
import { use } from "react";
import { getProductVersionList } from "@repo/apis/core/shop/product-version/get/get-product-version-list";

Expand Down
12 changes: 5 additions & 7 deletions apps/core/app/(landing)/_components/landing-tabs.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import {
TabContent,
TabList,
TabProvider,
TabTrigger,
ProductCard,
} from "@repo/ui/components";
import { TabContent } from "@repo/ui/components/molecules/tabs/tab-content";
import { TabList } from "@repo/ui/components/molecules/tabs/tab-list";
import { TabProvider } from "@repo/ui/components/molecules/tabs/tab-provider";
import { TabTrigger } from "@repo/ui/components/molecules/tabs/tab-trigger";
import { ProductCard } from "@repo/ui/components/molecules/prodoct-card";
import {
ProductListUiUx,
ProductList3D,
Expand Down
50 changes: 40 additions & 10 deletions apps/core/app/(landing)/_components/mobile-menu/hamburger-menu.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
"use client";

import { IconMenuDeep, IconX, IconCrown, IconUserPlus, IconFileText, IconHelpCircle, IconShieldLock, IconFileDescription } from "@tabler/icons-react";
import {
IconMenuDeep,
IconX,
IconCrown,
IconUserPlus,
IconFileText,
IconHelpCircle,
IconShieldLock,
IconFileDescription,
} from "@tabler/icons-react";
import { motion, AnimatePresence } from "framer-motion";
import { useState } from "react";
import Link from "next/link";
import { Typography } from "@repo/ui/components";
import { Typography } from "@repo/ui/components/atoms/typography";

const HamburgerMenu = () => {
const [isOpen, setIsOpen] = useState(false);
Expand Down Expand Up @@ -43,7 +52,7 @@ const HamburgerMenu = () => {
className="fixed top-0 right-0 h-full w-[250px] bg-card shadow-lg z-40"
>
<div className="p-6 pt-20">
<nav >
<nav>
<div>
<Typography
variant="heading/xs"
Expand All @@ -54,7 +63,10 @@ const HamburgerMenu = () => {
</Typography>
<ul className="space-y-4 mb-6">
<li>
<Link href="#" className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full">
<Link
href="#"
className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full"
>
<IconCrown size={24} className="text-primary" />
<Typography
variant="label/xs"
Expand All @@ -65,7 +77,10 @@ const HamburgerMenu = () => {
</Link>
</li>
<li>
<Link href="#" className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full">
<Link
href="#"
className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full"
>
<IconUserPlus size={24} className="text-primary" />
<Typography
variant="label/xs"
Expand All @@ -76,7 +91,10 @@ const HamburgerMenu = () => {
</Link>
</li>
<li>
<Link href="#" className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full">
<Link
href="#"
className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full"
>
<IconFileText size={24} className="text-primary" />
<Typography
variant="label/xs"
Expand All @@ -87,7 +105,10 @@ const HamburgerMenu = () => {
</Link>
</li>
<li>
<Link href="#" className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full">
<Link
href="#"
className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full"
>
<IconHelpCircle size={24} className="text-primary" />
<Typography
variant="label/xs"
Expand All @@ -108,7 +129,10 @@ const HamburgerMenu = () => {
</Typography>
<ul className="space-y-4">
<li>
<Link href="#" className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full">
<Link
href="#"
className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full"
>
<IconShieldLock size={24} className="text-primary" />
<Typography
variant="label/xs"
Expand All @@ -119,8 +143,14 @@ const HamburgerMenu = () => {
</Link>
</li>
<li>
<Link href="#" className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full">
<IconFileDescription size={24} className="text-primary" />
<Link
href="#"
className="flex items-center gap-2 py-3 px-4 rounded-lg hover:bg-accent/20 focus:bg-accent/30 active:bg-accent/40 transition w-full"
>
<IconFileDescription
size={24}
className="text-primary"
/>
<Typography
variant="label/xs"
className="hover:underline"
Expand Down
Loading