diff --git a/app/components/data-table.tsx b/app/components/data-table.tsx index 95a9aa6..ccc92b8 100644 --- a/app/components/data-table.tsx +++ b/app/components/data-table.tsx @@ -109,7 +109,7 @@ export function DataTable({ ? null : flexRender( header.column.columnDef.header, - header.getContext(), + header.getContext() )} ); @@ -128,7 +128,7 @@ export function DataTable({ {flexRender( cell.column.columnDef.cell, - cell.getContext(), + cell.getContext() )} ))} diff --git a/app/mock/api/data-skoler.ts b/app/mock/api/data-skoler.ts new file mode 100644 index 0000000..6749663 --- /dev/null +++ b/app/mock/api/data-skoler.ts @@ -0,0 +1,123 @@ +type School = { + name: string, + contact: string, + phone: string, + email: string, + language: string +} + +export function getActiveSchools(): Array { + return [ + { + name: "Blussvoll", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Birrale", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@birrale.no", + language: "Internasjonal" + }, + { + name: "Charlottenlund", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Markaplassen", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Nidaros idrettsungdomsskole", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Rosenborg", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Ugla", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Trondheim idrettsungdomsskole", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Sunnland", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Lade", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Sjetne", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Hoeggen", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + } + ]; +} + +export function getInactiveSchools(): Array { + return ([ + { + name: "Åsheim", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Blussvoll", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + }, + { + name: "Flatåsen", + contact: "John Doe", + phone: "988 01 888", + email: "john.doe@ou.trondheim.kommune.no", + language: "Norsk" + } + + ]) +} diff --git a/app/routes/dashboard.skoler._index.tsx b/app/routes/dashboard.skoler._index.tsx index 7d59303..449231e 100644 --- a/app/routes/dashboard.skoler._index.tsx +++ b/app/routes/dashboard.skoler._index.tsx @@ -1,8 +1,95 @@ +import { DataTable } from "@/components/data-table"; +import { Checkbox } from "@/components/ui/checkbox"; +import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; +import { ColumnDef } from "@tanstack/react-table"; +import { getActiveSchools, getInactiveSchools } from "../mock/api/data-skoler"; + +export type School = { + name: string; + contact: string; + phone: string; + email: string; + language: string; +}; + +export const columns: Array> = [ + { + id: "select", + header: ({ table }) => ( + table.toggleAllPageRowsSelected(!!value)} + aria-label="Select all" + /> + ), + cell: ({ row }) => ( + row.toggleSelected(!!value)} + aria-label="Select row" + /> + ), + enableSorting: false, + enableHiding: false, + }, + { + accessorKey: "name", + header: "Skole", + }, + { + accessorKey: "contact", + header: "Kontaktperson", + }, + { + accessorKey: "phone", + header: "Telefon", + }, + { + accessorKey: "email", + header: "E-post", + }, + { + accessorKey: "language", + header: "Språk", + }, +]; + // biome-ignore lint/style/noDefaultExport: Route Modules require default export https://reactrouter.com/start/framework/route-module export default function Skoler() { + const activeSchools = getActiveSchools(); + const inactiveSchools = getInactiveSchools(); + return ( <> -

Skoler

+
+

Skoler

+ +
+ + Aktive skoler + Inaktive skoler + +
+ + +
+ +
+
+ + +
+ +
+
+
+
); } diff --git a/app/routes/dashboard.sokere._index.tsx b/app/routes/dashboard.sokere._index.tsx index 8689b45..95cbcfb 100644 --- a/app/routes/dashboard.sokere._index.tsx +++ b/app/routes/dashboard.sokere._index.tsx @@ -39,7 +39,7 @@ export const columns: Array> = [ }, { accessorKey: "name", - header: "Navn", + header: "Skole", }, { accessorKey: "tlf", diff --git a/app/routes/dashboard.tsx b/app/routes/dashboard.tsx index 74ff5b7..5e3fdd2 100644 --- a/app/routes/dashboard.tsx +++ b/app/routes/dashboard.tsx @@ -141,7 +141,7 @@ const mainLinks = [ }, { title: "Tidligere Assistenter", - url: href("/dashboard/tidligereassistenter"), + url: "/dashboard/tidligereassistenter", }, { title: "Intervjufordeling", @@ -398,7 +398,7 @@ function Breadcrumbs() { to={`/${fullPath}`} className={cn( isEnd ? "text-black" : "text-gray-500", - "hover:text-black", + "hover:text-black" )} prefetch="intent" > @@ -497,7 +497,7 @@ export default function Layout() { - +
@@ -505,7 +505,10 @@ export default function Layout() {
- + +
+ +
);