Update dashboard pathnames to match web

apps/dashboard/next.config.mjs

@@ -9,7 +9,7 @@ const config = {
     return [
       {
         source: "/",
-        destination: "/event",
+        destination: "/arrangementer",
         permanent: false,
       },
     ]

apps/dashboard/src/app/(internal)/event/[id]/attendees-page.tsx → 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"

apps/dashboard/src/app/(internal)/event/[id]/edit-card.tsx → 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"

apps/dashboard/src/app/(internal)/event/[id]/page.tsx → apps/dashboard/src/app/(internal)/arrangementer/[id]/page.tsx

@@ -102,7 +102,7 @@ export default function EventWithAttendancesPage() {
         <Group>
           <Button
             variant="light"
-            onClick={() => router.push("/event")}
+            onClick={() => router.push("/arrangementer")}
             leftSection={<IconArrowLeft height={14} width={14} />}
           >
             Tilbake

apps/dashboard/src/app/(internal)/event/components/edit-form.tsx → apps/dashboard/src/app/(internal)/arrangementer/components/edit-form.tsx

@@ -1,4 +1,4 @@
-import { useEventFileUploadMutation } from "@/app/(internal)/event/mutations"
+import { useEventFileUploadMutation } from "@/app/(internal)/arrangementer/mutations"
 import { createCheckboxInput } from "@/components/forms/CheckboxInput"
 import { createDateTimeInput } from "@/components/forms/DateTimeInput"
 import { createEventSelectInput } from "@/components/forms/EventSelectInput"

apps/dashboard/src/app/(internal)/event/components/events-table.tsx → apps/dashboard/src/app/(internal)/arrangementer/components/events-table.tsx

@@ -20,7 +20,7 @@ export const EventTable = ({ events, onLoadMore }: Props) => {
         id: "title",
         header: () => "Arrangementnavn",
         cell: (info) => (
-          <Anchor component={Link} size="sm" href={`/event/${info.getValue().id}`}>
+          <Anchor component={Link} size="sm" href={`/arrangementer/${info.getValue().id}`}>
             {info.getValue().title}
           </Anchor>
         ),

apps/dashboard/src/app/(internal)/event/components/write-form.tsx → apps/dashboard/src/app/(internal)/arrangementer/components/write-form.tsx

@@ -1,5 +1,5 @@
-import { useEventFileUploadMutation } from "@/app/(internal)/event/mutations"
-import { useGroupAllQuery } from "@/app/(internal)/group/queries"
+import { useEventFileUploadMutation } from "@/app/(internal)/arrangementer/mutations"
+import { useGroupAllQuery } from "@/app/(internal)/grupper/queries"
 import { createCheckboxInput } from "@/components/forms/CheckboxInput"
 import { createDateTimeInput } from "@/components/forms/DateTimeInput"
 import { createEventSelectInput } from "@/components/forms/EventSelectInput"
@@ -18,8 +18,8 @@ import {
 } from "@dotkomonline/types"
 import { addHours, roundToNearestHours } from "date-fns"
 import { z } from "zod"
-import { useCompanyAllQuery } from "../../company/queries"
-import { validateEventWrite } from "../validation"
+import { useCompanyAllQuery } from "@/app/(internal)/bedrifter/queries"
+import { validateEventWrite } from "@/app/(internal)/arrangementer/validation"
 
 const EVENT_FORM_DATA_TYPE = Object.values(EventTypeSchema.Values).map((type) => ({
   value: type,

apps/dashboard/src/app/(internal)/event/page.tsx → apps/dashboard/src/app/(internal)/arrangementer/page.tsx

@@ -21,7 +21,7 @@ export default function EventPage() {
         <EventFilters onChange={setFilter} />
 
         <Group>
-          <Button component={Link} href="/event/register" leftSection={<IconPencil width={14} height={14} />}>
+          <Button component={Link} href="/arrangementer/registrer" leftSection={<IconPencil width={14} height={14} />}>
             Nytt arrangement
           </Button>
         </Group>

apps/dashboard/src/app/(internal)/article/write-form.tsx → 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"

apps/dashboard/src/app/(internal)/company/[slug]/company-event-page.tsx → 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"
 

apps/dashboard/src/app/(internal)/company/components/write-form.tsx → 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"

apps/dashboard/src/app/(internal)/company/page.tsx → apps/dashboard/src/app/(internal)/bedrifter/page.tsx

@@ -14,7 +14,7 @@ export default function CompanyPage() {
     <Skeleton visible={isCompaniesLoading}>
       <Stack>
         <Box>
-          <Button component={Link} href="/company/register">
+          <Button component={Link} href="/bedrifter/registrer">
             Ny bedrift
           </Button>
         </Box>

apps/dashboard/src/app/(internal)/user/[id]/edit-form.tsx → 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"

apps/dashboard/src/app/(internal)/user/[id]/user-event-page.tsx → 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 = () => {

apps/dashboard/src/app/(internal)/user/[id]/user-group-page.tsx → 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"
 

apps/dashboard/src/app/(internal)/user/[id]/user-punishment-page.tsx → 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 = () => {

apps/dashboard/src/app/(internal)/group/[id]/edit-card.tsx → 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/")
     },
   })
 

apps/dashboard/src/app/(internal)/group/[id]/group-event-page.tsx → 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 = () => {

apps/dashboard/src/app/(internal)/group/[id]/members-page.tsx → 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,

apps/dashboard/src/app/(internal)/group/write-form.tsx → 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"

apps/dashboard/src/app/(internal)/job-listing/write-form.tsx → 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" })

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()

apps/dashboard/src/app/(internal)/punishment/[id]/page.tsx → 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"

apps/dashboard/src/app/(internal)/punishment/modals/create-mark-modal.tsx → 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"

apps/dashboard/src/app/(internal)/punishment/modals/create-suspension-modal.tsx → 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"

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 {

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,

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"

apps/dashboard/tsconfig.json

@@ -1,11 +1,11 @@
 {
   "extends": "../../packages/config/tsconfig.json",
   "include": [
-    "next-env.d.ts",
-    "./**/*.ts",
-    "./**/*.tsx",
     "./**/*.cjs",
     "./**/*.mjs",
+    "./**/*.ts",
+    "./**/*.tsx",
+    "next-env.d.ts",
     ".next/types/**/*.ts"
   ],
   "exclude": [],
@@ -19,7 +19,9 @@
       }
     ],
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": [
+        "./src/*"
+      ]
     },
     "strictNullChecks": true,
     "allowJs": true,

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) {