From a2d845b6f2d4b667b97a5fdcae69a4753d68046a Mon Sep 17 00:00:00 2001 From: Khushi Roy Date: Wed, 9 Oct 2024 20:39:57 +0530 Subject: [PATCH 1/4] changed strikethrough in explore button and UI changes in the main and subtext --- app/page.tsx | 6 +++--- components/ui/special-button.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index 92fb0a3..994adda 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -5,13 +5,13 @@ import Link from "next/link"; export default function Home() { return ( -

+

Welcome to
- + NomeN

-

+

{ "It doesn't merely build your resume, but rather crafts a legendary professional legacy that transforms your career into a mesmerizing narrative that demands to be read and remembered." } diff --git a/components/ui/special-button.tsx b/components/ui/special-button.tsx index aaa56f7..8642e96 100644 --- a/components/ui/special-button.tsx +++ b/components/ui/special-button.tsx @@ -7,7 +7,7 @@ const SpecialButton = () => {

- Explore + Explore
From 3e8daa1b990fadcdf3c218be34210562a6d71e82 Mon Sep 17 00:00:00 2001 From: Khushi Roy Date: Thu, 10 Oct 2024 13:58:37 +0530 Subject: [PATCH 2/4] btn size and text color changed --- app/page.tsx | 4 ++-- components/ui/special-button.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index 994adda..e7938a2 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -5,9 +5,9 @@ import Link from "next/link"; export default function Home() { return ( -

+

Welcome to
- + NomeN

diff --git a/components/ui/special-button.tsx b/components/ui/special-button.tsx index 8642e96..b733e58 100644 --- a/components/ui/special-button.tsx +++ b/components/ui/special-button.tsx @@ -7,7 +7,7 @@ const SpecialButton = () => {
- Explore + Explore
From 54e9195d4cf3c578ac5998645a0192f2758ade67 Mon Sep 17 00:00:00 2001 From: Khushi Roy Date: Mon, 14 Oct 2024 21:21:52 +0530 Subject: [PATCH 3/4] landing page changes --- app/page.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index e7938a2..6d762cc 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -5,13 +5,13 @@ import Link from "next/link"; export default function Home() { return ( -

+

Welcome to
- + NomeN

-

+

{ "It doesn't merely build your resume, but rather crafts a legendary professional legacy that transforms your career into a mesmerizing narrative that demands to be read and remembered." } From 4ab862b96059a89d447722b3d074551718e65588 Mon Sep 17 00:00:00 2001 From: Khushi Roy Date: Mon, 14 Oct 2024 21:44:23 +0530 Subject: [PATCH 4/4] conflict resolve --- components/ui/special-button.tsx | 17 ++++++++++++----- lib/types.ts | 7 +++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/components/ui/special-button.tsx b/components/ui/special-button.tsx index b733e58..50c3633 100644 --- a/components/ui/special-button.tsx +++ b/components/ui/special-button.tsx @@ -1,17 +1,24 @@ +import { Button } from "@/lib/types"; +import { cn } from "@/lib/utils"; import React from "react"; -const SpecialButton = () => { +interface SpecialButtonProps extends Button { + classButton?: string; + className?: string; +} + +const SpecialButton: React.FC = ({ className, icon, title = "Explore", classButton }) => { return ( - ); }; -export default SpecialButton; +export default SpecialButton; \ No newline at end of file diff --git a/lib/types.ts b/lib/types.ts index 60b220f..10119b0 100644 --- a/lib/types.ts +++ b/lib/types.ts @@ -1,3 +1,5 @@ +import { ReactNode } from "react"; + export interface ResumeData { name: string; location: string; @@ -47,3 +49,8 @@ export interface Info { avatar?: string; background?: string; } + +export interface Button{ + icon?: ReactNode; + title?: string; +} \ No newline at end of file