diff --git a/.vscode/settings.json b/.vscode/settings.json index 15f41e9..83fed32 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,5 +10,6 @@ "editor.codeActionsOnSave": { "source.fixAll.eslint": "explicit" }, - "editor.wordWrap": "on" + "editor.wordWrap": "on", + "postman.settings.dotenv-detection-notification-visibility": false } diff --git a/app/layout.tsx b/app/layout.tsx index b640698..bbec3f7 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,16 +1,19 @@ import type { Metadata } from "next"; -import { Inter } from "next/font/google"; +import { DM_Sans } from "next/font/google"; import "./globals.css"; import { ThemeProvider } from "./provider"; import { Toaster } from "@/components/ui/toaster"; import dynamic from "next/dynamic"; -const ClientAppLayout = dynamic(() => import("@/layouts/ClientAppLayout"), { - ssr: false, -}); +const ServerWrapperLayout = dynamic( + () => import("@/layouts/WrapperLayout/Server/ServerWrapperLayout"), + { + ssr: true, + } +); -const inter = Inter({ subsets: ["latin"] }); +const dmSans = DM_Sans({ subsets: ["latin"] }); export const metadata: Metadata = { title: { @@ -28,20 +31,24 @@ export default function RootLayout({ children: React.ReactNode; }>) { return ( - + - - + + - + - - + + - {children} + {children} diff --git a/app/page.tsx b/app/page.tsx index d7c4ccd..61c31c6 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,31 +1,28 @@ -"use client"; import Hero from "@/components/Hero"; import Testimonials from "@/components/Testimonials"; import ChapterSection from "@/components/ChapterSection"; import Image from "next/image"; -import { motion } from "framer-motion"; -import LogoHero from "@/public/Elixir-logo.png"; -import useEventApi from "@/hooks/useEventApi"; - -const Home = () => { - useEventApi(); +import HeroLogo from "@/public/Elixir-logo.webp"; +async function Home() { return (
- +
tect - +
); -}; +} export default Home; diff --git a/components/Approach.tsx b/components/Approach.tsx deleted file mode 100644 index 45848b1..0000000 --- a/components/Approach.tsx +++ /dev/null @@ -1,172 +0,0 @@ -import React from "react"; -import { AnimatePresence, motion } from "framer-motion"; - -import { CanvasRevealEffect } from "./ui/CanvasRevealEffect"; - -const Approach = () => { - return ( -
-

- Our Core -

-
- - } - des="We'll collaborate to map out your website's goals, target audience, - and key functionalities. We'll discuss things like site structure, - navigation, and content requirements." - > - - - } - des='Once we agree on the plan, I cue my lofi playlist and dive into - coding. From initial sketches to polished code, I keep you updated - every step of the way.' - > - - - - } - des="This is where the magic happens! Based on the approved design, - I'll translate everything into functional code, building your website - from the ground up." - > - - -
-
- ); -}; - -export default Approach; - -const Card = ({ - title, - icon, - children, - - des, -}: { - title: string; - icon: React.ReactNode; - children?: React.ReactNode; - des: string; -}) => { - const [hovered, setHovered] = React.useState(false); - return ( -
setHovered(true)} - onMouseLeave={() => setHovered(false)} - - className='border border-black/[0.2] group/canvas-card flex items-center justify-center - dark:border-white/[0.2] max-w-sm w-full mx-auto p-4 relative lg:h-[35rem] rounded-3xl ' - style={{ - - background: "rgb(4,7,29)", - backgroundColor: "linear-gradient(90deg, rgba(4,7,29,1) 0%, rgba(12,14,35,1) 100%)", - }} - > - - - - - - - - {hovered && ( - - {children} - - )} - - -
-
- {icon} -
-

- {title} -

- -

- {des} -

-
-
- ); -}; - -const AceternityIcon = ({ order }: { order: string }) => { - return ( -
- - -
- - ); -}; - -export const Icon = ({ className, ...rest }: any) => { - return ( - - - - ); -}; diff --git a/components/BackDrop/BackDrop.tsx b/components/BackDrop/BackDrop.tsx new file mode 100644 index 0000000..821c494 --- /dev/null +++ b/components/BackDrop/BackDrop.tsx @@ -0,0 +1,25 @@ +import { cn } from "@/lib/utils"; +import { GridPattern } from "../magicui/grid-pattern"; +import { Spotlight } from "../ui/Spotlight"; + +export default function BackDrop() { + return ( + <> + + + + + + + ); +} diff --git a/components/ChapterSection.tsx b/components/ChapterSection.tsx index 2a3d52b..6edbc1a 100644 --- a/components/ChapterSection.tsx +++ b/components/ChapterSection.tsx @@ -1,18 +1,28 @@ "use client"; -import { Chapters } from "@/data"; +import { Chapters } from "@/constants/constants"; import { PinContainer } from "./ui/Pin"; import Image from "next/image"; import Link from "next/link"; +import Link from "next/link"; const ChapterSection = () => { return ( +
+

+ Our Core Societies

Our Core Societies

+
{Chapters.map((item, idx) => ( +
+
{ idx == 1 ? "md:w-[18rem] md:h-[22rem] w-[16rem] h-[20rem]" : " w-[16rem] h-[20rem]" + idx == 1 + ? "md:w-[18rem] md:h-[22rem] w-[16rem] h-[20rem]" + : " w-[16rem] h-[20rem]" }`} >

{item.title}

+
+ {item.des} +

+ {item.title} +

{item.des}
+
tect
- { - return ( -
-

- My work experience -

- -
- {workExperience.map((card) => ( - - ))} -
-
- ); -}; - -export default memo(Experience); diff --git a/components/Footer.tsx b/components/Footer.tsx index e8e7eaa..73d7ae4 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -1,52 +1,47 @@ import { FaLocationArrow } from "react-icons/fa6"; - -import { socialMedia } from "@/data"; +import { socialMedia } from "@/constants/constants"; import MagicButton from "./MagicButton"; import Image from "next/image"; +import Image from "next/image"; const Footer = () => { return ( -