Skip to content

Commit

Permalink
fixed merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@MathiasStrom
MathiasStrom committed Oct 28, 2024
2 parents c2119e8 + c461e1d commit 21cad85
Show file tree
Hide file tree
Showing 39 changed files with 1,814 additions and 922 deletions.
2 changes: 0 additions & 2 deletions .env.production
View file

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
.env.development.local
.env.test.local
.env.production.local
a.json

*.log*
npm-debug.log*
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,33 @@

## Neste versjon

🎨 - **Desingendring**. Sentrerte og flyttet "Last in mer" knappen under bildene i galleri.
⚡ - **Event**. Arrangementadministrasjonen vil kunne filtrere deltakere etter år, studie, allergier, betalingsstatus (kun betalte arrangementer) og oppmøte.

## Versjon 2024.22.10

- ✨ **Gruppe**. HS kan nå opprette grupper.

## Versjon 2024.15.10

- ✨ **Betalinger**. Man kan nå se hvem på deltagerlisten som har betalt for arrangementet.
- 🎨 **Profil navigering**. Ikoner på mobil på profil er nå fikset.
- 🎨 **Maks bredde på tekst**. Beskrivelse under tittel er nå tilpasset.

## Versjon 2024.11.10

- 🎨 **Notion**. Slack-linken i footeren er erstattet med TIHLDE's Notion
- 🦟 **Påmeldingsspørsmål**. Fjernet muligheten for å opprette spørreskjema for påmelding, siden dette ikke brukes lenger.
- ⚡ **Spørreskjema**. Man kan nå legge ved en beskrivelse på et spørreskjema for gruppeskjema.
- 🎨 **Studie**. Digital Samhandling er nå byttet ut med Digital Transformasjon overalt.
- 🦟 **Filtrering av påmeldinger**. Filtrering av påmeldinger som har ankommet skjer nå på backend og ikke frontend.
- 🎨 **Arrangement**. La til maksbredde for store skjermer.
- 🎨 **Badges ledertavle**. Fikset overflow av tekst på Badges ledertavle.
- 🦟 **Brukerbilde**. Admins kan nå laste opp profilbilde for medlemmer.

## Versjon 2024.18.09

- 🦟 **Safari zoom**. En bug der safari på mobil zoomer inn på input er nå fikset.

## Versjon 2024.12.09

Expand Down
8 changes: 4 additions & 4 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
<html lang="nb">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />

<meta name="theme-color" content="#16356e" data-react-helmet="true" />
<title>TIHLDE</title>
<meta
name="description"
content="Linjeforeningen for Dataingeniør, Digital infrastruktur og cybersikkerhet, Digital forretningsutvikling, Digital samhandling og Informasjonsbehandling ved NTNU" />
content="Linjeforeningen for Dataingeniør, Digital infrastruktur og cybersikkerhet, Digital forretningsutvikling, Digital transformasjon og Informasjonsbehandling ved NTNU" />

<meta property="og:url" content="https://tihlde.org" />
<meta property="og:type" content="website" />
<meta property="og:title" content="TIHLDE" />
<meta
property="og:description"
content="Linjeforeningen for Dataingeniør, Digital infrastruktur og cybersikkerhet, Digital forretningsutvikling, Digital samhandling og Informasjonsbehandling ved NTNU" />
content="Linjeforeningen for Dataingeniør, Digital infrastruktur og cybersikkerhet, Digital forretningsutvikling, Digital transformasjon og Informasjonsbehandling ved NTNU" />
<meta property="og:image" content="https://tihlde.org/browser-icons/cover-image.jpg" />

<meta property="twitter:url" content="https://tihlde.org" />
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:title" content="TIHLDE" />
<meta
name="twitter:description"
content="Linjeforeningen for Dataingeniør, Digital infrastruktur og cybersikkerhet, Digital forretningsutvikling, Digital samhandling og Informasjonsbehandling ved NTNU" />
content="Linjeforeningen for Dataingeniør, Digital infrastruktur og cybersikkerhet, Digital forretningsutvikling, Digital transformasjon og Informasjonsbehandling ved NTNU" />
<meta name="twitter:image" content="https://tihlde.org/browser-icons/cover-image.jpg" />

<link rel="apple-touch-icon" sizes="57x57" href="/browser-icons/apple-icon-57x57.png" />
Expand Down
134 changes: 67 additions & 67 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,71 @@
"node": ">=14.x"
},
"dependencies": {
"@devexpress/dx-react-core": "^3.0.0-beta.2",
"@devexpress/dx-react-scheduler": "^3.0.0-beta.2",
"@devexpress/dx-react-scheduler-material-ui": "^3.0.0-beta.2",
"@emotion/cache": "^11.11.0",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@hookform/resolvers": "^3.3.4",
"@devexpress/dx-react-core": "^3.0.6",
"@devexpress/dx-react-scheduler": "^3.0.6",
"@devexpress/dx-react-scheduler-material-ui": "^3.0.6",
"@emotion/cache": "^11.13.1",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@hookform/resolvers": "^3.9.0",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-alert-dialog": "^1.0.5",
"@radix-ui/react-avatar": "^1.0.4",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-collapsible": "^1.0.3",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-navigation-menu": "^1.1.4",
"@radix-ui/react-popover": "^1.0.7",
"@radix-ui/react-scroll-area": "^1.0.5",
"@radix-ui/react-select": "^2.0.0",
"@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-toggle": "^1.0.3",
"@radix-ui/react-toggle-group": "^1.0.4",
"@radix-ui/react-tooltip": "^1.1.0",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-collapsible": "^1.1.0",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-navigation-menu": "^1.2.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-tabs": "^1.1.0",
"@radix-ui/react-toggle": "^1.1.0",
"@radix-ui/react-toggle-group": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@vercel/analytics": "1.1.4",
"browser-image-compression": "^2.0.0",
"canvas-confetti": "^1.6.0",
"browser-image-compression": "^2.0.2",
"canvas-confetti": "^1.9.3",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"constate": "^3.3.0",
"copy-to-clipboard": "^3.3.1",
"constate": "^3.3.2",
"copy-to-clipboard": "^3.3.3",
"date-fns": "^2.30.0",
"delayed-scroll-restoration-polyfill": "^0.1.1",
"emoji-picker-react": "^4.5.6",
"emoji-picker-react": "^4.12.0",
"immutability-helper": "^3.1.1",
"lucide-react": "^0.352.0",
"lucide-react": "^0.446.0",
"next-themes": "^0.3.0",
"qr-scanner": "^1.4.1",
"qrcode.react": "^3.1.0",
"qr-scanner": "^1.4.2",
"qrcode.react": "^3.2.0",
"radix-ui": "^1.0.1",
"react": "^18.3.1",
"react-day-picker": "^8.10.1",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.3.1",
"react-dropzone": "^14.2.1",
"react-easy-crop": "^5.0.1",
"react-dropzone": "^14.2.3",
"react-easy-crop": "^5.0.8",
"react-helmet": "^6.1.0",
"react-hook-form": "^7.51.2",
"react-markdown": "^8.0.0",
"react-query": "^3.39.0",
"react-router-dom": "^6.22.3",
"react-hook-form": "^7.53.0",
"react-markdown": "^8.0.7",
"react-query": "^3.39.3",
"react-router-dom": "^6.26.1",
"rehype-raw": "^7.0.0",
"slugify": "^1.6.3",
"slugify": "^1.6.6",
"sonner": "^1.5.0",
"tailwind-merge": "^2.2.1",
"tailwind-merge": "^2.5.2",
"tailwindcss-animate": "^1.0.7",
"tss-react": "^4.9.0",
"universal-cookie": "^6.1.0",
"tss-react": "^4.9.13",
"universal-cookie": "^6.1.3",
"use-resize-observer": "^9.1.0",
"vaul": "^0.9.1",
"zod": "^3.22.4"
"vaul": "^0.9.2",
"zod": "^3.23.8"
},
"scripts": {
"start": "vite --host",
Expand All @@ -84,31 +84,31 @@
"prepare": "husky install"
},
"devDependencies": {
"@types/canvas-confetti": "^1.6.0",
"@types/node": "^20.6.3",
"@types/react": "^18.3.3",
"@types/canvas-confetti": "^1.6.4",
"@types/node": "^20.16.5",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"@types/react-helmet": "^6.1.2",
"@types/react-qr-reader": "^2.1.4",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.38.1",
"@vitejs/plugin-react": "^4.2.0",
"autoprefixer": "^10.4.18",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.0.0",
"@types/react-helmet": "^6.1.11",
"@types/react-qr-reader": "^2.1.7",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import-helpers": "^1.3.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.5.0",
"husky": "^8.0.1",
"postcss": "^8.4.35",
"prettier": "^2.6.0",
"tailwindcss": "^3.4.1",
"typescript": "^4.6.2",
"vite": "^5.0.12",
"vite-plugin-checker": "^0.6.2",
"eslint-plugin-react": "^7.35.2",
"eslint-plugin-react-hooks": "^4.6.2",
"husky": "^8.0.3",
"postcss": "^8.4.45",
"prettier": "^2.8.8",
"tailwindcss": "^3.4.10",
"typescript": "^4.9.5",
"vite": "^5.4.3",
"vite-plugin-checker": "^0.8.0",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^4.2.1"
"vite-tsconfig-paths": "^4.3.2"
}
}
Loading

0 comments on commit 21cad85

Please sign in to comment.