Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/** @type {import("eslint").Linter.Config} */
const config = {
parser: "@typescript-eslint/parser",
parserOptions: {
project: true,
},
ignorePatterns: [
".eslintrc.cjs",
".eslintrc.js",
"prettier.config.js",
"lib/db/types/**/*",
],
extends: ["next/core-web-vitals", "prettier", "plugin:storybook/recommended"],
settings: {
react: {
version: "detect",
},
},
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: "^_" },
],
"import/order": [
"error",
{
groups: [
["builtin", "external"],
["internal"],
["parent", "sibling", "index"],
],
pathGroups: [
{
pattern: "@/**",
group: "internal",
},
],
pathGroupsExcludedImportTypes: ["builtin", "external"],
"newlines-between": "always",
alphabetize: {
order: "asc",
caseInsensitive: true,
},
},
],
},
};

module.exports = config;
12 changes: 0 additions & 12 deletions .eslintrc.json

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Check Eslint

on:
pull_request:
branches: [master, main]

jobs:
check-eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: "yarn"
cache-dependency-path: "yarn.lock"
- run: yarn install --immutable --inline-builds

- run: yarn lint
1 change: 0 additions & 1 deletion app/(authenticated)/admin/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import ErrorPage from "@/components/ErrorPage";
import { hasPermission } from "@/lib/auth/server";
import { notFound } from "next/navigation";

export default async function AuthenticatedLayout({
children,
Expand Down
3 changes: 2 additions & 1 deletion app/(authenticated)/admin/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { PageInfo } from "@/components/PageInfo";
import { Button, Card, Stack } from "@mantine/core";
import Link from "next/link";

import { PageInfo } from "@/components/PageInfo";

export const dynamic = "force-dynamic";

export default function AdminPage() {
Expand Down
14 changes: 8 additions & 6 deletions app/(authenticated)/admin/positions/PositionCard.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { Card, Group, Stack, Menu, ActionIcon, Text } from "@mantine/core";
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 FormResponse } from "@/components/Form";

import { type deletePositionSchema } from "./schema";

export function PositionCard(props: {
position: Position;
Expand Down
26 changes: 14 additions & 12 deletions app/(authenticated)/admin/positions/PositionView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,33 @@ 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 { useDisclosure } from "@mantine/hooks";
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 {
CountControls,
PageControls,
PaginationProvider,
} from "@/components/Pagination";
import { useDisclosure } from "@mantine/hooks";
import { SearchBar } from "@/components/SearchBar";
import { CreatePositionForm, UpdatePositionForm } from "./form";
import { getSearchParamsString } from "@/lib/searchParams/util";
import { PositionCard } from "./PositionCard";
import { useValidSearchParams } from "@/lib/searchParams/validateHook";

import {
createPositionAction,
deletePositionAction,
fetchPositionsAction,
TFetchPositions,
type TFetchPositions,
updatePositionAction,
} from "./actions";
import { useQuery } from "@tanstack/react-query";
import { useValidSearchParams } from "@/lib/searchParams/validateHook";
import { CreatePositionForm, UpdatePositionForm } from "./form";
import { PositionCard } from "./PositionCard";
import { searchParamsSchema } from "./schema";

export function PositionView(props: { initialPositions: TFetchPositions }) {
const pathname = usePathname();
Expand Down Expand Up @@ -74,6 +75,7 @@ export function PositionView(props: { initialPositions: TFetchPositions }) {
) {
router.push(`${pathname}?${newSearchParamsString}`);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [searchParamsState]);

// States for modals
Expand Down
18 changes: 10 additions & 8 deletions app/(authenticated)/admin/positions/actions.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
"use server";

import { type Position } from "@prisma/client";

import { type FormResponse } from "@/components/Form";
import { zodErrorResponse } from "@/components/FormServerHelpers";
import {
createPositionSchema,
deletePositionSchema,
searchParamsSchema,
updatePositionSchema,
} from "./schema";
import {
createPosition,
deletePosition,
fetchPositions,
updatePosition,
} from "@/features/positions";
import { Position } from "@prisma/client";
import { FormResponse } from "@/components/Form";

import {
createPositionSchema,
deletePositionSchema,
searchParamsSchema,
updatePositionSchema,
} from "./schema";

export type TFetchPositions = {
positions: Position[];
Expand Down
12 changes: 7 additions & 5 deletions app/(authenticated)/admin/positions/form.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
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 { notifications } from "@mantine/notifications";
import { type Position } from "@prisma/client";
import { type z } from "zod";

import Form, { type FormResponse } from "@/components/Form";
import { TextAreaField, TextField } from "@/components/FormFields";

import { createPositionSchema, updatePositionSchema } from "./schema";

export function CreatePositionForm(props: {
action: (data: z.infer<typeof createPositionSchema>) => Promise<FormResponse>;
Expand Down
12 changes: 7 additions & 5 deletions app/(authenticated)/admin/positions/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { PositionView } from "./PositionView";
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 { fetchPositions } from "@/features/positions";
import { getSearchParamsString } from "@/lib/searchParams/util";
import { validateSearchParams } from "@/lib/searchParams/validate";

import { PositionView } from "./PositionView";
import { searchParamsSchema } from "./schema";

export const dynamic = "force-dynamic";

Expand Down
20 changes: 11 additions & 9 deletions app/(authenticated)/admin/roles/RoleCard.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import { 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 FormResponse } from "@/components/Form";
import { type RoleWithPermissions } from "@/features/people";

import { type deleteRoleSchema } from "./schema";

export function RoleCard(props: {
role: RoleWithPermissions;
Expand Down
26 changes: 14 additions & 12 deletions app/(authenticated)/admin/roles/RoleView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,33 @@ 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 { useDisclosure } from "@mantine/hooks";
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 {
CountControls,
PageControls,
PaginationProvider,
} from "@/components/Pagination";
import { useDisclosure } from "@mantine/hooks";
import { SearchBar } from "@/components/SearchBar";
import { type RoleWithPermissions } from "@/features/people";
import { getSearchParamsString } from "@/lib/searchParams/util";
import { RoleCard } from "./RoleCard";
import { CreateRoleForm, UpdateRoleForm } from "./form";
import { FaPlus } from "react-icons/fa";
import { RoleWithPermissions } from "@/features/people";
import { useValidSearchParams } from "@/lib/searchParams/validateHook";

import {
createRoleAction,
deleteRoleAction,
fetchRolesAction,
TFetchRoles,
type TFetchRoles,
updateRoleAction,
} from "./actions";
import { useQuery } from "@tanstack/react-query";
import { useValidSearchParams } from "@/lib/searchParams/validateHook";
import { CreateRoleForm, UpdateRoleForm } from "./form";
import { RoleCard } from "./RoleCard";
import { searchParamsSchema } from "./schema";

export function RoleView(props: { initialRoles: TFetchRoles }) {
const pathname = usePathname();
Expand Down Expand Up @@ -74,6 +75,7 @@ export function RoleView(props: { initialRoles: TFetchRoles }) {
) {
router.push(`${pathname}?${newSearchParamsString}`);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [searchParamsState]);

// States for modals
Expand Down
17 changes: 9 additions & 8 deletions app/(authenticated)/admin/roles/actions.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
"use server";

import { type FormResponse } from "@/components/Form";
import { zodErrorResponse } from "@/components/FormServerHelpers";
import {
createRole,
deleteRole,
type RoleWithPermissions,
updateRole,
} 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[];
Expand Down
14 changes: 8 additions & 6 deletions app/(authenticated)/admin/roles/form.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import Form, { FormResponse } from "@/components/Form";
import { createRoleSchema, updateRoleSchema } from "./schema";
import { z } from "zod";
import { Space } from "@mantine/core";
import { type z } from "zod";

import Form, { type FormResponse } from "@/components/Form";
import {
PermissionSelectField,
TextAreaField,
TextField,
} from "@/components/FormFields";
import { Permission } from "@/lib/auth/permissions";
import { Space } from "@mantine/core";
import { RoleWithPermissions } from "@/features/people";
import { type RoleWithPermissions } from "@/features/people";
import { type Permission } from "@/lib/auth/permissions";

import { createRoleSchema, updateRoleSchema } from "./schema";

export function CreateRoleForm(props: {
action: (data: z.infer<typeof createRoleSchema>) => Promise<FormResponse>;
Expand Down
Loading