From c4f3c67cd0b32f93fd1cb272d75a066860fedeb3 Mon Sep 17 00:00:00 2001 From: brage-andreas Date: Thu, 18 Dec 2025 02:40:53 +0100 Subject: [PATCH] refactor: localize dashboard pathnames --- apps/dashboard/next.config.mjs | 2 +- .../src/app/{auth => (auth)}/login/page.tsx | 0 .../[id]/attendance-page.tsx | 0 .../[id]/attendees-page.tsx | 2 +- .../[id]/edit-card.tsx | 4 +- .../[id]/feedback-page.tsx | 0 .../{event => arrangementer}/[id]/layout.tsx | 0 .../{event => arrangementer}/[id]/page.tsx | 2 +- .../[id]/payment-page.tsx | 0 .../[id]/provider.tsx | 0 .../[id]/selections-page.tsx | 0 .../components/InfoBox.tsx | 0 .../components/all-attendees-table.tsx | 0 .../components/attendance-form.tsx | 0 .../attendance-registered-modal.tsx | 0 .../create-event-selections-modal.tsx | 0 .../components/create-pool-modal.tsx | 0 .../edit-event-selections-modal.tsx | 0 .../components/edit-form.tsx | 2 +- .../components/edit-pool-modal.tsx | 0 .../error-attendance-registered-modal.tsx | 0 .../components/event-filters.tsx | 0 .../components/event-hosting-group-list.tsx | 0 .../components/events-table.tsx | 2 +- .../components/feedback-form-edit-form.tsx | 0 .../manual-create-user-attend-modal.tsx | 0 .../manual-delete-user-attend-modal.tsx | 0 .../components/pool-form.tsx | 0 .../components/pools-box.tsx | 0 .../components/pools-form.tsx | 0 .../components/qr-code-scanned-modal.tsx | 0 .../components/qr-code-scanner.tsx | 0 .../components/selection-form.tsx | 0 .../components/utils.ts | 0 .../components/write-form.tsx | 8 ++-- .../{event => arrangementer}/mutations.ts | 0 .../{event => arrangementer}/page.tsx | 2 +- .../{event => arrangementer}/queries.ts | 0 .../registrer}/page.tsx | 0 .../{event => arrangementer}/templates.ts | 0 .../{event => arrangementer}/validation.ts | 0 .../{article => artikler}/[id]/edit-card.tsx | 0 .../{article => artikler}/[id]/layout.tsx | 0 .../{article => artikler}/[id]/page.tsx | 0 .../{article => artikler}/[id]/provider.tsx | 0 .../all-articles-table.tsx | 0 .../modals/create-article.tsx | 0 .../{article => artikler}/mutations.ts | 0 .../(internal)/{article => artikler}/page.tsx | 0 .../{article => artikler}/queries.ts | 0 .../{article => artikler}/write-form.tsx | 4 +- .../deregister-reasons-table.tsx | 0 .../page.tsx | 0 .../queries.ts | 0 .../[slug]/company-event-page.tsx | 2 +- .../[slug]/edit-card.tsx | 0 .../{company => bedrifter}/[slug]/layout.tsx | 0 .../{company => bedrifter}/[slug]/page.tsx | 0 .../[slug]/provider.tsx | 0 .../components/use-company-table.tsx | 0 .../components/write-form.tsx | 2 +- .../{company => bedrifter}/mutations.ts | 0 .../{company => bedrifter}/page.tsx | 2 +- .../{company => bedrifter}/queries.ts | 0 .../register => bedrifter/registrer}/page.tsx | 0 .../{user => brukere}/[id]/edit-card.tsx | 0 .../{user => brukere}/[id]/edit-form.tsx | 2 +- .../{user => brukere}/[id]/layout.tsx | 0 .../[id]/membership-page.tsx | 0 .../{user => brukere}/[id]/page.tsx | 0 .../{user => brukere}/[id]/provider.tsx | 0 .../[id]/user-event-page.tsx | 4 +- .../[id]/user-group-page.tsx | 2 +- .../[id]/user-punishment-page.tsx | 4 +- .../confirm-delete-membership-modal.tsx | 0 .../components/create-membership-modal.tsx | 0 .../components/edit-membership-modal.tsx | 0 .../components/membership-form.tsx | 0 .../components/use-membership-table.tsx | 0 .../components/user-filters.tsx | 0 .../components/user-search.tsx | 0 .../(internal)/{user => brukere}/mutations.ts | 0 .../app/(internal)/{user => brukere}/page.tsx | 0 .../(internal)/{user => brukere}/queries.ts | 0 .../{user => brukere}/use-user-table.tsx | 0 .../[id]/[memberId]/edit-card.tsx | 0 .../[id]/[memberId]/group-membership-form.tsx | 0 .../[id]/[memberId]/layout.tsx | 0 .../[id]/[memberId]/page.tsx | 0 .../[id]/[memberId]/provider.tsx | 0 .../[memberId]/use-group-membership-table.tsx | 0 .../{group => grupper}/[id]/edit-card.tsx | 4 +- .../[id]/group-event-page.tsx | 4 +- .../{group => grupper}/[id]/layout.tsx | 0 .../{group => grupper}/[id]/members-page.tsx | 2 +- .../{group => grupper}/[id]/page.tsx | 0 .../{group => grupper}/[id]/provider.tsx | 0 .../{group => grupper}/[id]/roles-page.tsx | 0 .../[id]/use-group-member-table.tsx | 0 .../{group => grupper}/all-groups-table.tsx | 0 .../{group => grupper}/group-member-form.tsx | 0 .../{group => grupper}/group-role-form.tsx | 0 .../modals/create-group-member-modal.tsx | 0 .../modals/create-group-modal.tsx | 0 .../modals/create-group-role-modal.tsx | 0 .../modals/edit-group-membership-modal.tsx | 0 .../modals/edit-group-role-modal.tsx | 0 .../{group => grupper}/mutations.ts | 0 .../(internal)/{group => grupper}/page.tsx | 0 .../(internal)/{group => grupper}/queries.ts | 0 .../{group => grupper}/write-form.tsx | 2 +- .../[id]/edit-card.tsx | 0 .../{job-listing => karriere}/[id]/layout.tsx | 0 .../{job-listing => karriere}/[id]/page.tsx | 0 .../[id]/provider.tsx | 0 .../components/job-listing-filter.tsx | 0 .../modals/create-job-listing-modal.tsx | 0 .../use-create-job-listing-mutation.ts | 0 .../use-edit-job-listing-mutation.ts | 0 .../{job-listing => karriere}/page.tsx | 0 .../queries/use-job-listing-all-query.ts | 0 .../use-job-listing-locations-all-query.ts | 0 .../use-job-listing-table.tsx | 0 .../useJobListingWriteForm.tsx | 0 .../{job-listing => karriere}/write-form.tsx | 2 +- apps/dashboard/src/app/(internal)/layout.tsx | 2 +- .../{audit-log => logg}/[id]/layout.tsx | 0 .../{audit-log => logg}/[id]/page.tsx | 0 .../{audit-log => logg}/[id]/provider.tsx | 0 .../components/audit-log-filters.tsx | 0 .../(internal)/{audit-log => logg}/page.tsx | 0 .../(internal)/{audit-log => logg}/queries.ts | 0 .../use-audit-log-table.tsx | 0 .../{punishment => prikker}/[id]/layout.tsx | 0 .../{punishment => prikker}/[id]/page.tsx | 2 +- .../{punishment => prikker}/[id]/provider.tsx | 0 .../modals/create-mark-modal.tsx | 2 +- .../modals/create-suspension-modal.tsx | 2 +- .../mutations/use-create-mark-mutations.ts | 0 .../use-create-personal-mark-mutations.ts | 0 .../mutations/use-edit-mark-mutation.ts | 0 .../{punishment => prikker}/page.tsx | 0 .../punishment-table.tsx | 0 .../use-count-users-with-mark-query.ts | 0 .../queries/use-mark-get-query.ts | 0 .../use-personal-mark-get-by-mark-id.ts | 0 .../queries/use-punishment-all-query.ts | 0 .../{punishment => prikker}/write-form.tsx | 0 apps/dashboard/src/app/ApplicationShell.tsx | 18 ++++----- apps/dashboard/src/app/ModalProvider.tsx | 40 +++++++++---------- .../src/components/forms/EventSelectInput.tsx | 2 +- apps/dashboard/tsconfig.json | 4 +- .../src/modules/event/attendance-router.ts | 2 +- .../src/modules/event/attendance.e2e-spec.ts | 12 +++--- apps/rpc/src/modules/user/user-service.ts | 8 ++-- infra/auth0/main.tf | 2 +- pnpm-lock.yaml | 24 +---------- 157 files changed, 80 insertions(+), 100 deletions(-) rename apps/dashboard/src/app/{auth => (auth)}/login/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/attendance-page.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/attendees-page.tsx (98%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/edit-card.tsx (87%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/feedback-page.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/page.tsx (98%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/payment-page.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/[id]/selections-page.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/InfoBox.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/all-attendees-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/attendance-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/attendance-registered-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/create-event-selections-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/create-pool-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/edit-event-selections-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/edit-form.tsx (98%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/edit-pool-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/error-attendance-registered-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/event-filters.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/event-hosting-group-list.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/events-table.tsx (95%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/feedback-form-edit-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/manual-create-user-attend-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/manual-delete-user-attend-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/pool-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/pools-box.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/pools-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/qr-code-scanned-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/qr-code-scanner.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/selection-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/utils.ts (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/components/write-form.tsx (94%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/mutations.ts (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/page.tsx (89%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/queries.ts (100%) rename apps/dashboard/src/app/(internal)/{event/register => arrangementer/registrer}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/templates.ts (100%) rename apps/dashboard/src/app/(internal)/{event => arrangementer}/validation.ts (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/[id]/edit-card.tsx (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/[id]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/[id]/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/[id]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/all-articles-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/modals/create-article.tsx (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/mutations.ts (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/queries.ts (100%) rename apps/dashboard/src/app/(internal)/{article => artikler}/write-form.tsx (96%) rename apps/dashboard/src/app/(internal)/{deregister-reason => avmeldingsgrunner}/deregister-reasons-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{deregister-reason => avmeldingsgrunner}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{deregister-reason => avmeldingsgrunner}/queries.ts (100%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/[slug]/company-event-page.tsx (87%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/[slug]/edit-card.tsx (100%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/[slug]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/[slug]/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/[slug]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/components/use-company-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/components/write-form.tsx (95%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/mutations.ts (100%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/page.tsx (91%) rename apps/dashboard/src/app/(internal)/{company => bedrifter}/queries.ts (100%) rename apps/dashboard/src/app/(internal)/{company/register => bedrifter/registrer}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/edit-card.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/edit-form.tsx (95%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/membership-page.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/user-event-page.tsx (70%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/user-group-page.tsx (81%) rename apps/dashboard/src/app/(internal)/{user => brukere}/[id]/user-punishment-page.tsx (65%) rename apps/dashboard/src/app/(internal)/{user => brukere}/components/confirm-delete-membership-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/components/create-membership-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/components/edit-membership-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/components/membership-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/components/use-membership-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/components/user-filters.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/components/user-search.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/mutations.ts (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/queries.ts (100%) rename apps/dashboard/src/app/(internal)/{user => brukere}/use-user-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/[memberId]/edit-card.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/[memberId]/group-membership-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/[memberId]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/[memberId]/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/[memberId]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/[memberId]/use-group-membership-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/edit-card.tsx (98%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/group-event-page.tsx (74%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/members-page.tsx (99%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/roles-page.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/[id]/use-group-member-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/all-groups-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/group-member-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/group-role-form.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/modals/create-group-member-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/modals/create-group-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/modals/create-group-role-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/modals/edit-group-membership-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/modals/edit-group-role-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/mutations.ts (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/queries.ts (100%) rename apps/dashboard/src/app/(internal)/{group => grupper}/write-form.tsx (98%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/[id]/edit-card.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/[id]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/[id]/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/[id]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/components/job-listing-filter.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/modals/create-job-listing-modal.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/mutations/use-create-job-listing-mutation.ts (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/mutations/use-edit-job-listing-mutation.ts (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/queries/use-job-listing-all-query.ts (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/queries/use-job-listing-locations-all-query.ts (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/use-job-listing-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/useJobListingWriteForm.tsx (100%) rename apps/dashboard/src/app/(internal)/{job-listing => karriere}/write-form.tsx (98%) rename apps/dashboard/src/app/(internal)/{audit-log => logg}/[id]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{audit-log => logg}/[id]/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{audit-log => logg}/[id]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{audit-log => logg}/components/audit-log-filters.tsx (100%) rename apps/dashboard/src/app/(internal)/{audit-log => logg}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{audit-log => logg}/queries.ts (100%) rename apps/dashboard/src/app/(internal)/{audit-log => logg}/use-audit-log-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/[id]/layout.tsx (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/[id]/page.tsx (97%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/[id]/provider.tsx (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/modals/create-mark-modal.tsx (92%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/modals/create-suspension-modal.tsx (92%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/mutations/use-create-mark-mutations.ts (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/mutations/use-create-personal-mark-mutations.ts (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/mutations/use-edit-mark-mutation.ts (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/page.tsx (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/punishment-table.tsx (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/queries/use-count-users-with-mark-query.ts (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/queries/use-mark-get-query.ts (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/queries/use-personal-mark-get-by-mark-id.ts (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/queries/use-punishment-all-query.ts (100%) rename apps/dashboard/src/app/(internal)/{punishment => prikker}/write-form.tsx (100%) diff --git a/apps/dashboard/next.config.mjs b/apps/dashboard/next.config.mjs index 9c4af4810f..b801294c74 100644 --- a/apps/dashboard/next.config.mjs +++ b/apps/dashboard/next.config.mjs @@ -9,7 +9,7 @@ const config = { return [ { source: "/", - destination: "/event", + destination: "/arrangementer", permanent: false, }, ] diff --git a/apps/dashboard/src/app/auth/login/page.tsx b/apps/dashboard/src/app/(auth)/login/page.tsx similarity index 100% rename from apps/dashboard/src/app/auth/login/page.tsx rename to apps/dashboard/src/app/(auth)/login/page.tsx diff --git a/apps/dashboard/src/app/(internal)/event/[id]/attendance-page.tsx b/apps/dashboard/src/app/(internal)/arrangementer/[id]/attendance-page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/event/[id]/attendance-page.tsx rename to apps/dashboard/src/app/(internal)/arrangementer/[id]/attendance-page.tsx diff --git a/apps/dashboard/src/app/(internal)/event/[id]/attendees-page.tsx b/apps/dashboard/src/app/(internal)/arrangementer/[id]/attendees-page.tsx similarity index 98% rename from apps/dashboard/src/app/(internal)/event/[id]/attendees-page.tsx rename to apps/dashboard/src/app/(internal)/arrangementer/[id]/attendees-page.tsx index b880f4f4b0..db08ee4e5e 100644 --- a/apps/dashboard/src/app/(internal)/event/[id]/attendees-page.tsx +++ b/apps/dashboard/src/app/(internal)/arrangementer/[id]/attendees-page.tsx @@ -1,4 +1,4 @@ -import { UserSearch } from "@/app/(internal)/user/components/user-search" +import { UserSearch } from "@/app/(internal)/brukere/components/user-search" import type { Attendance, Event, FeedbackFormAnswer } from "@dotkomonline/types" import { Anchor, Button, Group, List, ListItem, Space, Stack, Text, Title } from "@mantine/core" import { skipToken } from "@tanstack/react-query" diff --git a/apps/dashboard/src/app/(internal)/event/[id]/edit-card.tsx b/apps/dashboard/src/app/(internal)/arrangementer/[id]/edit-card.tsx similarity index 87% rename from apps/dashboard/src/app/(internal)/event/[id]/edit-card.tsx rename to apps/dashboard/src/app/(internal)/arrangementer/[id]/edit-card.tsx index 339b9c0214..106dd8e7aa 100644 --- a/apps/dashboard/src/app/(internal)/event/[id]/edit-card.tsx +++ b/apps/dashboard/src/app/(internal)/arrangementer/[id]/edit-card.tsx @@ -1,6 +1,6 @@ -import { useGroupAllQuery } from "@/app/(internal)/group/queries" +import { useGroupAllQuery } from "@/app/(internal)/grupper/queries" import type { FC } from "react" -import { useCompanyAllQuery } from "../../company/queries" +import { useCompanyAllQuery } from "@/app/(internal)/bedrifter/queries" import { useEventEditForm } from "../components/edit-form" import { useUpdateEventMutation } from "../mutations" diff --git a/apps/dashboard/src/app/(internal)/event/[id]/feedback-page.tsx b/apps/dashboard/src/app/(internal)/arrangementer/[id]/feedback-page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/event/[id]/feedback-page.tsx rename to apps/dashboard/src/app/(internal)/arrangementer/[id]/feedback-page.tsx diff --git a/apps/dashboard/src/app/(internal)/event/[id]/layout.tsx b/apps/dashboard/src/app/(internal)/arrangementer/[id]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/event/[id]/layout.tsx rename to apps/dashboard/src/app/(internal)/arrangementer/[id]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/event/[id]/page.tsx b/apps/dashboard/src/app/(internal)/arrangementer/[id]/page.tsx similarity index 98% rename from apps/dashboard/src/app/(internal)/event/[id]/page.tsx rename to apps/dashboard/src/app/(internal)/arrangementer/[id]/page.tsx index 659db46ca0..58b773ede8 100644 --- a/apps/dashboard/src/app/(internal)/event/[id]/page.tsx +++ b/apps/dashboard/src/app/(internal)/arrangementer/[id]/page.tsx @@ -102,7 +102,7 @@ export default function EventWithAttendancesPage() { diff --git a/apps/dashboard/src/app/(internal)/event/queries.ts b/apps/dashboard/src/app/(internal)/arrangementer/queries.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/event/queries.ts rename to apps/dashboard/src/app/(internal)/arrangementer/queries.ts diff --git a/apps/dashboard/src/app/(internal)/event/register/page.tsx b/apps/dashboard/src/app/(internal)/arrangementer/registrer/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/event/register/page.tsx rename to apps/dashboard/src/app/(internal)/arrangementer/registrer/page.tsx diff --git a/apps/dashboard/src/app/(internal)/event/templates.ts b/apps/dashboard/src/app/(internal)/arrangementer/templates.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/event/templates.ts rename to apps/dashboard/src/app/(internal)/arrangementer/templates.ts diff --git a/apps/dashboard/src/app/(internal)/event/validation.ts b/apps/dashboard/src/app/(internal)/arrangementer/validation.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/event/validation.ts rename to apps/dashboard/src/app/(internal)/arrangementer/validation.ts diff --git a/apps/dashboard/src/app/(internal)/article/[id]/edit-card.tsx b/apps/dashboard/src/app/(internal)/artikler/[id]/edit-card.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/article/[id]/edit-card.tsx rename to apps/dashboard/src/app/(internal)/artikler/[id]/edit-card.tsx diff --git a/apps/dashboard/src/app/(internal)/article/[id]/layout.tsx b/apps/dashboard/src/app/(internal)/artikler/[id]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/article/[id]/layout.tsx rename to apps/dashboard/src/app/(internal)/artikler/[id]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/article/[id]/page.tsx b/apps/dashboard/src/app/(internal)/artikler/[id]/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/article/[id]/page.tsx rename to apps/dashboard/src/app/(internal)/artikler/[id]/page.tsx diff --git a/apps/dashboard/src/app/(internal)/article/[id]/provider.tsx b/apps/dashboard/src/app/(internal)/artikler/[id]/provider.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/article/[id]/provider.tsx rename to apps/dashboard/src/app/(internal)/artikler/[id]/provider.tsx diff --git a/apps/dashboard/src/app/(internal)/article/all-articles-table.tsx b/apps/dashboard/src/app/(internal)/artikler/all-articles-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/article/all-articles-table.tsx rename to apps/dashboard/src/app/(internal)/artikler/all-articles-table.tsx diff --git a/apps/dashboard/src/app/(internal)/article/modals/create-article.tsx b/apps/dashboard/src/app/(internal)/artikler/modals/create-article.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/article/modals/create-article.tsx rename to apps/dashboard/src/app/(internal)/artikler/modals/create-article.tsx diff --git a/apps/dashboard/src/app/(internal)/article/mutations.ts b/apps/dashboard/src/app/(internal)/artikler/mutations.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/article/mutations.ts rename to apps/dashboard/src/app/(internal)/artikler/mutations.ts diff --git a/apps/dashboard/src/app/(internal)/article/page.tsx b/apps/dashboard/src/app/(internal)/artikler/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/article/page.tsx rename to apps/dashboard/src/app/(internal)/artikler/page.tsx diff --git a/apps/dashboard/src/app/(internal)/article/queries.ts b/apps/dashboard/src/app/(internal)/artikler/queries.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/article/queries.ts rename to apps/dashboard/src/app/(internal)/artikler/queries.ts diff --git a/apps/dashboard/src/app/(internal)/article/write-form.tsx b/apps/dashboard/src/app/(internal)/artikler/write-form.tsx similarity index 96% rename from apps/dashboard/src/app/(internal)/article/write-form.tsx rename to apps/dashboard/src/app/(internal)/artikler/write-form.tsx index a08e30a370..4ec3d63a34 100644 --- a/apps/dashboard/src/app/(internal)/article/write-form.tsx +++ b/apps/dashboard/src/app/(internal)/artikler/write-form.tsx @@ -1,5 +1,5 @@ -import { useArticleFileUploadMutation } from "@/app/(internal)/article/mutations" -import { useTagsAllQuery } from "@/app/(internal)/article/queries" +import { useArticleFileUploadMutation } from "@/app/(internal)/artikler/mutations" +import { useTagsAllQuery } from "@/app/(internal)/artikler/queries" import { createCheckboxInput } from "@/components/forms/CheckboxInput" import { useFormBuilder } from "@/components/forms/Form" import { createImageInput } from "@/components/forms/ImageInput" diff --git a/apps/dashboard/src/app/(internal)/deregister-reason/deregister-reasons-table.tsx b/apps/dashboard/src/app/(internal)/avmeldingsgrunner/deregister-reasons-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/deregister-reason/deregister-reasons-table.tsx rename to apps/dashboard/src/app/(internal)/avmeldingsgrunner/deregister-reasons-table.tsx diff --git a/apps/dashboard/src/app/(internal)/deregister-reason/page.tsx b/apps/dashboard/src/app/(internal)/avmeldingsgrunner/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/deregister-reason/page.tsx rename to apps/dashboard/src/app/(internal)/avmeldingsgrunner/page.tsx diff --git a/apps/dashboard/src/app/(internal)/deregister-reason/queries.ts b/apps/dashboard/src/app/(internal)/avmeldingsgrunner/queries.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/deregister-reason/queries.ts rename to apps/dashboard/src/app/(internal)/avmeldingsgrunner/queries.ts diff --git a/apps/dashboard/src/app/(internal)/company/[slug]/company-event-page.tsx b/apps/dashboard/src/app/(internal)/bedrifter/[slug]/company-event-page.tsx similarity index 87% rename from apps/dashboard/src/app/(internal)/company/[slug]/company-event-page.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/[slug]/company-event-page.tsx index 30a2a86d2c..f39c837c60 100644 --- a/apps/dashboard/src/app/(internal)/company/[slug]/company-event-page.tsx +++ b/apps/dashboard/src/app/(internal)/bedrifter/[slug]/company-event-page.tsx @@ -1,6 +1,6 @@ import { Box, Text, Title } from "@mantine/core" import type { FC } from "react" -import { EventTable } from "../../event/components/events-table" +import { EventTable } from "@/app/(internal)/arrangementer/components/events-table" import { useCompanyEventsAllQuery } from "../queries" import { useCompanyDetailsContext } from "./provider" diff --git a/apps/dashboard/src/app/(internal)/company/[slug]/edit-card.tsx b/apps/dashboard/src/app/(internal)/bedrifter/[slug]/edit-card.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/company/[slug]/edit-card.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/[slug]/edit-card.tsx diff --git a/apps/dashboard/src/app/(internal)/company/[slug]/layout.tsx b/apps/dashboard/src/app/(internal)/bedrifter/[slug]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/company/[slug]/layout.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/[slug]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/company/[slug]/page.tsx b/apps/dashboard/src/app/(internal)/bedrifter/[slug]/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/company/[slug]/page.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/[slug]/page.tsx diff --git a/apps/dashboard/src/app/(internal)/company/[slug]/provider.tsx b/apps/dashboard/src/app/(internal)/bedrifter/[slug]/provider.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/company/[slug]/provider.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/[slug]/provider.tsx diff --git a/apps/dashboard/src/app/(internal)/company/components/use-company-table.tsx b/apps/dashboard/src/app/(internal)/bedrifter/components/use-company-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/company/components/use-company-table.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/components/use-company-table.tsx diff --git a/apps/dashboard/src/app/(internal)/company/components/write-form.tsx b/apps/dashboard/src/app/(internal)/bedrifter/components/write-form.tsx similarity index 95% rename from apps/dashboard/src/app/(internal)/company/components/write-form.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/components/write-form.tsx index a92e9e1716..b6eb0595b8 100644 --- a/apps/dashboard/src/app/(internal)/company/components/write-form.tsx +++ b/apps/dashboard/src/app/(internal)/bedrifter/components/write-form.tsx @@ -1,4 +1,4 @@ -import { useCompanyFileUploadMutation } from "@/app/(internal)/company/mutations" +import { useCompanyFileUploadMutation } from "@/app/(internal)/bedrifter/mutations" import { useFormBuilder } from "@/components/forms/Form" import { createImageInput } from "@/components/forms/ImageInput" import { createRichTextInput } from "@/components/forms/RichTextInput/RichTextInput" diff --git a/apps/dashboard/src/app/(internal)/company/mutations.ts b/apps/dashboard/src/app/(internal)/bedrifter/mutations.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/company/mutations.ts rename to apps/dashboard/src/app/(internal)/bedrifter/mutations.ts diff --git a/apps/dashboard/src/app/(internal)/company/page.tsx b/apps/dashboard/src/app/(internal)/bedrifter/page.tsx similarity index 91% rename from apps/dashboard/src/app/(internal)/company/page.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/page.tsx index 25fafeb945..b4e31fef18 100644 --- a/apps/dashboard/src/app/(internal)/company/page.tsx +++ b/apps/dashboard/src/app/(internal)/bedrifter/page.tsx @@ -14,7 +14,7 @@ export default function CompanyPage() { - diff --git a/apps/dashboard/src/app/(internal)/company/queries.ts b/apps/dashboard/src/app/(internal)/bedrifter/queries.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/company/queries.ts rename to apps/dashboard/src/app/(internal)/bedrifter/queries.ts diff --git a/apps/dashboard/src/app/(internal)/company/register/page.tsx b/apps/dashboard/src/app/(internal)/bedrifter/registrer/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/company/register/page.tsx rename to apps/dashboard/src/app/(internal)/bedrifter/registrer/page.tsx diff --git a/apps/dashboard/src/app/(internal)/user/[id]/edit-card.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/edit-card.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/[id]/edit-card.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/edit-card.tsx diff --git a/apps/dashboard/src/app/(internal)/user/[id]/edit-form.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/edit-form.tsx similarity index 95% rename from apps/dashboard/src/app/(internal)/user/[id]/edit-form.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/edit-form.tsx index 2f140754ea..3f42d12d51 100644 --- a/apps/dashboard/src/app/(internal)/user/[id]/edit-form.tsx +++ b/apps/dashboard/src/app/(internal)/brukere/[id]/edit-form.tsx @@ -1,4 +1,4 @@ -import { useUserFileUploadMutation } from "@/app/(internal)/user/mutations" +import { useUserFileUploadMutation } from "@/app/(internal)/brukere/mutations" import { useFormBuilder } from "@/components/forms/Form" import { createImageInput } from "@/components/forms/ImageInput" import { createSelectInput } from "@/components/forms/SelectInput" diff --git a/apps/dashboard/src/app/(internal)/user/[id]/layout.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/[id]/layout.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/user/[id]/membership-page.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/membership-page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/[id]/membership-page.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/membership-page.tsx diff --git a/apps/dashboard/src/app/(internal)/user/[id]/page.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/[id]/page.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/page.tsx diff --git a/apps/dashboard/src/app/(internal)/user/[id]/provider.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/provider.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/[id]/provider.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/provider.tsx diff --git a/apps/dashboard/src/app/(internal)/user/[id]/user-event-page.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/user-event-page.tsx similarity index 70% rename from apps/dashboard/src/app/(internal)/user/[id]/user-event-page.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/user-event-page.tsx index 428590f55f..0ab4633357 100644 --- a/apps/dashboard/src/app/(internal)/user/[id]/user-event-page.tsx +++ b/apps/dashboard/src/app/(internal)/brukere/[id]/user-event-page.tsx @@ -1,7 +1,7 @@ import { Skeleton } from "@mantine/core" import type { FC } from "react" -import { EventTable } from "../../event/components/events-table" -import { useEventAllByAttendingUserInfiniteQuery } from "../../event/queries" +import { EventTable } from "@/app/(internal)/arrangementer/components/events-table" +import { useEventAllByAttendingUserInfiniteQuery } from "@/app/(internal)/arrangementer/queries" import { useUserDetailsContext } from "./provider" export const UserEventPage: FC = () => { diff --git a/apps/dashboard/src/app/(internal)/user/[id]/user-group-page.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/user-group-page.tsx similarity index 81% rename from apps/dashboard/src/app/(internal)/user/[id]/user-group-page.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/user-group-page.tsx index f248ab8e92..3ed5e8429d 100644 --- a/apps/dashboard/src/app/(internal)/user/[id]/user-group-page.tsx +++ b/apps/dashboard/src/app/(internal)/brukere/[id]/user-group-page.tsx @@ -1,5 +1,5 @@ import type { FC } from "react" -import { AllGroupsTable } from "../../group/all-groups-table" +import { AllGroupsTable } from "@/app/(internal)/grupper/all-groups-table" import { useGroupAllByMemberQuery } from "../queries" import { useUserDetailsContext } from "./provider" diff --git a/apps/dashboard/src/app/(internal)/user/[id]/user-punishment-page.tsx b/apps/dashboard/src/app/(internal)/brukere/[id]/user-punishment-page.tsx similarity index 65% rename from apps/dashboard/src/app/(internal)/user/[id]/user-punishment-page.tsx rename to apps/dashboard/src/app/(internal)/brukere/[id]/user-punishment-page.tsx index 34c2445db6..a6e2b11626 100644 --- a/apps/dashboard/src/app/(internal)/user/[id]/user-punishment-page.tsx +++ b/apps/dashboard/src/app/(internal)/brukere/[id]/user-punishment-page.tsx @@ -1,6 +1,6 @@ import type { FC } from "react" -import { PunishmentTable } from "../../punishment/punishment-table" -import { usePunishmentAllInfiniteQuery } from "../../punishment/queries/use-punishment-all-query" +import { PunishmentTable } from "@/app/(internal)/prikker/punishment-table" +import { usePunishmentAllInfiniteQuery } from "@/app/(internal)/prikker/queries/use-punishment-all-query" import { useUserDetailsContext } from "./provider" export const UserPunishmentPage: FC = () => { diff --git a/apps/dashboard/src/app/(internal)/user/components/confirm-delete-membership-modal.tsx b/apps/dashboard/src/app/(internal)/brukere/components/confirm-delete-membership-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/components/confirm-delete-membership-modal.tsx rename to apps/dashboard/src/app/(internal)/brukere/components/confirm-delete-membership-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/user/components/create-membership-modal.tsx b/apps/dashboard/src/app/(internal)/brukere/components/create-membership-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/components/create-membership-modal.tsx rename to apps/dashboard/src/app/(internal)/brukere/components/create-membership-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/user/components/edit-membership-modal.tsx b/apps/dashboard/src/app/(internal)/brukere/components/edit-membership-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/components/edit-membership-modal.tsx rename to apps/dashboard/src/app/(internal)/brukere/components/edit-membership-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/user/components/membership-form.tsx b/apps/dashboard/src/app/(internal)/brukere/components/membership-form.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/components/membership-form.tsx rename to apps/dashboard/src/app/(internal)/brukere/components/membership-form.tsx diff --git a/apps/dashboard/src/app/(internal)/user/components/use-membership-table.tsx b/apps/dashboard/src/app/(internal)/brukere/components/use-membership-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/components/use-membership-table.tsx rename to apps/dashboard/src/app/(internal)/brukere/components/use-membership-table.tsx diff --git a/apps/dashboard/src/app/(internal)/user/components/user-filters.tsx b/apps/dashboard/src/app/(internal)/brukere/components/user-filters.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/components/user-filters.tsx rename to apps/dashboard/src/app/(internal)/brukere/components/user-filters.tsx diff --git a/apps/dashboard/src/app/(internal)/user/components/user-search.tsx b/apps/dashboard/src/app/(internal)/brukere/components/user-search.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/components/user-search.tsx rename to apps/dashboard/src/app/(internal)/brukere/components/user-search.tsx diff --git a/apps/dashboard/src/app/(internal)/user/mutations.ts b/apps/dashboard/src/app/(internal)/brukere/mutations.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/user/mutations.ts rename to apps/dashboard/src/app/(internal)/brukere/mutations.ts diff --git a/apps/dashboard/src/app/(internal)/user/page.tsx b/apps/dashboard/src/app/(internal)/brukere/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/page.tsx rename to apps/dashboard/src/app/(internal)/brukere/page.tsx diff --git a/apps/dashboard/src/app/(internal)/user/queries.ts b/apps/dashboard/src/app/(internal)/brukere/queries.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/user/queries.ts rename to apps/dashboard/src/app/(internal)/brukere/queries.ts diff --git a/apps/dashboard/src/app/(internal)/user/use-user-table.tsx b/apps/dashboard/src/app/(internal)/brukere/use-user-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/user/use-user-table.tsx rename to apps/dashboard/src/app/(internal)/brukere/use-user-table.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/[memberId]/edit-card.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/edit-card.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/[memberId]/edit-card.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/edit-card.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/[memberId]/group-membership-form.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/group-membership-form.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/[memberId]/group-membership-form.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/group-membership-form.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/[memberId]/layout.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/[memberId]/layout.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/[memberId]/page.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/[memberId]/page.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/page.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/[memberId]/provider.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/provider.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/[memberId]/provider.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/provider.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/[memberId]/use-group-membership-table.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/use-group-membership-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/[memberId]/use-group-membership-table.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/[memberId]/use-group-membership-table.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/edit-card.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/edit-card.tsx similarity index 98% rename from apps/dashboard/src/app/(internal)/group/[id]/edit-card.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/edit-card.tsx index 9e8b83592e..dbc5e5d1b5 100644 --- a/apps/dashboard/src/app/(internal)/group/[id]/edit-card.tsx +++ b/apps/dashboard/src/app/(internal)/grupper/[id]/edit-card.tsx @@ -5,7 +5,7 @@ import { useDebouncedValue } from "@mantine/hooks" import { IconCheck, IconLink, IconTrash, IconUsersGroup, IconX } from "@tabler/icons-react" import { useRouter } from "next/navigation" import { type FC, useEffect, useState } from "react" -import { useIsAdminQuery } from "../../user/queries" +import { useIsAdminQuery } from "@/app/(internal)/brukere/queries" import { useDeleteGroupMutation, useLinkGroupMutation, useUpdateGroupMutation } from "../mutations" import { useFindWorkspaceGroupQuery } from "../queries" import { useGroupWriteForm } from "../write-form" @@ -26,7 +26,7 @@ export const GroupEditCard: FC = () => { text: `Er du sikker på at du vil slette ${group.name}?`, onConfirm: () => { remove.mutate(group.slug) - router.push("/group/") + router.push("/grupper/") }, }) diff --git a/apps/dashboard/src/app/(internal)/group/[id]/group-event-page.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/group-event-page.tsx similarity index 74% rename from apps/dashboard/src/app/(internal)/group/[id]/group-event-page.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/group-event-page.tsx index 99dffdd16f..6e56641005 100644 --- a/apps/dashboard/src/app/(internal)/group/[id]/group-event-page.tsx +++ b/apps/dashboard/src/app/(internal)/grupper/[id]/group-event-page.tsx @@ -1,7 +1,7 @@ import { Skeleton } from "@mantine/core" import type { FC } from "react" -import { EventTable } from "../../event/components/events-table" -import { useEventAllInfiniteQuery } from "../../event/queries" +import { EventTable } from "@/app/(internal)/arrangementer/components/events-table" +import { useEventAllInfiniteQuery } from "@/app/(internal)/arrangementer/queries" import { useGroupDetailsContext } from "./provider" export const GroupEventPage: FC = () => { diff --git a/apps/dashboard/src/app/(internal)/group/[id]/layout.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/layout.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/members-page.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/members-page.tsx similarity index 99% rename from apps/dashboard/src/app/(internal)/group/[id]/members-page.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/members-page.tsx index cb28181cc1..9f95fc4650 100644 --- a/apps/dashboard/src/app/(internal)/group/[id]/members-page.tsx +++ b/apps/dashboard/src/app/(internal)/grupper/[id]/members-page.tsx @@ -1,4 +1,4 @@ -import { UserSearch } from "@/app/(internal)/user/components/user-search" +import { UserSearch } from "@/app/(internal)/brukere/components/user-search" import { type GroupId, type GroupMember, diff --git a/apps/dashboard/src/app/(internal)/group/[id]/page.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/page.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/page.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/provider.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/provider.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/provider.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/provider.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/roles-page.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/roles-page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/roles-page.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/roles-page.tsx diff --git a/apps/dashboard/src/app/(internal)/group/[id]/use-group-member-table.tsx b/apps/dashboard/src/app/(internal)/grupper/[id]/use-group-member-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/[id]/use-group-member-table.tsx rename to apps/dashboard/src/app/(internal)/grupper/[id]/use-group-member-table.tsx diff --git a/apps/dashboard/src/app/(internal)/group/all-groups-table.tsx b/apps/dashboard/src/app/(internal)/grupper/all-groups-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/all-groups-table.tsx rename to apps/dashboard/src/app/(internal)/grupper/all-groups-table.tsx diff --git a/apps/dashboard/src/app/(internal)/group/group-member-form.tsx b/apps/dashboard/src/app/(internal)/grupper/group-member-form.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/group-member-form.tsx rename to apps/dashboard/src/app/(internal)/grupper/group-member-form.tsx diff --git a/apps/dashboard/src/app/(internal)/group/group-role-form.tsx b/apps/dashboard/src/app/(internal)/grupper/group-role-form.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/group-role-form.tsx rename to apps/dashboard/src/app/(internal)/grupper/group-role-form.tsx diff --git a/apps/dashboard/src/app/(internal)/group/modals/create-group-member-modal.tsx b/apps/dashboard/src/app/(internal)/grupper/modals/create-group-member-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/modals/create-group-member-modal.tsx rename to apps/dashboard/src/app/(internal)/grupper/modals/create-group-member-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/group/modals/create-group-modal.tsx b/apps/dashboard/src/app/(internal)/grupper/modals/create-group-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/modals/create-group-modal.tsx rename to apps/dashboard/src/app/(internal)/grupper/modals/create-group-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/group/modals/create-group-role-modal.tsx b/apps/dashboard/src/app/(internal)/grupper/modals/create-group-role-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/modals/create-group-role-modal.tsx rename to apps/dashboard/src/app/(internal)/grupper/modals/create-group-role-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/group/modals/edit-group-membership-modal.tsx b/apps/dashboard/src/app/(internal)/grupper/modals/edit-group-membership-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/modals/edit-group-membership-modal.tsx rename to apps/dashboard/src/app/(internal)/grupper/modals/edit-group-membership-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/group/modals/edit-group-role-modal.tsx b/apps/dashboard/src/app/(internal)/grupper/modals/edit-group-role-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/modals/edit-group-role-modal.tsx rename to apps/dashboard/src/app/(internal)/grupper/modals/edit-group-role-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/group/mutations.ts b/apps/dashboard/src/app/(internal)/grupper/mutations.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/group/mutations.ts rename to apps/dashboard/src/app/(internal)/grupper/mutations.ts diff --git a/apps/dashboard/src/app/(internal)/group/page.tsx b/apps/dashboard/src/app/(internal)/grupper/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/group/page.tsx rename to apps/dashboard/src/app/(internal)/grupper/page.tsx diff --git a/apps/dashboard/src/app/(internal)/group/queries.ts b/apps/dashboard/src/app/(internal)/grupper/queries.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/group/queries.ts rename to apps/dashboard/src/app/(internal)/grupper/queries.ts diff --git a/apps/dashboard/src/app/(internal)/group/write-form.tsx b/apps/dashboard/src/app/(internal)/grupper/write-form.tsx similarity index 98% rename from apps/dashboard/src/app/(internal)/group/write-form.tsx rename to apps/dashboard/src/app/(internal)/grupper/write-form.tsx index e1884c7326..50f72b50df 100644 --- a/apps/dashboard/src/app/(internal)/group/write-form.tsx +++ b/apps/dashboard/src/app/(internal)/grupper/write-form.tsx @@ -1,4 +1,4 @@ -import { useGroupFileUploadMutation } from "@/app/(internal)/group/mutations" +import { useGroupFileUploadMutation } from "@/app/(internal)/grupper/mutations" import { createCheckboxInput } from "@/components/forms/CheckboxInput" import { useFormBuilder } from "@/components/forms/Form" import { createImageInput } from "@/components/forms/ImageInput" diff --git a/apps/dashboard/src/app/(internal)/job-listing/[id]/edit-card.tsx b/apps/dashboard/src/app/(internal)/karriere/[id]/edit-card.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/[id]/edit-card.tsx rename to apps/dashboard/src/app/(internal)/karriere/[id]/edit-card.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/[id]/layout.tsx b/apps/dashboard/src/app/(internal)/karriere/[id]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/[id]/layout.tsx rename to apps/dashboard/src/app/(internal)/karriere/[id]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/[id]/page.tsx b/apps/dashboard/src/app/(internal)/karriere/[id]/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/[id]/page.tsx rename to apps/dashboard/src/app/(internal)/karriere/[id]/page.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/[id]/provider.tsx b/apps/dashboard/src/app/(internal)/karriere/[id]/provider.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/[id]/provider.tsx rename to apps/dashboard/src/app/(internal)/karriere/[id]/provider.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/components/job-listing-filter.tsx b/apps/dashboard/src/app/(internal)/karriere/components/job-listing-filter.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/components/job-listing-filter.tsx rename to apps/dashboard/src/app/(internal)/karriere/components/job-listing-filter.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/modals/create-job-listing-modal.tsx b/apps/dashboard/src/app/(internal)/karriere/modals/create-job-listing-modal.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/modals/create-job-listing-modal.tsx rename to apps/dashboard/src/app/(internal)/karriere/modals/create-job-listing-modal.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/mutations/use-create-job-listing-mutation.ts b/apps/dashboard/src/app/(internal)/karriere/mutations/use-create-job-listing-mutation.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/mutations/use-create-job-listing-mutation.ts rename to apps/dashboard/src/app/(internal)/karriere/mutations/use-create-job-listing-mutation.ts diff --git a/apps/dashboard/src/app/(internal)/job-listing/mutations/use-edit-job-listing-mutation.ts b/apps/dashboard/src/app/(internal)/karriere/mutations/use-edit-job-listing-mutation.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/mutations/use-edit-job-listing-mutation.ts rename to apps/dashboard/src/app/(internal)/karriere/mutations/use-edit-job-listing-mutation.ts diff --git a/apps/dashboard/src/app/(internal)/job-listing/page.tsx b/apps/dashboard/src/app/(internal)/karriere/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/page.tsx rename to apps/dashboard/src/app/(internal)/karriere/page.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/queries/use-job-listing-all-query.ts b/apps/dashboard/src/app/(internal)/karriere/queries/use-job-listing-all-query.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/queries/use-job-listing-all-query.ts rename to apps/dashboard/src/app/(internal)/karriere/queries/use-job-listing-all-query.ts diff --git a/apps/dashboard/src/app/(internal)/job-listing/queries/use-job-listing-locations-all-query.ts b/apps/dashboard/src/app/(internal)/karriere/queries/use-job-listing-locations-all-query.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/queries/use-job-listing-locations-all-query.ts rename to apps/dashboard/src/app/(internal)/karriere/queries/use-job-listing-locations-all-query.ts diff --git a/apps/dashboard/src/app/(internal)/job-listing/use-job-listing-table.tsx b/apps/dashboard/src/app/(internal)/karriere/use-job-listing-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/use-job-listing-table.tsx rename to apps/dashboard/src/app/(internal)/karriere/use-job-listing-table.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/useJobListingWriteForm.tsx b/apps/dashboard/src/app/(internal)/karriere/useJobListingWriteForm.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/job-listing/useJobListingWriteForm.tsx rename to apps/dashboard/src/app/(internal)/karriere/useJobListingWriteForm.tsx diff --git a/apps/dashboard/src/app/(internal)/job-listing/write-form.tsx b/apps/dashboard/src/app/(internal)/karriere/write-form.tsx similarity index 98% rename from apps/dashboard/src/app/(internal)/job-listing/write-form.tsx rename to apps/dashboard/src/app/(internal)/karriere/write-form.tsx index 226ea9f3af..a97aec54a2 100644 --- a/apps/dashboard/src/app/(internal)/job-listing/write-form.tsx +++ b/apps/dashboard/src/app/(internal)/karriere/write-form.tsx @@ -15,7 +15,7 @@ import { import { getCurrentUTC } from "@dotkomonline/utils" import { addWeeks, roundToNearestHours } from "date-fns" import type { z } from "zod" -import { useCompanyAllQuery } from "../company/queries" +import { useCompanyAllQuery } from "@/app/(internal)/bedrifter/queries" import { useJobListingAllLocationsQuery } from "./queries/use-job-listing-locations-all-query" const nextHour = roundToNearestHours(getCurrentUTC(), { roundingMethod: "ceil" }) diff --git a/apps/dashboard/src/app/(internal)/layout.tsx b/apps/dashboard/src/app/(internal)/layout.tsx index edba8f6e72..172f372761 100644 --- a/apps/dashboard/src/app/(internal)/layout.tsx +++ b/apps/dashboard/src/app/(internal)/layout.tsx @@ -7,7 +7,7 @@ import type { PropsWithChildren } from "react" export default async function Layout({ children }: PropsWithChildren) { const session = await auth.getServerSession() if (session === null) { - return redirect("/auth/login") + return redirect("/login") } const isStaff = await server.user.isStaff.query() diff --git a/apps/dashboard/src/app/(internal)/audit-log/[id]/layout.tsx b/apps/dashboard/src/app/(internal)/logg/[id]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/audit-log/[id]/layout.tsx rename to apps/dashboard/src/app/(internal)/logg/[id]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/audit-log/[id]/page.tsx b/apps/dashboard/src/app/(internal)/logg/[id]/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/audit-log/[id]/page.tsx rename to apps/dashboard/src/app/(internal)/logg/[id]/page.tsx diff --git a/apps/dashboard/src/app/(internal)/audit-log/[id]/provider.tsx b/apps/dashboard/src/app/(internal)/logg/[id]/provider.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/audit-log/[id]/provider.tsx rename to apps/dashboard/src/app/(internal)/logg/[id]/provider.tsx diff --git a/apps/dashboard/src/app/(internal)/audit-log/components/audit-log-filters.tsx b/apps/dashboard/src/app/(internal)/logg/components/audit-log-filters.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/audit-log/components/audit-log-filters.tsx rename to apps/dashboard/src/app/(internal)/logg/components/audit-log-filters.tsx diff --git a/apps/dashboard/src/app/(internal)/audit-log/page.tsx b/apps/dashboard/src/app/(internal)/logg/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/audit-log/page.tsx rename to apps/dashboard/src/app/(internal)/logg/page.tsx diff --git a/apps/dashboard/src/app/(internal)/audit-log/queries.ts b/apps/dashboard/src/app/(internal)/logg/queries.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/audit-log/queries.ts rename to apps/dashboard/src/app/(internal)/logg/queries.ts diff --git a/apps/dashboard/src/app/(internal)/audit-log/use-audit-log-table.tsx b/apps/dashboard/src/app/(internal)/logg/use-audit-log-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/audit-log/use-audit-log-table.tsx rename to apps/dashboard/src/app/(internal)/logg/use-audit-log-table.tsx diff --git a/apps/dashboard/src/app/(internal)/punishment/[id]/layout.tsx b/apps/dashboard/src/app/(internal)/prikker/[id]/layout.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/[id]/layout.tsx rename to apps/dashboard/src/app/(internal)/prikker/[id]/layout.tsx diff --git a/apps/dashboard/src/app/(internal)/punishment/[id]/page.tsx b/apps/dashboard/src/app/(internal)/prikker/[id]/page.tsx similarity index 97% rename from apps/dashboard/src/app/(internal)/punishment/[id]/page.tsx rename to apps/dashboard/src/app/(internal)/prikker/[id]/page.tsx index 61dc8a4677..65dd9b3c46 100644 --- a/apps/dashboard/src/app/(internal)/punishment/[id]/page.tsx +++ b/apps/dashboard/src/app/(internal)/prikker/[id]/page.tsx @@ -1,5 +1,5 @@ "use client" -import { UserSearch } from "@/app/(internal)/user/components/user-search" +import { UserSearch } from "@/app/(internal)/brukere/components/user-search" import { GenericTable } from "@/components/GenericTable" import { useTRPC } from "@/lib/trpc-client" import type { PersonalMarkDetails, User } from "@dotkomonline/types" diff --git a/apps/dashboard/src/app/(internal)/punishment/[id]/provider.tsx b/apps/dashboard/src/app/(internal)/prikker/[id]/provider.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/[id]/provider.tsx rename to apps/dashboard/src/app/(internal)/prikker/[id]/provider.tsx diff --git a/apps/dashboard/src/app/(internal)/punishment/modals/create-mark-modal.tsx b/apps/dashboard/src/app/(internal)/prikker/modals/create-mark-modal.tsx similarity index 92% rename from apps/dashboard/src/app/(internal)/punishment/modals/create-mark-modal.tsx rename to apps/dashboard/src/app/(internal)/prikker/modals/create-mark-modal.tsx index ce33843cb0..7944d23635 100644 --- a/apps/dashboard/src/app/(internal)/punishment/modals/create-mark-modal.tsx +++ b/apps/dashboard/src/app/(internal)/prikker/modals/create-mark-modal.tsx @@ -1,6 +1,6 @@ "use client" -import { useMarkWriteForm } from "@/app/(internal)/punishment/write-form" +import { useMarkWriteForm } from "@/app/(internal)/prikker/write-form" import { type ContextModalProps, modals } from "@mantine/modals" import type { FC } from "react" import { useCreateMarkMutation } from "../mutations/use-create-mark-mutations" diff --git a/apps/dashboard/src/app/(internal)/punishment/modals/create-suspension-modal.tsx b/apps/dashboard/src/app/(internal)/prikker/modals/create-suspension-modal.tsx similarity index 92% rename from apps/dashboard/src/app/(internal)/punishment/modals/create-suspension-modal.tsx rename to apps/dashboard/src/app/(internal)/prikker/modals/create-suspension-modal.tsx index 3947a08dba..a43d78eb68 100644 --- a/apps/dashboard/src/app/(internal)/punishment/modals/create-suspension-modal.tsx +++ b/apps/dashboard/src/app/(internal)/prikker/modals/create-suspension-modal.tsx @@ -1,6 +1,6 @@ "use client" -import { useMarkWriteForm } from "@/app/(internal)/punishment/write-form" +import { useMarkWriteForm } from "@/app/(internal)/prikker/write-form" import { type ContextModalProps, modals } from "@mantine/modals" import type { FC } from "react" import { useCreateMarkMutation } from "../mutations/use-create-mark-mutations" diff --git a/apps/dashboard/src/app/(internal)/punishment/mutations/use-create-mark-mutations.ts b/apps/dashboard/src/app/(internal)/prikker/mutations/use-create-mark-mutations.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/mutations/use-create-mark-mutations.ts rename to apps/dashboard/src/app/(internal)/prikker/mutations/use-create-mark-mutations.ts diff --git a/apps/dashboard/src/app/(internal)/punishment/mutations/use-create-personal-mark-mutations.ts b/apps/dashboard/src/app/(internal)/prikker/mutations/use-create-personal-mark-mutations.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/mutations/use-create-personal-mark-mutations.ts rename to apps/dashboard/src/app/(internal)/prikker/mutations/use-create-personal-mark-mutations.ts diff --git a/apps/dashboard/src/app/(internal)/punishment/mutations/use-edit-mark-mutation.ts b/apps/dashboard/src/app/(internal)/prikker/mutations/use-edit-mark-mutation.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/mutations/use-edit-mark-mutation.ts rename to apps/dashboard/src/app/(internal)/prikker/mutations/use-edit-mark-mutation.ts diff --git a/apps/dashboard/src/app/(internal)/punishment/page.tsx b/apps/dashboard/src/app/(internal)/prikker/page.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/page.tsx rename to apps/dashboard/src/app/(internal)/prikker/page.tsx diff --git a/apps/dashboard/src/app/(internal)/punishment/punishment-table.tsx b/apps/dashboard/src/app/(internal)/prikker/punishment-table.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/punishment-table.tsx rename to apps/dashboard/src/app/(internal)/prikker/punishment-table.tsx diff --git a/apps/dashboard/src/app/(internal)/punishment/queries/use-count-users-with-mark-query.ts b/apps/dashboard/src/app/(internal)/prikker/queries/use-count-users-with-mark-query.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/queries/use-count-users-with-mark-query.ts rename to apps/dashboard/src/app/(internal)/prikker/queries/use-count-users-with-mark-query.ts diff --git a/apps/dashboard/src/app/(internal)/punishment/queries/use-mark-get-query.ts b/apps/dashboard/src/app/(internal)/prikker/queries/use-mark-get-query.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/queries/use-mark-get-query.ts rename to apps/dashboard/src/app/(internal)/prikker/queries/use-mark-get-query.ts diff --git a/apps/dashboard/src/app/(internal)/punishment/queries/use-personal-mark-get-by-mark-id.ts b/apps/dashboard/src/app/(internal)/prikker/queries/use-personal-mark-get-by-mark-id.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/queries/use-personal-mark-get-by-mark-id.ts rename to apps/dashboard/src/app/(internal)/prikker/queries/use-personal-mark-get-by-mark-id.ts diff --git a/apps/dashboard/src/app/(internal)/punishment/queries/use-punishment-all-query.ts b/apps/dashboard/src/app/(internal)/prikker/queries/use-punishment-all-query.ts similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/queries/use-punishment-all-query.ts rename to apps/dashboard/src/app/(internal)/prikker/queries/use-punishment-all-query.ts diff --git a/apps/dashboard/src/app/(internal)/punishment/write-form.tsx b/apps/dashboard/src/app/(internal)/prikker/write-form.tsx similarity index 100% rename from apps/dashboard/src/app/(internal)/punishment/write-form.tsx rename to apps/dashboard/src/app/(internal)/prikker/write-form.tsx diff --git a/apps/dashboard/src/app/ApplicationShell.tsx b/apps/dashboard/src/app/ApplicationShell.tsx index b78ab169e8..64d7947253 100644 --- a/apps/dashboard/src/app/ApplicationShell.tsx +++ b/apps/dashboard/src/app/ApplicationShell.tsx @@ -38,32 +38,32 @@ const navigations = [ { label: "Arrangementer", icon: IconWheelchair, - href: "/event", + href: "/arrangementer", }, { label: "Prikker & Suspensjoner", icon: IconExclamationMark, - href: "/punishment", + href: "/prikker", }, { label: "Bedrifter", icon: IconMoneybag, - href: "/company", + href: "/bedrifter", }, { label: "Utlysninger", icon: IconBriefcase, - href: "/job-listing", + href: "/karriere", }, { label: "Grupper", icon: IconCampfire, - href: "/group", + href: "/grupper", }, { label: "Artikler", icon: IconPhoto, - href: "/article", + href: "/artikler", }, { label: "Offline", @@ -73,7 +73,7 @@ const navigations = [ { label: "Brukere", icon: IconUsersGroup, - href: "/user", + href: "/brukere", }, { label: "Plakatbestilling", @@ -84,12 +84,12 @@ const navigations = [ { label: "Avmeldingsgrunner", icon: IconUserMinus, - href: "/deregister-reason", + href: "/avmeldingsgrunner", }, { label: "Hendelseslogg", icon: IconClipboardList, - href: "/audit-log", + href: "/logg", isAdmin: true, }, ] satisfies { diff --git a/apps/dashboard/src/app/ModalProvider.tsx b/apps/dashboard/src/app/ModalProvider.tsx index fb50f70cac..a87ce9c39e 100644 --- a/apps/dashboard/src/app/ModalProvider.tsx +++ b/apps/dashboard/src/app/ModalProvider.tsx @@ -1,29 +1,29 @@ "use client" -import { CreateArticleModal } from "@/app/(internal)/article/modals/create-article" -import { AttendanceRegisteredModal } from "@/app/(internal)/event/components/attendance-registered-modal" -import { CreateAttendanceSelectionsModal } from "@/app/(internal)/event/components/create-event-selections-modal" -import { CreatePoolModal } from "@/app/(internal)/event/components/create-pool-modal" -import { UpdateAttendanceSelectionsModal } from "@/app/(internal)/event/components/edit-event-selections-modal" -import { EditPoolModal } from "@/app/(internal)/event/components/edit-pool-modal" -import { AlreadyAttendedModal } from "@/app/(internal)/event/components/error-attendance-registered-modal" -import { ManualCreateUserAttendModal } from "@/app/(internal)/event/components/manual-create-user-attend-modal" -import { ManualDeleteUserAttendModal } from "@/app/(internal)/event/components/manual-delete-user-attend-modal" -import { CreateGroupModal } from "@/app/(internal)/group/modals/create-group-modal" -import { CreateGroupRoleModal } from "@/app/(internal)/group/modals/create-group-role-modal" -import { EditGroupMembershipModal } from "@/app/(internal)/group/modals/edit-group-membership-modal" -import { EditGroupRoleModal } from "@/app/(internal)/group/modals/edit-group-role-modal" -import { CreateJobListingModal } from "@/app/(internal)/job-listing/modals/create-job-listing-modal" +import { CreateArticleModal } from "@/app/(internal)/artikler/modals/create-article" +import { AttendanceRegisteredModal } from "@/app/(internal)/arrangementer/components/attendance-registered-modal" +import { CreateAttendanceSelectionsModal } from "@/app/(internal)/arrangementer/components/create-event-selections-modal" +import { CreatePoolModal } from "@/app/(internal)/arrangementer/components/create-pool-modal" +import { UpdateAttendanceSelectionsModal } from "@/app/(internal)/arrangementer/components/edit-event-selections-modal" +import { EditPoolModal } from "@/app/(internal)/arrangementer/components/edit-pool-modal" +import { AlreadyAttendedModal } from "@/app/(internal)/arrangementer/components/error-attendance-registered-modal" +import { ManualCreateUserAttendModal } from "@/app/(internal)/arrangementer/components/manual-create-user-attend-modal" +import { ManualDeleteUserAttendModal } from "@/app/(internal)/arrangementer/components/manual-delete-user-attend-modal" +import { CreateGroupModal } from "@/app/(internal)/grupper/modals/create-group-modal" +import { CreateGroupRoleModal } from "@/app/(internal)/grupper/modals/create-group-role-modal" +import { EditGroupMembershipModal } from "@/app/(internal)/grupper/modals/edit-group-membership-modal" +import { EditGroupRoleModal } from "@/app/(internal)/grupper/modals/edit-group-role-modal" +import { CreateJobListingModal } from "@/app/(internal)/karriere//modals/create-job-listing-modal" import { CreateOfflineModal } from "@/app/(internal)/offline/modals/create-offline-modal" -import { CreateMarkModal } from "@/app/(internal)/punishment/modals/create-mark-modal" -import { CreateSuspensionModal } from "@/app/(internal)/punishment/modals/create-suspension-modal" -import { CreateMembershipModal } from "@/app/(internal)/user/components/create-membership-modal" -import { EditMembershipModal } from "@/app/(internal)/user/components/edit-membership-modal" +import { CreateMarkModal } from "@/app/(internal)/prikker/modals/create-mark-modal" +import { CreateSuspensionModal } from "@/app/(internal)/prikker/modals/create-suspension-modal" +import { CreateMembershipModal } from "@/app/(internal)/brukere/components/create-membership-modal" +import { EditMembershipModal } from "@/app/(internal)/brukere/components/edit-membership-modal" import { UploadImageModal } from "@/components/ImageUploadModal" import { ModalsProvider } from "@mantine/modals" import type { FC, PropsWithChildren } from "react" -import { QRCodeScannedModal } from "./(internal)/event/components/qr-code-scanned-modal" -import { CreateGroupMemberModal } from "./(internal)/group/modals/create-group-member-modal" +import { QRCodeScannedModal } from "@/app/(internal)/arrangementer/components/qr-code-scanned-modal" +import { CreateGroupMemberModal } from "@/app/(internal)/grupper/modals/create-group-member-modal" const modals = { "event/attendance/attendee/create": ManualCreateUserAttendModal, diff --git a/apps/dashboard/src/components/forms/EventSelectInput.tsx b/apps/dashboard/src/components/forms/EventSelectInput.tsx index e15269c69b..b583997157 100644 --- a/apps/dashboard/src/components/forms/EventSelectInput.tsx +++ b/apps/dashboard/src/components/forms/EventSelectInput.tsx @@ -1,4 +1,4 @@ -import { useEventAllQuery, useEventWithAttendancesGetQuery } from "@/app/(internal)/event/queries" +import { useEventAllQuery, useEventWithAttendancesGetQuery } from "@/app/(internal)/arrangementer/queries" import type { EventId } from "@dotkomonline/types" import { ErrorMessage } from "@hookform/error-message" import { Select, type SelectProps } from "@mantine/core" diff --git a/apps/dashboard/tsconfig.json b/apps/dashboard/tsconfig.json index b1417b5a0a..d8ee666730 100644 --- a/apps/dashboard/tsconfig.json +++ b/apps/dashboard/tsconfig.json @@ -19,7 +19,9 @@ } ], "paths": { - "@/*": ["./src/*"] + "@/*": [ + "./src/*" + ] }, "strictNullChecks": true, "allowJs": true, diff --git a/apps/rpc/src/modules/event/attendance-router.ts b/apps/rpc/src/modules/event/attendance-router.ts index 37c960a6fd..9563db38b1 100644 --- a/apps/rpc/src/modules/event/attendance-router.ts +++ b/apps/rpc/src/modules/event/attendance-router.ts @@ -210,7 +210,7 @@ const onRegisterChangeProcedure = procedure .input(z.object({ attendanceId: AttendanceSchema.shape.id })) .use(withDatabaseTransaction()) .subscription(async function* ({ input, ctx, signal }) { - for await (const [data] of on(ctx.eventEmitter, "attendance:register-change", { signal })) { + for await (const [data] of on(ctx.eventEmitter, "attendance:registrer-change", { signal })) { const attendeeUpdateData = data as { attendee: Attendee; status: "registered" | "deregistered" } if (attendeeUpdateData.attendee.attendanceId !== input.attendanceId) { diff --git a/apps/rpc/src/modules/event/attendance.e2e-spec.ts b/apps/rpc/src/modules/event/attendance.e2e-spec.ts index 9d15248f00..3e63490ed5 100644 --- a/apps/rpc/src/modules/event/attendance.e2e-spec.ts +++ b/apps/rpc/src/modules/event/attendance.e2e-spec.ts @@ -176,7 +176,7 @@ describe("attendance integration tests", async () => { ).resolves.toBeDefined() }) - it("should fail to register if there is no applicable pool for a user", async () => { + it("should fail to registrer if there is no applicable pool for a user", async () => { const subject = randomUUID() auth0Client.users.get.mockResolvedValue(getMockAuth0UserResponse(subject)) @@ -288,7 +288,7 @@ describe("attendance integration tests", async () => { const user = await core.userService.createMembership(dbClient, userWithoutMembership.id, getMockMembership()) expect(findActiveMembership(user)).not.toBeNull() - // Attempt to register before the registration window opens + // Attempt to registrer before the registration window opens expect( await core.attendanceService.getRegistrationAvailability(dbClient, attendance.id, user.id, { immediateReservation: false, @@ -339,7 +339,7 @@ describe("attendance integration tests", async () => { invariant(result.success) await core.attendanceService.registerAttendee(dbClient, result) - // Attempt to register the same user again for the same attendance + // Attempt to registrer the same user again for the same attendance expect( await core.attendanceService.getRegistrationAvailability(dbClient, attendance.id, user.id, { immediateReservation: false, @@ -566,7 +566,7 @@ describe("attendance integration tests", async () => { const user = await core.userService.createMembership(dbClient, userWithoutMembership.id, getMockMembership()) expect(findActiveMembership(user)).not.toBeNull() - // If the user themselves attempt to register, it should fail because there is no applicable pool + // If the user themselves attempt to registrer, it should fail because there is no applicable pool expect( await core.attendanceService.getRegistrationAvailability(dbClient, attendance.id, user.id, { immediateReservation: false, @@ -733,7 +733,7 @@ describe("attendance integration tests", async () => { expect(betaAttendanceUpdated?.reserved).toBe(false) }) - it("should register the physical attendance of a user for an event", async () => { + it("should registrer the physical attendance of a user for an event", async () => { const subject = randomUUID() auth0Client.users.get.mockResolvedValue(getMockAuth0UserResponse(subject)) const event = await core.eventService.createEvent(dbClient, getMockEvent()) @@ -766,7 +766,7 @@ describe("attendance integration tests", async () => { ).resolves.toBeUndefined() }) - it("should fail if you attempt to register physical attendance for a non-registered user", async () => { + it("should fail if you attempt to registrer physical attendance for a non-registered user", async () => { await expect(core.attendanceService.registerAttendance(dbClient, randomUUID(), getCurrentUTC())).rejects.toThrow( NotFoundError ) diff --git a/apps/rpc/src/modules/user/user-service.ts b/apps/rpc/src/modules/user/user-service.ts index 2ad65ee896..6e87d40d7c 100644 --- a/apps/rpc/src/modules/user/user-service.ts +++ b/apps/rpc/src/modules/user/user-service.ts @@ -35,7 +35,7 @@ export interface UserService { /** * Find a user by their ID, or null if not found. * - * This function will attempt to register the user if, and only if: + * This function will attempt to registrer the user if, and only if: * 1. The user is not found in the local database * 2. The user exists in Auth0's user directory. * @@ -46,7 +46,7 @@ export interface UserService { /** * Get a user by their ID. * - * This function will attempt to register the user if, and only if: + * This function will attempt to registrer the user if, and only if: * 1. The user is not found in the local database * 2. The user exists in Auth0's user directory. * @@ -67,7 +67,7 @@ export interface UserService { * This function is only able to detect memberships if there is an active FEIDE access token available through a * federated FEIDE connection on the Auth0 user. * - * This function should only be called if you actually want to register an automatically discovered membership. + * This function should only be called if you actually want to registrer an automatically discovered membership. */ discoverMembership(handle: DBHandle, userId: UserId): Promise createMembership(handle: DBHandle, userId: UserId, membership: MembershipWrite): Promise @@ -215,7 +215,7 @@ export function getUserService( }, async register(handle, userId) { - // NOTE: The register function here has a few responsibilities because of our data strategy: + // NOTE: The registrer function here has a few responsibilities because of our data strategy: // // 1. The database is the source of truth, and is ALWAYS intended to be as such. // 2. Unfortunately, there was a period in time where Auth0 was the source of truth, most notably right after we diff --git a/infra/auth0/main.tf b/infra/auth0/main.tf index fe85c5e0ad..2973be25e9 100644 --- a/infra/auth0/main.tf +++ b/infra/auth0/main.tf @@ -546,7 +546,7 @@ resource "auth0_client" "monoweb_web" { allowed_clients = [] allowed_origins = [] app_type = "regular_web" - # you go here if you decline an auth grant, cannot be http + # you go here if you decline an (auth) grant, cannot be http initiate_login_uri = { "dev" = null "stg" = "https://staging.online.ntnu.no/api/auth/callback/auth0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef4aaf7aaa..b14968029d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5741,9 +5741,6 @@ packages: resolution: {integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==} engines: {node: '>=4'} - axios@1.10.0: - resolution: {integrity: sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==} - axios@1.13.2: resolution: {integrity: sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==} @@ -6737,10 +6734,6 @@ packages: resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==} engines: {node: '>=14'} - form-data@4.0.2: - resolution: {integrity: sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==} - engines: {node: '>= 6'} - form-data@4.0.4: resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==} engines: {node: '>= 6'} @@ -14568,14 +14561,6 @@ snapshots: axe-core@4.10.2: {} - axios@1.10.0: - dependencies: - follow-redirects: 1.15.9 - form-data: 4.0.2 - proxy-from-env: 1.1.0 - transitivePeerDependencies: - - debug - axios@1.13.2: dependencies: follow-redirects: 1.15.9 @@ -15593,13 +15578,6 @@ snapshots: cross-spawn: 7.0.6 signal-exit: 4.1.0 - form-data@4.0.2: - dependencies: - asynckit: 0.4.0 - combined-stream: 1.0.8 - es-set-tostringtag: 2.1.0 - mime-types: 2.1.35 - form-data@4.0.4: dependencies: asynckit: 0.4.0 @@ -15781,7 +15759,7 @@ snapshots: google-spreadsheet@4.1.5(google-auth-library@9.15.1): dependencies: - axios: 1.10.0 + axios: 1.13.2 lodash: 4.17.21 optionalDependencies: google-auth-library: 9.15.1