diff --git a/app/globals.css b/app/globals.css index d1e0d4e..76f27cd 100644 --- a/app/globals.css +++ b/app/globals.css @@ -83,4 +83,18 @@ opacity: 1; transform: translateY(0); } +} + +.scrollable-content { + height: 100%; + overflow-y: auto; + scrollbar-width: none; + /* For Firefox */ + -ms-overflow-style: none; + /* For Internet Explorer and Edge */ +} + +.scrollable-content::-webkit-scrollbar { + display: none; + /* For Chrome, Safari, and Opera */ } \ No newline at end of file diff --git a/app/layout.tsx b/app/layout.tsx index 50268ec..23cad26 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -11,7 +11,7 @@ const poppins = Poppins({ }); export const metadata: Metadata = { - title: "Portfolio: Pankaj Thakur | Software Developer", + title: "Portfolio: Pankaj Thakur", description: "Pankaj Thakur is a software developer based in India. He specializes in building web applications and websites using modern technologies.", keywords: @@ -23,7 +23,7 @@ export const metadata: Metadata = { type: "website", locale: "en_IN", url: "https://thakur.dev", - title: "Pankaj Thakur | Software Developer", + title: "Pankaj Thakur - Software Developer", description: "Pankaj Thakur is a software developer based in India. He specializes in building web applications and websites using modern technologies.", siteName: "Pankaj Thakur's Portfolio", @@ -84,7 +84,11 @@ export default function RootLayout({ - + diff --git a/app/page.tsx b/app/page.tsx index 934140b..235cfb5 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,36 +1,33 @@ import dynamic from "next/dynamic"; import Skills from "@/components/Skills"; -import Particles from "@/components/ui/particles"; import ProjectsPage from "@/components/Projects"; import Intro from "@/components/Intro"; import Footer from "@/components/Footer"; import Experience from "@/components/Experience"; import Education from "@/components/Education"; +import { BackgroundBeamsWithCollision } from "@/components/ui/background-beams-with-collision"; +import "./globals.css"; const DynamicContact = dynamic(() => import("@/components/Contact"), { - ssr: false, + ssr: false, }); export default function Home() { - return ( -
- -
- - - - - - -
-
-
- ); + return ( + +
+
+
+ + + + + + +
+
+
+
+ + ); } diff --git a/components/Education.tsx b/components/Education.tsx index df31666..e4ece0d 100644 --- a/components/Education.tsx +++ b/components/Education.tsx @@ -1,6 +1,6 @@ import React from "react"; -import NextImage from "./NextImage"; import { educationData } from "@/lib/Constant"; +import { Card } from "./ui/card"; interface EducationItemProps { institution: string; @@ -17,35 +17,32 @@ const EducationItem: React.FC = ({ duration, logo, }) => ( -
-
-
- -
-
-

+ +
+

{institution} + + ( {duration}) +

-

- {degree} -

- {stream && ( +

- {stream} + {degree}

- )} -

- {duration} -

+ {stream && ( + + ({stream}) + + )} +
-

+ ); const Education: React.FC = () => ( -
-
-

Education

-
+
+

Education

+
{educationData.map((education, index) => ( ))} diff --git a/components/Experience.tsx b/components/Experience.tsx index d22e821..d80bc7a 100644 --- a/components/Experience.tsx +++ b/components/Experience.tsx @@ -1,6 +1,6 @@ import React from "react"; import { companiesData } from "@/lib/Constant"; -import NextImage from "./NextImage"; +import { Card } from "./ui/card"; interface JobHistoryItemProps { position: string; @@ -13,64 +13,56 @@ const JobHistoryItem: React.FC = ({ duration, isCurrent, }) => ( -
-
+

-

{position}

-

- {duration} -

-
+ {position} + +

+ {duration} +

); interface CompanyExperienceProps { company: string; - companyLogo: string; location: string; jobs: JobHistoryItemProps[]; } const CompanyExperience: React.FC = ({ company, - companyLogo, location, jobs, }) => ( -
-
-
- -
-
-

+ +
+

{company}

{location}

+ {jobs.map((job, index) => ( + + ))}
- {jobs.map((job, index) => ( - - ))} -

+ ); const Experience: React.FC = () => ( - <> -
-
-

Experience

-
- {companiesData.map((companyData, index) => ( - - ))} -
+
+
+

Experience

+
+ {companiesData.map((companyData, index) => ( + + ))}
- +
); export default Experience; diff --git a/components/ThemeSwitcher.tsx b/components/ThemeSwitcher.tsx index 70baa73..9190f4b 100644 --- a/components/ThemeSwitcher.tsx +++ b/components/ThemeSwitcher.tsx @@ -1,7 +1,7 @@ "use client"; import * as React from "react"; import { useTheme } from "next-themes"; -import {SunIcon, MoonIcon} from "@radix-ui/react-icons" +import { SunIcon, MoonIcon } from "@radix-ui/react-icons"; import { Button } from "@/components/ui/button"; export default function ThemeSwitcher() { @@ -15,7 +15,7 @@ export default function ThemeSwitcher() {