diff --git a/.vscode/extensions.json b/.vscode/extensions.json index c5312d0b..a612eaa9 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,6 +3,7 @@ "esbenp.prettier-vscode", "bradlc.vscode-tailwindcss", "lokalise.i18n-ally", - "vivaxy.vscode-conventional-commits" + "vivaxy.vscode-conventional-commits", + "oven.bun-vscode" ] } diff --git a/bun.lockb b/bun.lockb index b563b58b..e9eb93c3 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/messages/en.json b/messages/en.json index b62c935d..4c2e8499 100644 --- a/messages/en.json +++ b/messages/en.json @@ -2,6 +2,14 @@ "meta": { "description": "Hackerspace NTNU, a student-led project open to all students, offers access to new technology like 3D printers and VR equipment. Our members provide varied expertise to help with your projects, from making an LED light blink to creating a 3D model. Visit our workshop or join our Slack channel for assistance or a friendly chat." }, + "ui": { + "close": "Close", + "previous": "Previous", + "goToPreviousPage": "Go to previous page", + "next": "Next", + "goToNextPage": "Go to next page", + "morePages": "More pages" + }, "layout": { "hackerspaceHome": "Hackerspace homepage", "news": "News", diff --git a/messages/no.json b/messages/no.json index 776a021a..b9cf4604 100644 --- a/messages/no.json +++ b/messages/no.json @@ -2,6 +2,14 @@ "meta": { "description": "Hackerspace NTNU, et studentledet prosjekt åpent for alle studenter, tilbyr tilgang til ny teknologi som 3D-printere og VR-utstyr. Våre medlemmer gir variert ekspertise for å hjelpe med prosjektene dine, fra å få en LED-lys til å blinke til å lage en 3D-modell. Besøk vårt verksted eller bli med i vår Slack-kanal for assistanse eller en vennlig prat." }, + "ui": { + "close": "Lukk", + "previous": "Forrige", + "goToPreviousPage": "Gå til forrige side", + "next": "Neste", + "goToNextPage": "Gå til neste side", + "morePages": "Flere sider" + }, "layout": { "hackerspaceHome": "Hackerspace hjemmeside", "news": "Nyheter", diff --git a/package.json b/package.json index 285fed28..a4ec271c 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "next-intl": "^3.4.4", "next-sitemap": "^4.2.3", "next-themes": "^0.2.1", + "nuqs": "^1.15.4", "react": "18.2.0", "react-dom": "18.2.0", "tailwind-merge": "^2.2.0", diff --git a/src/app/[locale]/(dashboard)/news/page.tsx b/src/app/[locale]/(dashboard)/news/page.tsx index 4e8ed3b5..877171e7 100644 --- a/src/app/[locale]/(dashboard)/news/page.tsx +++ b/src/app/[locale]/(dashboard)/news/page.tsx @@ -4,6 +4,7 @@ import { getTranslations, unstable_setRequestLocale } from 'next-intl/server'; import { cx } from '@/lib/utils'; import { NewsCard } from '@/components/news/NewsCard'; +import { NewsItemGrid } from '@/components/news/NewsItemGrid'; import { Separator } from '@/components/ui/Separator'; export async function generateMetadata({ @@ -68,7 +69,7 @@ export default function News({ }, { id: 8, - title: 'Hvorfor er jeg her?', + title: 'Dette er en veeeeldig lang overskrift som skal testes', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, @@ -90,52 +91,45 @@ export default function News({ date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 12, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 13, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 14, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 15, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 16, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 17, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 18, - title: 'Hvorfor er jeg her?', + title: '18', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, @@ -146,27 +140,30 @@ export default function News({ date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 20, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 21, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, - { id: 22, title: 'Hvorfor er jeg her?', date: '22. oktober 2023', photoUrl: 'mock.jpg', }, + { + id: 23, + title: '23', + date: '22. oktober 2023', + photoUrl: 'mock.jpg', + }, ]; unstable_setRequestLocale(locale); const t = useTranslations('news'); @@ -190,6 +187,17 @@ export default function News({ ))} + ); } diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx index 134cb6b2..4d4c7c2c 100644 --- a/src/components/layout/Footer.tsx +++ b/src/components/layout/Footer.tsx @@ -115,9 +115,11 @@ function Footer() {

{t('links')}