Skip to content

fixed the route to contact page and removed redundant links in nav bar #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ajith05105 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fixed the route to contact page and removed redundant links in nav bar #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f03481c
fixed the route to contact page and removed redundant links in nav bar
Aug 17, 2025
6ebf651
Merge branch 'main' into 145-patching-frontend
zlrkw11 Aug 17, 2025
45da7bc
feat: faq styling
zlrkw11 Aug 17, 2025
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
18 changes: 9 additions & 9 deletions client/src/app/faq/[id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { redirect } from 'next/navigation'
import {
Accordion,
AccordionContent,
AccordionItem,
AccordionTrigger,
} from '@/shadcn_components/ui/accordion'
import type { Faq, FaqCategory } from '@/types/types'
import { redirect } from 'next/navigation'
import FaqBox from '../../../components/faq-box/FaqBox'
import ausa from '../../assets/icons/ausa.svg'

Expand Down Expand Up @@ -100,19 +100,19 @@ export default async function FAQ({ params }: FAQProps) {
How Can We Help?
</h1>
<FaqBox
content="blahblahblah"
icon={ausa}
title={faqCategories.data[0].name}
content="blahblahblah"
/>
<FaqBox
content="blahblahblah"
icon={ausa}
title={faqCategories.data[1].name}
content="blahblahblah"
/>
<FaqBox
content="blahblahblah"
icon={ausa}
title={faqCategories.data[2].name}
content="blahblahblah"
/>
{/* {faqCategories.data.map((category: FaqCategory) => (
<div
Expand All @@ -130,15 +130,15 @@ export default async function FAQ({ params }: FAQProps) {
</div>

<div
className="flex flex-col gap-8 border bg-[#FAF7F2] px-[5%] py-[15%] text-[#2D3B4E] md:col-span-2 lg:col-span-3"
className="flex flex-col gap-8 bg-blue-300/55 text-white px-[5%] py-[15%] md:col-span-2 lg:col-span-3"
id="section-right"
>
<h1 className="text-2xl md:text-4xl">Frequently Asked Questions</h1>
<h2 className="text-2xl font-semibold">{faqCategory.data[0].name}</h2>
<h1 className="text-2xl md:text-4xl ">Frequently Asked Questions</h1>
<h2 className="text-2xl">{faqCategory.data[0].name}</h2>
<div className="">
<Accordion type="single" collapsible className="w-full">
<Accordion className="w-full" collapsible type="single">
{faqCategoryMap[faqCategory.data[0].id]?.map((faq: Faq) => (
<AccordionItem value={`item-${faq.id}`} key={faq.id}>
<AccordionItem key={faq.id} value={`item-${faq.id}`}>
<AccordionTrigger>{faq.question}</AccordionTrigger>
<AccordionContent>{faq.answer}</AccordionContent>
</AccordionItem>
Expand Down
8 changes: 1 addition & 7 deletions client/src/components/navbar/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ const defaultNavConfig: NavConfig = {
},
navItems: [
{ label: 'Home', href: '/' },
{ label: 'Support', href: '/support' },
{ label: 'Quiz', href: '/quiz' },
{
label: 'FAQs',
Expand All @@ -169,12 +168,7 @@ const defaultNavConfig: NavConfig = {
},
{
label: 'Contacts',
items: [
{ label: 'General Enquiries', href: '/contact/general' },
{ label: 'Student Support', href: '/contact/support' },
{ label: 'Academic Affairs', href: '/contact/academic' },
{ label: 'Events', href: '/contact/events' },
],
items: [{ label: 'General Enquiries', href: '/contact' }],
},
],
actionButtons: [{ label: 'Login', href: '/login' }],
Expand Down