Merge branch 'main' into davidgu/ListUnclaimedItemsQuery

Author: shaply

.github/workflows/main.yml

@@ -1,26 +1,25 @@
 # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
 
-name: Lint, Test, and Build
+name: Lint and Test
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
-  lint-test-build:
+  lint-test:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Use Node 22
-      uses: actions/setup-node@v4
-      with:
-        node-version: 22.x
-        cache: 'npm'
-    - run: npm install
-    - run: npm run lint
-    - run: npm test
-    - run: npm run build
+      - uses: actions/checkout@v4
+      - name: Use Node 22
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22.x
+          cache: "npm"
+      - run: npm install
+      - run: npm run lint
+      - run: npm test

babel.config.jest.js

@@ -1 +1,8 @@
-module.exports = {presets: ["next/babel", "@babel/preset-typescript", "@babel/preset-env"]}
+module.exports = {
+  presets: [
+    "next/babel",
+    "@babel/preset-typescript",
+    "@babel/preset-env",
+    "@babel/preset-react",
+  ],
+};

jest.config.js

@@ -7,10 +7,15 @@ module.exports = {
   },
   setupFilesAfterEnv: ["./src/test/dbMock.ts", "./src/test/authMock.ts"],
   transform: {
-    "^.+\\.(ts|tsx)?$": "ts-jest",
-    "^.+\\.(js|jsx)$": ["babel-jest", { "configFile": "./babel.config.jest.js" }],
+    "^.+\\.(ts|tsx)?$": [
+      "ts-jest",
+      {
+        tsconfig: {
+          jsx: "react-jsx",
+        },
+      },
+    ],
+    "^.+\\.(js|jsx)$": ["babel-jest", { configFile: "./babel.config.jest.js" }],
   },
-  transformIgnorePatterns: [
-    "node_modules/(?!@auth)/"
-  ]
-};
+  transformIgnorePatterns: ["node_modules/(?!@auth)/"],
+};

package-lock.json

@@ -14,6 +14,7 @@
     "db:view": "npx prisma studio"
   },
   "dependencies": {
+    "@phosphor-icons/react": "^2.1.7",
     "@prisma/client": "^6.2.1",
     "@react-email/render": "1.0.3",
     "@sendgrid/mail": "^8.1.4",
@@ -31,6 +32,7 @@
   "devDependencies": {
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.26.3",
     "@babel/preset-typescript": "^7.26.0",
     "@babel/runtime": "^7.26.0",
     "@jest/globals": "^29.7.0",

package.json

@@ -0,0 +1,12 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[email]` on the table `UserInvite` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `userType` to the `UserInvite` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "UserInvite" ADD COLUMN     "userType" "UserType" NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserInvite_email_key" ON "UserInvite"("email");

prisma/migrations/20250124231243_add_user_type_to_invite_and_make_email_unique/migration.sql

@@ -28,7 +28,8 @@ model User {
 model UserInvite {
   id         Int      @id @default(autoincrement())
   token      String   @unique
-  email      String
+  userType   UserType
+  email      String   @unique
   expiration DateTime
 }
 

prisma/schema.prisma

@@ -0,0 +1,5 @@
+"use client";
+
+import AccountManagementScreen from "@/screens/AccountManagementScreen";
+
+export default AccountManagementScreen;