From 1228dc5201a39cd7b6655bd4a8761073bfa5eea8 Mon Sep 17 00:00:00 2001 From: Ayodejioladimeji Date: Thu, 25 Jul 2024 11:31:24 +0100 Subject: [PATCH 1/7] implemented help-center --- src/app/(landing-routes)/help-center/page.tsx | 129 ++++++++++++++++++ src/components/layouts/footer/index.tsx | 2 +- 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 src/app/(landing-routes)/help-center/page.tsx diff --git a/src/app/(landing-routes)/help-center/page.tsx b/src/app/(landing-routes)/help-center/page.tsx new file mode 100644 index 000000000..f30299488 --- /dev/null +++ b/src/app/(landing-routes)/help-center/page.tsx @@ -0,0 +1,129 @@ +"use client"; + +import { Search } from "lucide-react"; +import { Button } from "~/components/common/common-button"; + +import { Input } from "~/components/common/input"; +import FaqAccordion from "~/components/layouts/accordion/FaqsAccordion"; +import TopicsAccordions from "~/components/layouts/accordion/TopicAccordion"; +import { faqData } from "~/constants/faqsdata"; + +// +const handleButtonClickTest = () => { + alert("Contact Button Click Test"); +}; + +const HelpCenterPage = () => { + return ( +
+
+
+
+ + Help Center + +
+

+ How can we help You? +

+

+ Find advice and answers from our support team +

+
+ + +
+
+
+
+
+ +
+
+ + Browse by topics + + + +
+ +
+
+
+

+ Frequently Asked Questions +

+ +

+ {` We couldn’t answer your question?`} +

+ + +
+ + +
+
+
+ +
+
+

+ Didn’t find an answer? +

+

+ Contact us for more inquiries and information about our + services. +

+ + +
+
+
+ ); +}; + +export default HelpCenterPage; \ No newline at end of file diff --git a/src/components/layouts/footer/index.tsx b/src/components/layouts/footer/index.tsx index 51250b588..00fa68914 100644 --- a/src/components/layouts/footer/index.tsx +++ b/src/components/layouts/footer/index.tsx @@ -26,7 +26,7 @@ const Footer = () => { { title: "Support", links: [ - { route: "Help center", link: "/" }, + { route: "Help center", link: "/help-center" }, { route: "FAQ", link: "/faqs" }, { route: "waiting list", link: "/waitlist" }, { route: "Pricing Experience", link: "/pricing" }, From 7a0864d2a4edf2e1fe543016334c983b596dd275 Mon Sep 17 00:00:00 2001 From: Ayodejioladimeji Date: Thu, 25 Jul 2024 11:32:08 +0100 Subject: [PATCH 2/7] fixed linting --- src/app/(landing-routes)/help-center/page.tsx | 204 +++++++++--------- 1 file changed, 100 insertions(+), 104 deletions(-) diff --git a/src/app/(landing-routes)/help-center/page.tsx b/src/app/(landing-routes)/help-center/page.tsx index f30299488..ccdf8135a 100644 --- a/src/app/(landing-routes)/help-center/page.tsx +++ b/src/app/(landing-routes)/help-center/page.tsx @@ -1,129 +1,125 @@ "use client"; import { Search } from "lucide-react"; -import { Button } from "~/components/common/common-button"; +import { Button } from "~/components/common/common-button"; import { Input } from "~/components/common/input"; import FaqAccordion from "~/components/layouts/accordion/FaqsAccordion"; import TopicsAccordions from "~/components/layouts/accordion/TopicAccordion"; import { faqData } from "~/constants/faqsdata"; -// +// const handleButtonClickTest = () => { - alert("Contact Button Click Test"); + alert("Contact Button Click Test"); }; const HelpCenterPage = () => { - return ( -
-
-
-
- - Help Center - -
-

- How can we help You? -

-

- Find advice and answers from our support team -

-
- - -
-
-
-
+ return ( +
+
+
+
+ + Help Center + +
+

+ How can we help You? +

+

+ Find advice and answers from our support team +

+
+ + +
+
+
+
-
-
- - Browse by topics - - - -
+
+
+ + Browse by topics + -
-
-
-

- Frequently Asked Questions -

+ +
-

- {` We couldn’t answer your question?`} -

+
+
+
+

+ Frequently Asked Questions +

- -
+

+ {` We couldn’t answer your question?`} +

- -
-
+
-
-
-

- Didn’t find an answer? -

-

- Contact us for more inquiries and information about our - services. -

+ +
+ +
- -
-
+
+
+

+ Didn’t find an answer? +

+

+ Contact us for more inquiries and information about our services. +

+ +
- ); +
+
+ ); }; -export default HelpCenterPage; \ No newline at end of file +export default HelpCenterPage; From bfe7adc8a2f9b8bd7581b5f037858683081bae3c Mon Sep 17 00:00:00 2001 From: Ayodejioladimeji Date: Thu, 25 Jul 2024 13:05:01 +0100 Subject: [PATCH 3/7] fixing conflicts --- src/app/(landing-routes)/help-center/page.tsx | 4 ++-- src/components/layouts/homepage/Hero.tsx | 5 +++++ src/components/layouts/homepage/PerfectFit.tsx | 10 +++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/app/(landing-routes)/help-center/page.tsx b/src/app/(landing-routes)/help-center/page.tsx index ccdf8135a..fbe8a2c6f 100644 --- a/src/app/(landing-routes)/help-center/page.tsx +++ b/src/app/(landing-routes)/help-center/page.tsx @@ -13,7 +13,7 @@ const handleButtonClickTest = () => { alert("Contact Button Click Test"); }; -const HelpCenterPage = () => { +const HelpCenter = () => { return (
@@ -122,4 +122,4 @@ const HelpCenterPage = () => { ); }; -export default HelpCenterPage; +export default HelpCenter; diff --git a/src/components/layouts/homepage/Hero.tsx b/src/components/layouts/homepage/Hero.tsx index 794b5b543..a5ac7fe7f 100644 --- a/src/components/layouts/homepage/Hero.tsx +++ b/src/components/layouts/homepage/Hero.tsx @@ -10,10 +10,15 @@ import "swiper/css"; import "swiper/css/navigation"; import "swiper/css/pagination"; import "swiper/css/scrollbar"; +import { useRouter } from "next/navigation"; import Link from "next/link"; const Hero = () => { + const router = useRouter() + + // + return (
diff --git a/src/components/layouts/homepage/PerfectFit.tsx b/src/components/layouts/homepage/PerfectFit.tsx index e1a9d13f4..881c925bd 100644 --- a/src/components/layouts/homepage/PerfectFit.tsx +++ b/src/components/layouts/homepage/PerfectFit.tsx @@ -1,4 +1,12 @@ +"use client" + +import { useRouter } from "next/navigation"; + const PerfectFit = () => { + const router = useRouter() + + // + return (
@@ -8,7 +16,7 @@ const PerfectFit = () => { budget. All plans include access to our comprehensive library of pre-built sections, drag-and-drop customization.

-
From 8c2cd2163b799fd0ca3660925b7ecbf0df3e87ad Mon Sep 17 00:00:00 2001 From: Ayodejioladimeji Date: Thu, 25 Jul 2024 11:55:30 +0100 Subject: [PATCH 4/7] linked the career details --- .../(landing-routes)/career/[slug]/page.tsx | 70 +++++++++---------- .../common/CareerCard/CareerCard.tsx | 9 ++- 2 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/app/(landing-routes)/career/[slug]/page.tsx b/src/app/(landing-routes)/career/[slug]/page.tsx index 23da127c6..10f3a2eac 100644 --- a/src/app/(landing-routes)/career/[slug]/page.tsx +++ b/src/app/(landing-routes)/career/[slug]/page.tsx @@ -51,10 +51,10 @@ const JobDetails = () => {
-

+

Job Description

-

+

We are looking for a talented and passionate Product Designer to join our dynamic team. As a Product Designer at the Company, you will play a critical role in shaping the user @@ -66,64 +66,64 @@ const JobDetails = () => {

-

+

Key Responsibilities

    -
  • +
  • Conduct user research and gather insights to inform design decisions
    • -
  • +
  • Create wireframes, prototypes, and high-fidelity mockups for new features and product enhancements
    • -
  • +
  • Collaborate with the product team to define design requirements and ensure alignment with business objectives
    • -
  • +
  • Develop and maintain design systems to ensure consistency across all products
    • -
  • +
  • Conduct usability testing and iterate on designs based on user feedback
    • -
  • +
  • Stay up-to-date with industry trends and best practices in design and user experience
-

+

Qualifications

    -
  • +
  • Bachelor's degree in Design, Human-Computer Interaction, or a related field
    • -
  • +
  • 3+ years of experience in product design or a similar role
    • -
  • +
  • Proficiency in design tools such as Figma, Sketch, Adobe XD, or similar
    • -
  • +
  • Strong portfolio showcasing your design process, problem-solving skills, and final products
    • -
  • +
  • Excellent communication and collaboration skills
    • -
  • +
  • Ability to think critically and solve complex design challenges
    • -
  • +
  • Knowledge of HTML, CSS, and JavaScript is a plus
@@ -133,73 +133,73 @@ const JobDetails = () => {
-
+
About the job
-

+

Deadline

-

+

July 19th, 2024

-

+

Work mode

-

On-site

+

On-site

-

+

Job-type

-

Internship

+

Internship

-

+

Experience level

-

2-3years

+

2-3years

-

+

Salary

-

$500k-$900k

+

$500k-$900k

-
+
What we offer
    -
  • +
  • Competitive salary and benefits
    • -
  • +
  • Flexible working hours and remote work options
    • -
  • +
  • Opportunities for professional growth and development
    • -
  • +
  • A collaborative and inclusive work environment
-
+
How to Apply
-

+

Send your CV and cover letter to this email{" "} hng123@gmail.com diff --git a/src/components/common/CareerCard/CareerCard.tsx b/src/components/common/CareerCard/CareerCard.tsx index b9017e4ce..59bf7eef2 100644 --- a/src/components/common/CareerCard/CareerCard.tsx +++ b/src/components/common/CareerCard/CareerCard.tsx @@ -3,6 +3,7 @@ import { FC } from "react"; import { Card, CardContent, CardFooter } from "~/components/ui/card"; import { Skeleton } from "~/components/ui/skeleton"; import CustomButton from "../common-button/common-button"; +import { useRouter } from "next/navigation"; // interface CareerCardProperties { @@ -19,7 +20,13 @@ const CareerCard: FC = ({ location, description, amount, + }) => { + + const router = useRouter() + + // + return ( @@ -55,7 +62,7 @@ const CareerCard: FC = ({ {amount} /month - View Details + router.push(`/career/${jobTitle}`)} variant="primary">View Details )} From 14fa2aea1239b0936f4feafdca5203a049d16a7d Mon Sep 17 00:00:00 2001 From: Ayodejioladimeji Date: Thu, 25 Jul 2024 13:22:04 +0100 Subject: [PATCH 5/7] fixing conflicts --- src/components/common/CareerCard/CareerCard.tsx | 16 +++++++++------- src/components/layouts/homepage/Hero.tsx | 15 +++++++-------- src/components/layouts/homepage/PerfectFit.tsx | 17 +++++++++++------ src/test/homepage/Hero.test.tsx | 2 +- src/test/homepage/PerfectFit.test.tsx | 4 +--- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/components/common/CareerCard/CareerCard.tsx b/src/components/common/CareerCard/CareerCard.tsx index 59bf7eef2..944acf64a 100644 --- a/src/components/common/CareerCard/CareerCard.tsx +++ b/src/components/common/CareerCard/CareerCard.tsx @@ -1,9 +1,9 @@ +import { useRouter } from "next/navigation"; import { FC } from "react"; import { Card, CardContent, CardFooter } from "~/components/ui/card"; import { Skeleton } from "~/components/ui/skeleton"; -import CustomButton from "../common-button/common-button"; -import { useRouter } from "next/navigation"; +import Link from "next/link"; // interface CareerCardProperties { @@ -20,13 +20,10 @@ const CareerCard: FC = ({ location, description, amount, - }) => { - const router = useRouter() + // - // - return ( @@ -62,7 +59,12 @@ const CareerCard: FC = ({ {amount} /month - router.push(`/career/${jobTitle}`)} variant="primary">View Details + + View Details + )} diff --git a/src/components/layouts/homepage/Hero.tsx b/src/components/layouts/homepage/Hero.tsx index a5ac7fe7f..4cde3b054 100644 --- a/src/components/layouts/homepage/Hero.tsx +++ b/src/components/layouts/homepage/Hero.tsx @@ -10,14 +10,11 @@ import "swiper/css"; import "swiper/css/navigation"; import "swiper/css/pagination"; import "swiper/css/scrollbar"; -import { useRouter } from "next/navigation"; - import Link from "next/link"; const Hero = () => { - const router = useRouter() - // + // return (

@@ -43,10 +40,12 @@ const Hero = () => { and optimal productivity.

- - + + Get Started
diff --git a/src/components/layouts/homepage/PerfectFit.tsx b/src/components/layouts/homepage/PerfectFit.tsx index 881c925bd..f204f5336 100644 --- a/src/components/layouts/homepage/PerfectFit.tsx +++ b/src/components/layouts/homepage/PerfectFit.tsx @@ -1,11 +1,12 @@ -"use client" +"use client"; -import { useRouter } from "next/navigation"; +import Link from "next/link"; + +// const PerfectFit = () => { - const router = useRouter() - // + // return (
@@ -16,9 +17,13 @@ const PerfectFit = () => { budget. All plans include access to our comprehensive library of pre-built sections, drag-and-drop customization.

- +
); diff --git a/src/test/homepage/Hero.test.tsx b/src/test/homepage/Hero.test.tsx index a6c05b2f6..b74a141c0 100644 --- a/src/test/homepage/Hero.test.tsx +++ b/src/test/homepage/Hero.test.tsx @@ -29,7 +29,7 @@ describe("hero Component", () => { expect.assertions(1); // Ensure exactly one assertion render(); - const button = screen.getByRole("button", { name: /get started/i }); + const button = screen.getByTestId("get-started"); expect(button).toBeInTheDocument(); }); diff --git a/src/test/homepage/PerfectFit.test.tsx b/src/test/homepage/PerfectFit.test.tsx index 6dfa66f73..2aa1aefac 100644 --- a/src/test/homepage/PerfectFit.test.tsx +++ b/src/test/homepage/PerfectFit.test.tsx @@ -29,9 +29,7 @@ describe("perfectFit Component", () => { expect.assertions(1); render(); - const button = screen.getByRole("button", { - name: /see our pricing plan/i, - }); + const button = screen.getByTestId("pricing"); expect(button).toBeInTheDocument(); }); From 0078ab86bd4834d792a929929751b4001e6e96d8 Mon Sep 17 00:00:00 2001 From: Ayodejioladimeji Date: Thu, 25 Jul 2024 13:22:57 +0100 Subject: [PATCH 6/7] fixing conflicts --- src/app/(landing-routes)/help-center/page.test.tsx | 12 ++++++++++++ src/app/(landing-routes)/help-center/page.tsx | 2 ++ src/components/common/CareerCard/CareerCard.tsx | 6 ++---- src/components/layouts/homepage/Hero.tsx | 2 +- src/components/layouts/homepage/PerfectFit.tsx | 3 +-- 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 src/app/(landing-routes)/help-center/page.test.tsx diff --git a/src/app/(landing-routes)/help-center/page.test.tsx b/src/app/(landing-routes)/help-center/page.test.tsx new file mode 100644 index 000000000..dea52ad56 --- /dev/null +++ b/src/app/(landing-routes)/help-center/page.test.tsx @@ -0,0 +1,12 @@ +import { render } from "~/test/utils"; +import Page from "./page"; + +describe("page tests", () => { + it("should render correctly", () => { + expect.assertions(1); + + render(); + + expect(true).toBeTruthy(); + }); +}); diff --git a/src/app/(landing-routes)/help-center/page.tsx b/src/app/(landing-routes)/help-center/page.tsx index fbe8a2c6f..2e1d754ec 100644 --- a/src/app/(landing-routes)/help-center/page.tsx +++ b/src/app/(landing-routes)/help-center/page.tsx @@ -14,6 +14,8 @@ const handleButtonClickTest = () => { }; const HelpCenter = () => { + // + return (
diff --git a/src/components/common/CareerCard/CareerCard.tsx b/src/components/common/CareerCard/CareerCard.tsx index 944acf64a..42d194c98 100644 --- a/src/components/common/CareerCard/CareerCard.tsx +++ b/src/components/common/CareerCard/CareerCard.tsx @@ -1,9 +1,8 @@ -import { useRouter } from "next/navigation"; +import Link from "next/link"; import { FC } from "react"; import { Card, CardContent, CardFooter } from "~/components/ui/card"; import { Skeleton } from "~/components/ui/skeleton"; -import Link from "next/link"; // interface CareerCardProperties { @@ -21,7 +20,6 @@ const CareerCard: FC = ({ description, amount, }) => { - // return ( @@ -61,7 +59,7 @@ const CareerCard: FC = ({ View Details diff --git a/src/components/layouts/homepage/Hero.tsx b/src/components/layouts/homepage/Hero.tsx index 4cde3b054..184ed0c64 100644 --- a/src/components/layouts/homepage/Hero.tsx +++ b/src/components/layouts/homepage/Hero.tsx @@ -10,10 +10,10 @@ import "swiper/css"; import "swiper/css/navigation"; import "swiper/css/pagination"; import "swiper/css/scrollbar"; + import Link from "next/link"; const Hero = () => { - // return ( diff --git a/src/components/layouts/homepage/PerfectFit.tsx b/src/components/layouts/homepage/PerfectFit.tsx index f204f5336..c3ff4e2d5 100644 --- a/src/components/layouts/homepage/PerfectFit.tsx +++ b/src/components/layouts/homepage/PerfectFit.tsx @@ -2,10 +2,9 @@ import Link from "next/link"; -// +// const PerfectFit = () => { - // return ( From d67f026e779b9db4173a3289f47c6079edf89f43 Mon Sep 17 00:00:00 2001 From: Ayodejioladimeji Date: Thu, 25 Jul 2024 13:38:30 +0100 Subject: [PATCH 7/7] pulled from clean branch --- src/components/layouts/homepage/Hero.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/layouts/homepage/Hero.tsx b/src/components/layouts/homepage/Hero.tsx index 184ed0c64..03f3da0a4 100644 --- a/src/components/layouts/homepage/Hero.tsx +++ b/src/components/layouts/homepage/Hero.tsx @@ -41,7 +41,7 @@ const Hero = () => {