Tidy time

.eslintrc.cjs

@@ -0,0 +1,30 @@
+/** @type {import("eslint").Linter.Config} */
+const config = {
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    project: true,
+  },
+  ignorePatterns: [".eslintrc.js", "lib/db/types/**/*"],
+  extends: ["next/core-web-vitals", "prettier", "plugin:storybook/recommended"],
+  plugins: [
+    "@typescript-eslint",
+    "eslint-plugin-unused-imports",
+    "eslint-plugin-react",
+  ],
+  rules: {
+    "@next/next/no-async-client-component": "error",
+    "@typescript-eslint/consistent-type-imports": [
+      "warn",
+      {
+        prefer: "type-imports",
+        fixStyle: "inline-type-imports",
+      },
+    ],
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
+    ],
+  },
+};
+
+module.exports = config;

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "plugins": ["prettier-plugin-organize-imports"]
+}

.storybook/preview.ts

@@ -1,6 +1,5 @@
-import type { Preview } from "@storybook/react";
-
 import { withThemeByClassName } from "@storybook/addon-styling";
+import type { Preview } from "@storybook/react";
 
 /* TODO: update import to your tailwind styles file. If you're using Angular, inject this through your angular.json config instead */
 import "../app/globals.css";

components/Breadcrumbs.tsx → app/(authenticated)/_components/Breadcrumbs.tsx

@@ -1,9 +1,9 @@
 "use client";
+
+import { Anchor, Breadcrumbs, Text } from "@mantine/core";
+import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useMemo } from "react";
-import Link from "next/link";
-import { Anchor, Breadcrumbs, Text } from "@mantine/core";
-import { LuHome } from "react-icons/lu";
 
 const breadcrumbSegments: { [K: string]: string } = {
   calendar: "Calendar",

components/Nav.tsx → app/(authenticated)/_components/Nav.tsx

@@ -1,12 +1,12 @@
 "use client";
+import YSTVBreadcrumbs from "@/app/(authenticated)/_components/Breadcrumbs";
+import Logo from "@/app/_assets/logo.png";
+import { UserMenu } from "@/components/UserMenu";
+import styles from "@/styles/Nav.module.css";
 import { AppShell, Group, rem } from "@mantine/core";
 import { useHeadroom } from "@mantine/hooks";
 import Image from "next/image";
 import Link from "next/link";
-import Logo from "@/app/_assets/logo.png";
-import { UserMenu } from "@/components/UserMenu";
-import styles from "@/styles/Nav.module.css";
-import YSTVBreadcrumbs from "@/components/Breadcrumbs";
 
 interface NavProps {
   children: React.ReactNode;

app/(authenticated)/admin/layout.tsx

@@ -1,6 +1,5 @@
-import ErrorPage from "@/components/ErrorPage";
+import ErrorPage from "@/components/helpers/ErrorPage";
 import { hasPermission } from "@/lib/auth/server";
-import { notFound } from "next/navigation";
 
 export default async function AuthenticatedLayout({
   children,

app/(authenticated)/admin/page.tsx

@@ -1,4 +1,4 @@
-import { PageInfo } from "@/components/PageInfo";
+import { PageInfo } from "@/components/helpers/PageInfo";
 import { Button, Card, Stack } from "@mantine/core";
 import Link from "next/link";
 

app/(authenticated)/admin/positions/PositionCard.tsx

@@ -1,12 +1,12 @@
-import { Card, Group, Stack, Menu, ActionIcon, Text } from "@mantine/core";
+import type { FormResponse } from "@/components/forms";
+import { ActionIcon, Card, Group, Menu, Stack, Text } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import { notifications } from "@mantine/notifications";
-import { Position } from "@prisma/client";
+import type { Position } from "@prisma/client";
 import { FaEdit } from "react-icons/fa";
-import { MdMoreHoriz, MdDeleteForever } from "react-icons/md";
-import { deletePositionSchema } from "./schema";
-import { z } from "zod";
-import { FormResponse } from "@/components/Form";
+import { MdDeleteForever, MdMoreHoriz } from "react-icons/md";
+import type { z } from "zod";
+import type { deletePositionSchema } from "./schema";
 
 export function PositionCard(props: {
   position: Position;

app/(authenticated)/admin/positions/PositionView.tsx

@@ -1,5 +1,13 @@
 "use client";
 
+import { SearchBar } from "@/components/SearchBar";
+import {
+  CountControls,
+  PageControls,
+  PaginationProvider,
+} from "@/components/navigation/Pagination";
+import { getSearchParamsString } from "@/lib/searchParams/util";
+import { useValidSearchParams } from "@/lib/searchParams/validate";
 import {
   Button,
   Center,
@@ -10,32 +18,23 @@ import {
   Stack,
   Text,
 } from "@mantine/core";
-import { Position } from "@prisma/client";
-import { usePathname, useSearchParams } from "next/navigation";
-import { searchParamsSchema } from "./schema";
-import { useRouter } from "next/navigation";
-import { FaPlus } from "react-icons/fa";
-import { z } from "zod";
-import { useEffect, useState } from "react";
-import {
-  CountControls,
-  PageControls,
-  PaginationProvider,
-} from "@/components/Pagination";
 import { useDisclosure } from "@mantine/hooks";
-import { SearchBar } from "@/components/SearchBar";
-import { CreatePositionForm, UpdatePositionForm } from "./form";
-import { useValidSearchParams } from "@/lib/searchParams/validate";
-import { getSearchParamsString } from "@/lib/searchParams/util";
+import type { Position } from "@prisma/client";
+import { useQuery } from "@tanstack/react-query";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useEffect, useState } from "react";
+import { FaPlus } from "react-icons/fa";
+import type { z } from "zod";
 import { PositionCard } from "./PositionCard";
 import {
   createPositionAction,
   deletePositionAction,
   fetchPositionsAction,
-  TFetchPositions,
   updatePositionAction,
+  type TFetchPositions,
 } from "./actions";
-import { useQuery } from "@tanstack/react-query";
+import { CreatePositionForm, UpdatePositionForm } from "./form";
+import { searchParamsSchema } from "./schema";
 
 export function PositionView(props: { initialPositions: TFetchPositions }) {
   const pathname = usePathname();
@@ -74,6 +73,7 @@ export function PositionView(props: { initialPositions: TFetchPositions }) {
     ) {
       router.push(`${pathname}?${newSearchParamsString}`);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchParamsState]);
 
   // States for modals

app/(authenticated)/admin/positions/actions.ts

@@ -1,20 +1,19 @@
 "use server";
 
-import { zodErrorResponse } from "@/components/FormServerHelpers";
-import {
-  createPositionSchema,
-  deletePositionSchema,
-  searchParamsSchema,
-  updatePositionSchema,
-} from "./schema";
+import { zodErrorResponse, type FormResponse } from "@/components/forms";
 import {
   createPosition,
   deletePosition,
   fetchPositions,
   updatePosition,
 } from "@/features/positions";
-import { Position } from "@prisma/client";
-import { FormResponse } from "@/components/Form";
+import type { Position } from "@prisma/client";
+import {
+  createPositionSchema,
+  deletePositionSchema,
+  searchParamsSchema,
+  updatePositionSchema,
+} from "./schema";
 
 export type TFetchPositions = {
   positions: Position[];

app/(authenticated)/admin/positions/form.tsx

@@ -1,9 +1,12 @@
-import Form, { FormResponse } from "@/components/Form";
-import { createPositionSchema, updatePositionSchema } from "./schema";
-import { z } from "zod";
-import { TextAreaField, TextField } from "@/components/FormFields";
-import { Position } from "@prisma/client";
+import Form, {
+  TextAreaField,
+  TextField,
+  type FormResponse,
+} from "@/components/forms";
 import { notifications } from "@mantine/notifications";
+import type { Position } from "@prisma/client";
+import type { z } from "zod";
+import { createPositionSchema, updatePositionSchema } from "./schema";
 
 export function CreatePositionForm(props: {
   action: (data: z.infer<typeof createPositionSchema>) => Promise<FormResponse>;

app/(authenticated)/admin/positions/layout.tsx

@@ -1,4 +1,4 @@
-import ErrorPage from "@/components/ErrorPage";
+import ErrorPage from "@/components/helpers/ErrorPage";
 import { hasPermission } from "@/lib/auth/server";
 
 export default async function AuthenticatedLayout({

app/(authenticated)/admin/positions/page.tsx

@@ -1,10 +1,10 @@
-import { PositionView } from "./PositionView";
+import { PageInfo } from "@/components/helpers/PageInfo";
 import { fetchPositions } from "@/features/positions";
-import { searchParamsSchema } from "./schema";
-import { redirect } from "next/navigation";
-import { validateSearchParams } from "@/lib/searchParams/validate";
 import { getSearchParamsString } from "@/lib/searchParams/util";
-import { PageInfo } from "@/components/PageInfo";
+import { validateSearchParams } from "@/lib/searchParams/validate";
+import { redirect } from "next/navigation";
+import { PositionView } from "./PositionView";
+import { searchParamsSchema } from "./schema";
 
 export const dynamic = "force-dynamic";
 

app/(authenticated)/admin/roles/RoleCard.tsx

@@ -1,20 +1,20 @@
-import { RoleWithPermissions } from "@/features/people";
+import type { FormResponse } from "@/components/forms";
+import type { RoleWithPermissions } from "@/features/people";
 import {
+  ActionIcon,
   Card,
-  Stack,
-  Highlight,
   Group,
-  ActionIcon,
-  Tooltip,
+  Highlight,
+  Stack,
   Text,
+  Tooltip,
 } from "@mantine/core";
-import { FaEdit } from "react-icons/fa";
-import { z } from "zod";
-import { deleteRoleSchema } from "./schema";
-import { FormResponse } from "@/components/Form";
 import { modals } from "@mantine/modals";
 import { notifications } from "@mantine/notifications";
+import { FaEdit } from "react-icons/fa";
 import { MdDeleteForever } from "react-icons/md";
+import type { z } from "zod";
+import type { deleteRoleSchema } from "./schema";
 
 export function RoleCard(props: {
   role: RoleWithPermissions;

app/(authenticated)/admin/roles/RoleView.tsx

@@ -1,5 +1,14 @@
 "use client";
 
+import { SearchBar } from "@/components/SearchBar";
+import {
+  CountControls,
+  PageControls,
+  PaginationProvider,
+} from "@/components/navigation/Pagination";
+import type { RoleWithPermissions } from "@/features/people";
+import { getSearchParamsString } from "@/lib/searchParams/util";
+import { useValidSearchParams } from "@/lib/searchParams/validate";
 import {
   Button,
   Center,
@@ -10,32 +19,22 @@ import {
   Stack,
   Text,
 } from "@mantine/core";
-import { usePathname, useSearchParams } from "next/navigation";
-import { searchParamsSchema } from "./schema";
-import { useRouter } from "next/navigation";
-import { z } from "zod";
-import { useEffect, useState } from "react";
-import {
-  CountControls,
-  PageControls,
-  PaginationProvider,
-} from "@/components/Pagination";
 import { useDisclosure } from "@mantine/hooks";
-import { SearchBar } from "@/components/SearchBar";
-import { useValidSearchParams } from "@/lib/searchParams/validate";
-import { getSearchParamsString } from "@/lib/searchParams/util";
-import { RoleCard } from "./RoleCard";
-import { CreateRoleForm, UpdateRoleForm } from "./form";
+import { useQuery } from "@tanstack/react-query";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useEffect, useState } from "react";
 import { FaPlus } from "react-icons/fa";
-import { RoleWithPermissions } from "@/features/people";
+import type { z } from "zod";
+import { RoleCard } from "./RoleCard";
 import {
   createRoleAction,
   deleteRoleAction,
   fetchRolesAction,
-  TFetchRoles,
   updateRoleAction,
+  type TFetchRoles,
 } from "./actions";
-import { useQuery } from "@tanstack/react-query";
+import { CreateRoleForm, UpdateRoleForm } from "./form";
+import { searchParamsSchema } from "./schema";
 
 export function RoleView(props: { initialRoles: TFetchRoles }) {
   const pathname = usePathname();
@@ -74,6 +73,7 @@ export function RoleView(props: { initialRoles: TFetchRoles }) {
     ) {
       router.push(`${pathname}?${newSearchParamsString}`);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchParamsState]);
 
   // States for modals

app/(authenticated)/admin/roles/actions.ts

@@ -1,20 +1,19 @@
 "use server";
 
-import { zodErrorResponse } from "@/components/FormServerHelpers";
+import { zodErrorResponse, type FormResponse } from "@/components/forms";
+import {
+  createRole,
+  deleteRole,
+  updateRole,
+  type RoleWithPermissions,
+} from "@/features/people";
+import { fetchRoles } from "@/features/roles";
 import {
   createRoleSchema,
   deleteRoleSchema,
   searchParamsSchema,
   updateRoleSchema,
 } from "./schema";
-import { fetchRoles } from "@/features/roles";
-import {
-  createRole,
-  deleteRole,
-  RoleWithPermissions,
-  updateRole,
-} from "@/features/people";
-import { FormResponse } from "@/components/Form";
 
 export type TFetchRoles = {
   roles: RoleWithPermissions[];

app/(authenticated)/admin/roles/form.tsx

@@ -1,14 +1,14 @@
-import Form, { FormResponse } from "@/components/Form";
-import { createRoleSchema, updateRoleSchema } from "./schema";
-import { z } from "zod";
-import {
+import Form, {
   PermissionSelectField,
   TextAreaField,
   TextField,
-} from "@/components/FormFields";
-import { Permission } from "@/lib/auth/permissions";
+  type FormResponse,
+} from "@/components/forms";
+import type { RoleWithPermissions } from "@/features/people";
+import type { Permission } from "@/lib/auth/permissions";
 import { Space } from "@mantine/core";
-import { RoleWithPermissions } from "@/features/people";
+import type { z } from "zod";
+import { createRoleSchema, updateRoleSchema } from "./schema";
 
 export function CreateRoleForm(props: {
   action: (data: z.infer<typeof createRoleSchema>) => Promise<FormResponse>;