Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@supattrw
supattrw committed Oct 20, 2024
1 parent 10fdfd1 commit a96b333
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 91 deletions.
2 changes: 1 addition & 1 deletion messages/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"views": "Views"
},
"about": {
"whatIsHackerspace": "What is Hackerspace",
"whatIsHackerspace": "What is Hackerspace?",
"inforAboutHackerSpace": "<p1> Hackerspace NTNU is a student-driven project open to all students, regardless of study direction or Hackerspace membership. We offer a creative arena where students from different disciplines can get help realizing their ideas in an engaged and inclusive environment. Here, you will find new technology at your disposal, including drones, 3D printers, and Virtual Reality equipment. </p1> <p2> Whether you are a first-year student needing help with your first Arduino project or a fourth-year student wanting to create a 3D model of Trondheim, we can provide both equipment and expertise. We also regularly hold courses for both beginners and advanced students in many exciting subjects. </p2> <p3> Come by to see what we're doing and have a chat. </p3> You can find us on the second floor of the A-block in the Realfagbygget at NTNU Gløshaugen.",
"showMaps": "Show map!",
"FAQ": "Frequently Asked Questions",
Expand Down
2 changes: 1 addition & 1 deletion messages/no.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"views": "Visninger"
},
"about": {
"whatIsHackerspace": "Hva er Hackerspace",
"whatIsHackerspace": "Hva er Hackerspace?",
"inforAboutHackerSpace": "<p1> Hackerspace NTNU er et studentdrevet prosjekt åpent for alle studenter uansett studieretning eller Hackerspace-medlemsskap. Vi tilbyr en kreativ arena der studenter fra forskjellige linjer kan få hjelp til å realisere idéene sine i et engasjert og inkluderende miljø. Hos oss finner du ny teknologi til din disposisjon, blant annet droner, 3D-printere og Virtual Reality-utstyr. </p1> <p2> Om du er en førsteklassing som trenger hjelp med ditt første Arduino-prosjekt eller en fjerdeklassing som ønsker å lage en 3D-modell av Trondheim, kan vi stille med både utstyr og kompetanse. Vi holder også regelmessig kurs for både nybegynnere og viderekomne innen mange spennende emner. </p2> <p3> Kom innom for å se hva vi driver med og slå av en prat. </p3> Du finner oss i andre etasje i A-blokka på Realfagbygget, NTNU Gløshaugen. ",
"showMaps": "Vis kart!",
"FAQ": "Ofte stilte spørsmål",
Expand Down
138 changes: 49 additions & 89 deletions src/app/[locale]/(default)/about/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,124 +18,84 @@ export default function AboutPage({
const t = useTranslations('about');

const cardData = [
{ id: 1, title: t('example_title'), content: t('example_text'), link: `/${locale}/about/leaderboard`},
{ id: 2, title: t('example_title'), content: t('example_text'), link: `/${locale}/about/leaderboard`},
{ id: 3, title: t('example_title'), content: t('example_text'), link: `/${locale}/about/leaderboard`},
{ id: 3, title: t('example_title'), content: t('example_text'), link: `/${locale}/about/leaderboard`},
{ id: 3, title: t('example_title'), content: t('example_text'), link: `/${locale}/about/leaderboard`},
{ id: 3, title: t('example_title'), content: t('example_text'), link: `/${locale}/about/leaderboard`},
];

const faqItems = [
{
id: 1,
title: t('example_title'),
content: t('example_text'),

link: `/${locale}/about/leaderboard`
},
{
id: 2,
title: t('example_title'),
content: t('example_text'),

link: `/${locale}/about/leaderboard`
},
{
id: 3,
title: t('example_title'),
content: t('example_text'),

link: `/${locale}/about/leaderboard`
},
{
id: 3,
title: t('example_title'),
content: t('example_text'),

link: `/${locale}/about/leaderboard`
id: 'item-1',
icon: Printer,
question: t('canIUseThe3dPriner?'),
answer: t.rich('answerCanIUseThe3dPriner', {
p1: (chunks) => <p className="p1">{chunks}</p>,
p2: (chunks) => <p className="p2">{chunks}</p>
})
},
{
id: 3,
title: t('example_title'),
content: t('example_text'),

link: `/${locale}/about/leaderboard`
id: 'item-2',
icon: Gamepad2,
question: t('canITryVRGames/Equipment?'),
answer: t('answerCanITryVRGames/Equipment')
},
{
id: 3,
title: t('example_title'),
content: t('example_text'),

link: `/${locale}/about/leaderboard`
},
]
id: 'item-3',
icon: SquareUserRound,
question: t('howDoIBecomeAMember?'),
answer: t.rich('answerHowDoIBecomeAMember', {
p1: (chunks) => <p className="p1">{chunks}</p>,
p2: (chunks) => <p className="p2">{chunks}</p>
})
}
];

return <div>
<div className='flex flex-col items-center justify-center mt-7 mb-5'>
<Image className='pizzaWolfs'
src="/about/pizzaWolfs-min.png"
alt="pizza wolfs"
height={400}
width={400}
width={400}
priority
/>
</div>

<div>
<h1 className='dark:text-primary mt-8 mb-4 '> {t('whatIsHackerspace')} </h1>
<div className='mb-6 text-base'>
{t.rich('inforAboutHackerSpace', {
p1: (chunks) => <p className="/p1"> {chunks}</p>,
p2: (chunks) => <p className="/p2"> {chunks}</p>,
p3: (chunks) => <p className="/p3"> {chunks}</p>
p1: (chunks) => <p className="p1"> {chunks} </p>,
p2: (chunks) => <p className="p2"> {chunks} </p>,
p3: (chunks) => <p className="p3"> {chunks} </p>
})}
</div>
</div>
<div className='flex felx-col items-center justify-center '>
<div className='flex flex-col items-center justify-center '>
<Link href="https://link.mazemap.com/PPDMWZlM" passHref target="_blank" rel="noopener noreferrer">
<Button className=''> <Map className='m-1'/> {t('showMaps')} </Button>
</Link>

</div>

<div>
<h3 className='mt-10'> FAQ's </h3>
<Accordion type="single" collapsible className='w-full mb-10'>
<AccordionItem value="item-1">
<AccordionTrigger>
<div className='flex items-center m-2'>
<Printer className='mr-2'/>
<h4 className='font-medium text-left'>{t('canIUseThe3dPriner?')}</h4>
</div>
</AccordionTrigger>
<AccordionContent className='text-base m-2'>
{t.rich('answerCanIUseThe3dPriner', {
p1: (chunks) => <p className="/p1"> {chunks} </p>,
p2: (chunks) => <p className="/p2"> {chunks} </p>
})}
</AccordionContent>
</AccordionItem>

<AccordionItem value="item-2">
<AccordionTrigger>
<div className='flex items-center m-2'>
<Gamepad2 className='mr-2'/>
<h4 className='font-medium text-left'>{t('canITryVRGames/Equipment?')}</h4>
</div>
</AccordionTrigger>
<AccordionContent className='text-base m-2'>
{t('answerCanITryVRGames/Equipment')}
</AccordionContent>
</AccordionItem>

<AccordionItem value="item-3">
<AccordionTrigger>
<div className='flex items-center m-2'>
<SquareUserRound className='mr-2'/>
<h4 className='font-medium text-left'>{t('howDoIBecomeAMember?')}</h4>
</div>
</AccordionTrigger>
<AccordionContent className='text-base m-2'>
{t.rich('answerHowDoIBecomeAMember', {
p1: (chucks) => <p className="/p1"> {chucks} </p>,
p2: (chucks) => <p className="/p2"> {chucks} </p>
})}
</AccordionContent>
</AccordionItem>
<Accordion type="single" collapsible className="w-full mb-10">
{faqItems.map(item => (
<AccordionItem key={item.id} value={item.id}>
<AccordionTrigger>
<div className='flex items-center m-2'>
<item.icon className='mr-2' />
<h4 className='font-medium text-left'>{item.question}</h4>
</div>
</AccordionTrigger>
<AccordionContent className='text-base m-2'>
{item.answer}
</AccordionContent>
</AccordionItem>
))}
</Accordion>
</div>

<div className='w-full relative max-x-xs'>
<h2 className='items-center content-center text-center'> {t('activeGroup')} </h2>
<div className='grid gap-4 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3'>
Expand Down

0 comments on commit a96b333

Please sign in to comment.