Skip to content
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.

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

About us page and group pages #62

Open
wants to merge 40 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
28f3d5f
legg til bile av wolfpizze, lage about-siden
supattrw Sep 8, 2024
cc20f56
create a page for leaderboard and add the en/no translation in en.jso…
supattrw Sep 8, 2024
461ba93
add labops page
supattrw Sep 8, 2024
9413919
add meteor component under ui and implement it in AboutUsPage
supattrw Sep 15, 2024
e32819d
feat: worked on about page and pages for individual groups
supattrw Oct 3, 2024
c613733
Merge branch 'dev' into AboutUsPage
supattrw Oct 3, 2024
798f346
feat: add en version of about page and other groups
supattrw Oct 3, 2024
0d9047a
feat: add carousel to devops page
supattrw Oct 3, 2024
57d5469
feat: add autoplay to carousel component (images), add client page fo…
supattrw Oct 17, 2024
c31a00e
feat: create clienetPage for labops, change en.json and no.json
supattrw Oct 17, 2024
30eb750
feat: add questions and answers to devops
supattrw Oct 17, 2024
534632e
feat: add questions and answer variable no en and no.json, for labops…
supattrw Oct 17, 2024
ebd4835
fix: fix leaderboard json messages
supattrw Oct 20, 2024
a71884d
feat: add faq's to leaderboard
supattrw Oct 20, 2024
f03a030
feat: add page/clientpage for game, breadboard and ttrpg
supattrw Oct 20, 2024
10fdfd1
Merge remote-tracking branch 'origin/dev' into AboutUsPage
supattrw Oct 20, 2024
a96b333
fix: merge conflict
supattrw Oct 20, 2024
0b05042
fix: sort CSS classes
supattrw Oct 20, 2024
e292504
feat: edit enjson and no.json according to pull request #62
supattrw Oct 20, 2024
77a8ef4
feat: add title and about to groups
supattrw Oct 31, 2024
8999874
feat: create component for ImageCoraousel and FAQAccordion
supattrw Oct 31, 2024
eaa9a19
feat: delete ClientPage and add layout.tsx
supattrw Oct 31, 2024
0cd8c9f
feat: create MembersTable
supattrw Oct 31, 2024
46b848c
feat: delete accordion
supattrw Oct 31, 2024
db6e202
fix: change from uuid to useId
supattrw Oct 31, 2024
0938df3
fix: edit index of paths
supattrw Oct 31, 2024
e4c864f
feat: create MembersTable component
supattrw Oct 31, 2024
9f13e52
fix: remove faq for devops
supattrw Oct 31, 2024
e2d4cc9
feat: delete clientPage on ttrpg
supattrw Nov 7, 2024
4b86fc4
feat: remove membersTable
supattrw Nov 10, 2024
1dd6b07
feat: remove margin in FAQAccordion
supattrw Nov 10, 2024
588042f
feat: remove dark-text
supattrw Nov 10, 2024
9b1e337
feat: remove unused imports
supattrw Nov 10, 2024
8104afe
feat: import pizzawolfs
supattrw Nov 10, 2024
aa24702
feat: remove button for mazemap hackerspace location
supattrw Nov 10, 2024
b603302
feat: remove grid from card
supattrw Nov 10, 2024
207d937
Merge branch 'dev' of github.com:hackerspace-ntnu/website-next into a…
supattrw Nov 10, 2024
af11061
feat:
supattrw Nov 10, 2024
1269968
feat: change to async, use getTranslations intead of useTranslations
supattrw Nov 10, 2024
98d52c9
feat: add storage to en.json
supattrw Nov 10, 2024
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Here is a list of documentation to help you get started:
### Other resources

- [Mozilla](https://developer.mozilla.org/en-US/) - Great resource for looking up documentation for web technologies
- [Can I use](https://caniuse.com/) - Check browser support for different web technologies (especially useful for CSS)
- [Can I use](htt ps://caniuse.com/) - Check browser support for different web technologies (especially useful for CSS)
supattrw marked this conversation as resolved.
Show resolved Hide resolved

## Icons

Expand Down
Binary file modified bun.lockb
Binary file not shown.
94 changes: 93 additions & 1 deletion messages/en.json
supattrw marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"navigationMenu": "Navigation menu",
"news": "News",
"events": "Events",
"storage": "Storage",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert change

"about": "About",
"changeLocale": "Change language",
"toggleTheme": "Toggle theme",
Expand Down Expand Up @@ -61,6 +60,99 @@
"readTime": "{count, plural, =0 {less than a minute} one {# minute} other {# minutes}} read",
"views": "Views"
},
"about": {
"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.",
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"showMaps": "Show map!",
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"FAQ": "Frequently Asked Questions",
"canIUseThe3dPriner?": "Can I use the 3D printer?",
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"answerCanIUseThe3dPriner": "<p1> All students can use the 3D printers and the rest of the workshop, regardless of whether they are members of Hackerspace or not. We have a reservation system available for all students with FEIDE login from the website's navigation bar. </p1> <p2> Come by during opening hours and get help from one of our members.</p2>",
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"canITryVRGames/Equipment?": "Can I try VR games/equipment?",
"answerCanITryVRGames/Equipment": "Our VR equipment can be borrowed and tried out by all students, regardless of Hackerspace membership. We have a dedicated VR room where you can come and play as long as a Hackerspace member is available for setup and teardown. The equipment can be borrowed through the usual inventory system. Come by during our opening hours if you're interested.",
"howDoIBecomeAMember?": "How do I become a member?",
"answerHowDoIBecomeAMember": "<p1> Hackerspace has ongoing admissions. You can apply whenever you want. We usually respond within 3 working weeks. </p1> <p2> Note that you do not need membership to borrow equipment or try something cool. Come by for a chat during our opening hours to learn more about our offerings and what it's like to be a member. </p2>",
"activeGroup": "Our Active Groups",

"example_title": "Lorem Ipsum",
"example_text": "Lorem ipsum dolor sit amet. Aut rerum illum ut voluptatem enim qui consequatur exercitationem nam molestias fugit est expedita voluptas. Ad quas reiciendis non voluptas recusandae qui optio ratione."
},
"leaderboard": {
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"leaderboard": "Leaderboard",
"aboutLeaderboard": "The leadership consists of a Leader, Deputy Leader, and Financial Officer in Hackerspace. They ensure that Hackerspace NTNU operates optimally and make decisions and planning for operations with the board.",
"leader": "Leader",
"deputyLeader": "Deputy Leader",
"financialManager": "Financial Manager"
},
"member_representative": {
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"information": "<p1> Hackerspace shall have a representative who is appointed during the general assembly. This representative has no voting rights on the board but is a contact person for Hackerspace members regarding issues they do not wish to address directly with the board. The representative has a duty of confidentiality and will, if necessary, relay issues anonymized to the board. </p1> <p2> If you wish to get in touch, the representative is available on Slack. </p2>",
"question1": "",
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": ""
},
"devops": {
"information": "The main tasks of DevOps are to develop and manage Hackerspace's website, but we also work on the operation of infrastructure, databases, servers, and are responsible for various gadgets.",
"question1": "Does DevOps requires any programming-knowledge before becoming a member? ",
"answer1": "You don't need any programming-knowledge before joing our group. Our group are welcome for everybody who wants to learn. As a new member, you'll go through our 'get-to-know'-program that will show you our prosedure and technoliges that we use. But don't worry, you can take everything in your own tempo!",
"question2": "What is the main focus for DevOps this semester?",
"answer2": "We are focusing on launching a new website for Hackerspace. The technologies that we use is ....",
"question3": "Can I choose what I want to work with?",
"answer3": "Yes, of course everybody get to choose the task they want to work with. Prior to our focus on luanching new website, the tasks wil be related to this. But you can also pitche an idea that you want to implement on our website and hear what the rest of the groups think about it.",
"leader": "Leader",
"deputyLeader": "Deputy Leader",
"member": "Member"
},
"labops": {
"aboutLabOps": "The main tasks of LabOps are to run Hackerspace's premises, plan and carry out events, hold stands and run other promotions.",
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": "",
"leader": "Leader",
"deputyLeader": "Deputy Leader",
"member": "Member"
},
"breadboard_computer": {
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"breadboard_computer": "Breadboard Computer",
"aboutBreadboardComputer": "",
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": "",
"leader": "Leader",
"deputyLeader": "Deputy Leader",
"member": "Member"
},
"game": {
"aboutGameDevelopment": "",
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": "",
"leader": "Leader",
"deputyLeader": "Deputy Leader",
"member": "Member"
},
"ttrpg": {
"aboutTableTopRolePlayingGame": "",
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": "",
"leader": "Leader",
"deputyLeader": "Deputy Leader",
"member": "Member"
},
"storage": {
"title": "Storage",
"searchPlaceholder": "Search for product...",
Expand Down
93 changes: 93 additions & 0 deletions messages/no.json
supattrw marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,99 @@
"readTime": "{count, plural, =0 {mindre enn ett minutt} one {# minutt} other {# minutter}} lesing",
"views": "Visninger"
},
"about": {
"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",
"canIUseThe3dPriner?": "Kan jeg bruke 3D-printer?",
"answerCanIUseThe3dPriner": "<p1> Alle studenter kan benytte 3D-printere og resten av verkstedet uavhengig av om de er medlem av Hackerspace eller ikke. Vi har et reservasjonssystem tilgjengelig for alle studenter med FEIDE-pålogging fra nettsidens navigasjonsbar. </p1> <p2> Kom innom i åpningstiden og få hjelp av en av våre medlemmer.</p2>",
"canITryVRGames/Equipment?": "Kan jeg prøve VR spill/utstyr?",
"answerCanITryVRGames/Equipment": "VR utstyret vårt kan lånes og prøves ut av alle studenter uavhengig av medlemskap i Hackerspace. Vi har eget VR-rom der man kan komme og spille så lenge et Hackerspace-medlem er tilgjengelig ved oppsett og avslutning. Utstyret kan lånes ut på vanlig måte gjennom lagersystemet. Kom innom i våre åpningstider om dette interesserer deg.",
"howDoIBecomeAMember?": "Hvordan blir jeg medlem?",
"answerHowDoIBecomeAMember": "<p1> Hackerspace har løpende opptak. Du kan altså søke når du vil. Vi svarer som regel i løpet av 3 arbeidsuker. </p1> <p2> Merk at du ikke trenger medlemsskap for å låne utstyr eller prøve noe kult. Kom innom for en prat i våre åpningstider for å finne ut mer om vårt tilbud og hvordan det er å være medlem. </p2>",
"activeGroup": "Våre aktive grupper",

"example_title": "Lorem Ipsum",
"example_text": "Lorem ipsum dolor sit amet. Aut rerum illum ut voluptatem enim qui consequatur exercitationem nam molestias fugit est expedita voluptas. Ad quas reiciendis non voluptas recusandae qui optio ratione."
},
"leaderboard": {
"leaderboard": "Ledelsen",
"aboutLeaderboard": "Ledelsen består av Leder, Nestleder og Økonomiansvarlig i Hackerspace. Disse sørger for at Hackerspace NTNU driftes optimalt og gjennomfører avgjørelser og planlegging av drift med styret.",
"leader": "Leder",
"deputyLeader": "Nestleder",
"financialManager": "Økonomiansvarlig"
},
"member_representative": {
"information": "<p1> Hackerspace skal ha en tillitsvalgt som blir utnevnt under generalforsamlingen. Denne tillitsvalgte har ingen stemme i styret, men er en kontaktperson for medlemmer av Hackerspace for saker de ikke ønsker å ta direkte opp med styret. Tillitsvalgt har taushetsplikt, og vil ved behov videreformidle saker anonymisert til styret. </p1> <p2> Dersom du ønsker å ta kontakt er tillitsvalgt tilgjengelig på Slack. </p2>",
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": ""
},
"devops": {
"information": "Hovedoppgavene til DevOps er å utvikle og drifte Hackerspace sin nettside, men vi jobber også med drift av infrastruktur, databaser, servere, og har ansvar for diverse dingser.",
"question1": "Må jeg kunne programmere for å bli medlem?",
"answer1": "Du trenger ingen forskunnskap om programmering for å søke medlemskap i DevOps. Vi tar imot alle så lenge man ønsker å lære! Ny medlem vil gå gjennom vår 'bli kjent'-program hvor man kan bli kjent med vår prosedure og teknologien som vi tar i bruk. Men ikke stress, man kan ta det med eget tempo!",
"question2": "Hva er hovedfokus for DevOps i dette semesteret?",
"answer2": "Dette semesteret fokuserer vi på å lage ny nettside for Hackerspace. Vi bruker React og .... ",
"question3": "Kan jeg velge selv hva jeg vil jobbe med?",
"answer3": "Ja, selvfølgelig skal man kunne velge hva man vil jobbe med. Akkurat nå er det ny nettside som er i fokus, dermed vil oppagavene være relatert til dette. Men man kan også pitche noe kult som man ønsker å ha på nettsiden og jobbe med det dersom gruppen er enig om ideet. ",
"leader": "Leder",
"deputyLeader": "Nestleder",
"member": "Medlemmer"
},
"labops": {
"aboutLabOps": "Hovedoppgavene til LabOps er å drifte Hackerspace sine lokaler, planlegge og gjennomføre arrangement, holde stands og drive annen promotering.",
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": "",
"leader": "Leder",
"deputyLeader": "Nestleder",
"member": "Medlemmer"
},
"breadboard_computer": {
"breadboard_computer": "Breadboard Computer",
"aboutBreadboardComputer": "",
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": "",
"leader": "Leder",
"deputyLeader": "Nestleder",
"member": "Medlemmer"
},
"game": {
"aboutGameDevelopment": "",
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": "",
"leader": "Leder",
"deputyLeader": "Nestleder",
"member": "Medlemmer"
},
"ttrpg": {
"aboutTableTopRolePlayingGame": "",
"question1": "",
"answer1": "",
"question2": "",
"answer2": "",
"question3": "",
"answer3": "",
"leader": "Leder",
"deputyLeader": "Nestleder",
"member": "Medlemmer"
},
"storage": {
"title": "Lager",
"searchPlaceholder": "Søk etter produkt...",
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"@aws-sdk/client-s3": "^3.637.0",
"@hookform/resolvers": "^3.9.0",
"@lucia-auth/adapter-drizzle": "^1.1.0",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
Expand All @@ -36,13 +37,16 @@
"@trpc/client": "^11.0.0-rc.490",
"@trpc/react-query": "^11.0.0-rc.490",
"@trpc/server": "^11.0.0-rc.490",
"@types/uuid": "^10.0.0",
supattrw marked this conversation as resolved.
Show resolved Hide resolved
"autoprefixer": "^10.4.19",
"client-only": "^0.0.1",
"cmdk": "1.0.0",
"country-flag-icons": "^1.5.12",
"cva": "^1.0.0-beta.1",
"date-fns": "^4.1.0",
"drizzle-orm": "^0.33.0",
"embla-carousel-autoplay": "^8.3.0",
"embla-carousel-react": "^8.3.0",
"lucia": "^3.2.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert change

"lucide-react": "^0.396.0",
"next": "^14.2.10",
Expand Down
Binary file added public/about/pizzaWolfs-min.png
supattrw marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions src/app/[locale]/(default)/about/LabOps/ClientPage.tsx
supattrw marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
"use client";

import { useTranslations } from 'next-intl';
import { Carousel, CarouselContent, CarouselItem } from '@/components/ui/Carousel';
import Autoplay from "embla-carousel-autoplay";
import Image from 'next/image';
import React from 'react';

const images = [
{ src: "/unknown.png", alt: "unknown", width: 600, height: 400 },
{ src: "/mock.jpg", alt: "mock", width: 600, height: 400 },
{ src: "/bg.jpg", alt: "bg", width: 600, height: 400 },
{ src: "/about/pizzaWolfs-min.png", alt: "pizzaWolfs", width: 600, height: 400 },
];

export default function ClientPage({ locale }: { locale: string }) {
const t = useTranslations('labops');
const plugin = React.useRef(Autoplay({ delay: 2000, stopOnInteraction: true }));

return (
<div className='flex items-center justify-center w-full max-w-full'>
supattrw marked this conversation as resolved.
Show resolved Hide resolved
<Carousel
className="w-full max-w-2xl h-auto"
plugins={[plugin.current]}
onMouseEnter={plugin.current.stop}
onMouseLeave={plugin.current.reset}
>
<CarouselContent>
{images.map((image, index) => (
<CarouselItem key={index}>
<div className='flex items-center justify-center h-full p-0 m-0'>
<Image
className='max-w-full max-h-[400px] sm:max-h-[600px] lg:max-h-[800px]'
src={image.src}
alt={image.alt}
width={image.width}
supattrw marked this conversation as resolved.
Show resolved Hide resolved
height={image.height}
/>
</div>
</CarouselItem>
))}
</CarouselContent>
</Carousel>
</div>
)
}
Loading
Loading