From 3bf97694adef9c249b6111b03c3b229390c13465 Mon Sep 17 00:00:00 2001
From: Henry <henry_ball@hotmail.co.uk>
Date: Mon, 4 Mar 2024 08:11:50 +0000
Subject: [PATCH] feat: setup workspaces members

---
 .../components/BoardDropdown.tsx              |   0
 .../components/DeleteBoardConfirmation.tsx    |   0
 .../components/DeleteListConfirmation.tsx     |   0
 .../components/List.tsx                       |   0
 .../components/ListDropdown.tsx               |   0
 .../components/NewCardForm.tsx                |   0
 .../components/NewListForm.tsx                |   0
 .../boards/{[...id] => [...boardId]}/page.tsx |   2 +-
 src/app/boards/layout.tsx                     |   7 +-
 src/app/boards/page.tsx                       |   4 +-
 .../components/DeleteCardConfirmation.tsx     |   0
 .../components/Dropdown.tsx                   |   0
 .../components/LabelSelector.tsx              |   0
 .../components/ListSelector.tsx               |   0
 .../components/NewLabelForm.tsx               |   0
 src/app/cards/{[...id] => [cardId]}/page.tsx  |   4 +-
 src/app/cards/layout.tsx                      |   7 +-
 src/app/components/SideNavigation.tsx         |  19 +-
 src/app/members/layout.tsx                    |  10 +
 .../{workspaces/[slug] => }/members/page.tsx  |   0
 src/app/providers/workspace.tsx               |  81 ++
 src/app/workspaces/layout.tsx                 |   5 -
 src/server/api/routers/workspace.ts           |  17 +-
 src/server/auth.ts                            |   9 +-
 .../db/migrations/0010_jittery_zzzax.sql      |  16 +
 .../db/migrations/meta/0010_snapshot.json     | 992 ++++++++++++++++++
 src/server/db/migrations/meta/_journal.json   |   7 +
 src/server/db/schema.ts                       |  35 +-
 28 files changed, 1185 insertions(+), 30 deletions(-)
 rename src/app/boards/{[...id] => [...boardId]}/components/BoardDropdown.tsx (100%)
 rename src/app/boards/{[...id] => [...boardId]}/components/DeleteBoardConfirmation.tsx (100%)
 rename src/app/boards/{[...id] => [...boardId]}/components/DeleteListConfirmation.tsx (100%)
 rename src/app/boards/{[...id] => [...boardId]}/components/List.tsx (100%)
 rename src/app/boards/{[...id] => [...boardId]}/components/ListDropdown.tsx (100%)
 rename src/app/boards/{[...id] => [...boardId]}/components/NewCardForm.tsx (100%)
 rename src/app/boards/{[...id] => [...boardId]}/components/NewListForm.tsx (100%)
 rename src/app/boards/{[...id] => [...boardId]}/page.tsx (99%)
 rename src/app/cards/{[...id] => [cardId]}/components/DeleteCardConfirmation.tsx (100%)
 rename src/app/cards/{[...id] => [cardId]}/components/Dropdown.tsx (100%)
 rename src/app/cards/{[...id] => [cardId]}/components/LabelSelector.tsx (100%)
 rename src/app/cards/{[...id] => [cardId]}/components/ListSelector.tsx (100%)
 rename src/app/cards/{[...id] => [cardId]}/components/NewLabelForm.tsx (100%)
 rename src/app/cards/{[...id] => [cardId]}/page.tsx (98%)
 create mode 100644 src/app/members/layout.tsx
 rename src/app/{workspaces/[slug] => }/members/page.tsx (100%)
 create mode 100644 src/app/providers/workspace.tsx
 delete mode 100644 src/app/workspaces/layout.tsx
 create mode 100644 src/server/db/migrations/0010_jittery_zzzax.sql
 create mode 100644 src/server/db/migrations/meta/0010_snapshot.json

diff --git a/src/app/boards/[...id]/components/BoardDropdown.tsx b/src/app/boards/[...boardId]/components/BoardDropdown.tsx
similarity index 100%
rename from src/app/boards/[...id]/components/BoardDropdown.tsx
rename to src/app/boards/[...boardId]/components/BoardDropdown.tsx
diff --git a/src/app/boards/[...id]/components/DeleteBoardConfirmation.tsx b/src/app/boards/[...boardId]/components/DeleteBoardConfirmation.tsx
similarity index 100%
rename from src/app/boards/[...id]/components/DeleteBoardConfirmation.tsx
rename to src/app/boards/[...boardId]/components/DeleteBoardConfirmation.tsx
diff --git a/src/app/boards/[...id]/components/DeleteListConfirmation.tsx b/src/app/boards/[...boardId]/components/DeleteListConfirmation.tsx
similarity index 100%
rename from src/app/boards/[...id]/components/DeleteListConfirmation.tsx
rename to src/app/boards/[...boardId]/components/DeleteListConfirmation.tsx
diff --git a/src/app/boards/[...id]/components/List.tsx b/src/app/boards/[...boardId]/components/List.tsx
similarity index 100%
rename from src/app/boards/[...id]/components/List.tsx
rename to src/app/boards/[...boardId]/components/List.tsx
diff --git a/src/app/boards/[...id]/components/ListDropdown.tsx b/src/app/boards/[...boardId]/components/ListDropdown.tsx
similarity index 100%
rename from src/app/boards/[...id]/components/ListDropdown.tsx
rename to src/app/boards/[...boardId]/components/ListDropdown.tsx
diff --git a/src/app/boards/[...id]/components/NewCardForm.tsx b/src/app/boards/[...boardId]/components/NewCardForm.tsx
similarity index 100%
rename from src/app/boards/[...id]/components/NewCardForm.tsx
rename to src/app/boards/[...boardId]/components/NewCardForm.tsx
diff --git a/src/app/boards/[...id]/components/NewListForm.tsx b/src/app/boards/[...boardId]/components/NewListForm.tsx
similarity index 100%
rename from src/app/boards/[...id]/components/NewListForm.tsx
rename to src/app/boards/[...boardId]/components/NewListForm.tsx
diff --git a/src/app/boards/[...id]/page.tsx b/src/app/boards/[...boardId]/page.tsx
similarity index 99%
rename from src/app/boards/[...id]/page.tsx
rename to src/app/boards/[...boardId]/page.tsx
index d5f644c7..414f58c7 100644
--- a/src/app/boards/[...id]/page.tsx
+++ b/src/app/boards/[...boardId]/page.tsx
@@ -61,7 +61,7 @@ export default function BoardPage() {
   const [selectedPublicListId, setSelectedPublicListId] =
     useState<PublicListId>("");
 
-  const boardId = params?.id?.length ? params.id[0] : null;
+  const boardId = params?.boardId?.length ? params.boardId[0] : null;
 
   const updateBoard = api.board.update.useMutation();
 
diff --git a/src/app/boards/layout.tsx b/src/app/boards/layout.tsx
index 12318549..09288909 100644
--- a/src/app/boards/layout.tsx
+++ b/src/app/boards/layout.tsx
@@ -1,5 +1,10 @@
+import { WorkspaceProvider } from "~/app/providers/workspace";
 import Dashboard from "~/app/components/dashboard";
 
 export default function Layout(props: { children: React.ReactNode }) {
-  return <Dashboard>{props.children}</Dashboard>;
+  return (
+    <WorkspaceProvider>
+      <Dashboard>{props.children}</Dashboard>;
+    </WorkspaceProvider>
+  );
 }
diff --git a/src/app/boards/page.tsx b/src/app/boards/page.tsx
index 1db5bb42..5469e7d0 100644
--- a/src/app/boards/page.tsx
+++ b/src/app/boards/page.tsx
@@ -6,8 +6,8 @@ import { BoardsList } from "./components/BoardsList";
 import { useModal } from "~/app/providers/modal";
 import Modal from "~/app/components/modal";
 
-import { ImportBoardsForm } from "~/app/boards/components/ImportBoardsForm";
-import { NewBoardForm } from "~/app/boards/components/NewBoardForm";
+import { ImportBoardsForm } from "./components/ImportBoardsForm";
+import { NewBoardForm } from "./components/NewBoardForm";
 
 export default function BoardsPage() {
   const { openModal, modalContentType } = useModal();
diff --git a/src/app/cards/[...id]/components/DeleteCardConfirmation.tsx b/src/app/cards/[cardId]/components/DeleteCardConfirmation.tsx
similarity index 100%
rename from src/app/cards/[...id]/components/DeleteCardConfirmation.tsx
rename to src/app/cards/[cardId]/components/DeleteCardConfirmation.tsx
diff --git a/src/app/cards/[...id]/components/Dropdown.tsx b/src/app/cards/[cardId]/components/Dropdown.tsx
similarity index 100%
rename from src/app/cards/[...id]/components/Dropdown.tsx
rename to src/app/cards/[cardId]/components/Dropdown.tsx
diff --git a/src/app/cards/[...id]/components/LabelSelector.tsx b/src/app/cards/[cardId]/components/LabelSelector.tsx
similarity index 100%
rename from src/app/cards/[...id]/components/LabelSelector.tsx
rename to src/app/cards/[cardId]/components/LabelSelector.tsx
diff --git a/src/app/cards/[...id]/components/ListSelector.tsx b/src/app/cards/[cardId]/components/ListSelector.tsx
similarity index 100%
rename from src/app/cards/[...id]/components/ListSelector.tsx
rename to src/app/cards/[cardId]/components/ListSelector.tsx
diff --git a/src/app/cards/[...id]/components/NewLabelForm.tsx b/src/app/cards/[cardId]/components/NewLabelForm.tsx
similarity index 100%
rename from src/app/cards/[...id]/components/NewLabelForm.tsx
rename to src/app/cards/[cardId]/components/NewLabelForm.tsx
diff --git a/src/app/cards/[...id]/page.tsx b/src/app/cards/[cardId]/page.tsx
similarity index 98%
rename from src/app/cards/[...id]/page.tsx
rename to src/app/cards/[cardId]/page.tsx
index 04ab58ca..0897f257 100644
--- a/src/app/cards/[...id]/page.tsx
+++ b/src/app/cards/[cardId]/page.tsx
@@ -27,7 +27,9 @@ export default function CardPage() {
   const params = useParams();
   const { modalContentType } = useModal();
 
-  const cardId = params?.id?.length ? params.id[0] : null;
+  const cardId = Array.isArray(params?.cardId)
+    ? params.cardId[0]
+    : params?.cardId;
 
   const { data } = api.card.byId.useQuery({ id: cardId ?? "" });
 
diff --git a/src/app/cards/layout.tsx b/src/app/cards/layout.tsx
index 12318549..09288909 100644
--- a/src/app/cards/layout.tsx
+++ b/src/app/cards/layout.tsx
@@ -1,5 +1,10 @@
+import { WorkspaceProvider } from "~/app/providers/workspace";
 import Dashboard from "~/app/components/dashboard";
 
 export default function Layout(props: { children: React.ReactNode }) {
-  return <Dashboard>{props.children}</Dashboard>;
+  return (
+    <WorkspaceProvider>
+      <Dashboard>{props.children}</Dashboard>;
+    </WorkspaceProvider>
+  );
 }
diff --git a/src/app/components/SideNavigation.tsx b/src/app/components/SideNavigation.tsx
index 5c1df0dc..6863c20e 100644
--- a/src/app/components/SideNavigation.tsx
+++ b/src/app/components/SideNavigation.tsx
@@ -11,11 +11,7 @@ import settingsIcon from "~/app/assets/settings.json";
 import ReactiveButton from "~/app/components/ReactiveButton";
 import UserMenu from "~/app/components/UserMenu";
 
-const navigation = [
-  { name: "Boards", href: "/boards", icon: boardsIcon },
-  { name: "Members", href: "/members", icon: membersIcon },
-  { name: "Settings", href: "/settings", icon: settingsIcon },
-];
+import { useWorkspace } from "~/app/providers/workspace";
 
 interface SideNavigationProps {
   user: UserType;
@@ -28,10 +24,17 @@ interface UserType {
 
 export default function SideNavigation({ user }: SideNavigationProps) {
   const pathname = usePathname();
+  const { workspace } = useWorkspace();
 
-  const { data } = api.workspace.all.useQuery();
-
-  const workspace = data?.[0];
+  const navigation = [
+    { name: "Boards", href: "/boards", icon: boardsIcon },
+    {
+      name: "Members",
+      href: "/members",
+      icon: membersIcon,
+    },
+    { name: "Settings", href: "/settings", icon: settingsIcon },
+  ];
 
   return (
     <nav className="flex w-72 flex-col justify-between border-r border-dark-600 px-5 py-5">
diff --git a/src/app/members/layout.tsx b/src/app/members/layout.tsx
new file mode 100644
index 00000000..09288909
--- /dev/null
+++ b/src/app/members/layout.tsx
@@ -0,0 +1,10 @@
+import { WorkspaceProvider } from "~/app/providers/workspace";
+import Dashboard from "~/app/components/dashboard";
+
+export default function Layout(props: { children: React.ReactNode }) {
+  return (
+    <WorkspaceProvider>
+      <Dashboard>{props.children}</Dashboard>;
+    </WorkspaceProvider>
+  );
+}
diff --git a/src/app/workspaces/[slug]/members/page.tsx b/src/app/members/page.tsx
similarity index 100%
rename from src/app/workspaces/[slug]/members/page.tsx
rename to src/app/members/page.tsx
diff --git a/src/app/providers/workspace.tsx b/src/app/providers/workspace.tsx
new file mode 100644
index 00000000..db89c3fc
--- /dev/null
+++ b/src/app/providers/workspace.tsx
@@ -0,0 +1,81 @@
+"use client";
+
+import React, {
+  createContext,
+  useContext,
+  useEffect,
+  useState,
+  type ReactNode,
+} from "react";
+
+import { api } from "~/trpc/react";
+
+interface WorkspaceContextProps {
+  workspace: Workspace;
+  setWorkspace: React.Dispatch<React.SetStateAction<Workspace>>;
+}
+
+interface Workspace {
+  name: string;
+  publicId: string;
+}
+
+const initialBoardData: Workspace = {
+  name: "",
+  publicId: "",
+};
+
+const WorkspaceContext = createContext<WorkspaceContextProps | undefined>(
+  undefined,
+);
+
+export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
+  children,
+}) => {
+  const [workspace, setWorkspace] = useState<Workspace>(initialBoardData);
+
+  const { data } = api.workspace.all.useQuery();
+
+  useEffect(() => {
+    const storedWorkspaceId: string | null =
+      localStorage.getItem("workspacePublicId");
+
+    if (storedWorkspaceId !== null) {
+      const selectedWorkspace = data?.find(
+        ({ workspace }) => (workspace.publicId = storedWorkspaceId),
+      );
+
+      if (!selectedWorkspace) return;
+
+      setWorkspace({
+        publicId: selectedWorkspace.workspace.publicId,
+        name: selectedWorkspace.workspace.name,
+      });
+    } else {
+      const primaryWorkspace = data?.[0]?.workspace;
+
+      if (!primaryWorkspace) return;
+
+      localStorage.setItem("workspacePublicId", primaryWorkspace?.publicId);
+
+      setWorkspace({
+        publicId: primaryWorkspace?.publicId,
+        name: primaryWorkspace?.name,
+      });
+    }
+  }, [data]);
+
+  return (
+    <WorkspaceContext.Provider value={{ workspace, setWorkspace }}>
+      {children}
+    </WorkspaceContext.Provider>
+  );
+};
+
+export const useWorkspace = (): WorkspaceContextProps => {
+  const context = useContext(WorkspaceContext);
+  if (!context) {
+    throw new Error("useWorkspace must be used within a WorkspaceProvider");
+  }
+  return context;
+};
diff --git a/src/app/workspaces/layout.tsx b/src/app/workspaces/layout.tsx
deleted file mode 100644
index 12318549..00000000
--- a/src/app/workspaces/layout.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import Dashboard from "~/app/components/dashboard";
-
-export default function Layout(props: { children: React.ReactNode }) {
-  return <Dashboard>{props.children}</Dashboard>;
-}
diff --git a/src/server/api/routers/workspace.ts b/src/server/api/routers/workspace.ts
index 239d467c..c580565a 100644
--- a/src/server/api/routers/workspace.ts
+++ b/src/server/api/routers/workspace.ts
@@ -1,6 +1,6 @@
 import { and, eq, isNull } from "drizzle-orm";
 
-import { workspaces } from "~/server/db/schema";
+import { workspaceMembers } from "~/server/db/schema";
 
 import {
   createTRPCRouter,
@@ -13,12 +13,19 @@ export const workspaceRouter = createTRPCRouter({
 
     if (!userId) return;
 
-    return ctx.db.query.workspaces.findMany({
-      where: and(eq(workspaces.createdBy, userId), isNull(workspaces.deletedAt)),
+    return ctx.db.query.workspaceMembers.findMany({
+      where: and(eq(workspaceMembers.userId, userId), isNull(workspaceMembers.deletedAt)),
       columns: {
-        publicId: true,
-        name: true,
+        role: true,
       },
+      with: {
+        workspace: {
+          columns: {
+            publicId: true,
+            name: true
+          }
+        }
+      }
     });
   }),
 });
\ No newline at end of file
diff --git a/src/server/auth.ts b/src/server/auth.ts
index 454edbbd..80a8ba2e 100644
--- a/src/server/auth.ts
+++ b/src/server/auth.ts
@@ -63,7 +63,7 @@ export const {
       options: {},
       async sendVerificationRequest({ identifier: email, url }) {
         const magicLinkEmail = MagicLinkEmail({ loginUrl: url });
-        await fetch(process.env.EMAIL_URL ?? '', {
+        const response = await fetch(process.env.EMAIL_URL ?? '', {
           method: "POST",
           headers: {
             'Content-Type': 'application/json',
@@ -77,10 +77,9 @@ export const {
           }),
         })
 
-        // if (!response.ok) {
-        //   const { errors } = await response.json()
-        //   throw new Error(JSON.stringify(errors))
-        // }
+        if (response.status !== 200) {
+          throw new Error('Error sending magic login')
+        }
       },
     }
   ],
diff --git a/src/server/db/migrations/0010_jittery_zzzax.sql b/src/server/db/migrations/0010_jittery_zzzax.sql
new file mode 100644
index 00000000..10befc6a
--- /dev/null
+++ b/src/server/db/migrations/0010_jittery_zzzax.sql
@@ -0,0 +1,16 @@
+CREATE TABLE `workspace_members` (
+	`id` bigint AUTO_INCREMENT NOT NULL,
+	`publicId` varchar(12) NOT NULL,
+	`userId` varchar(256) NOT NULL,
+	`workspaceId` bigint NOT NULL,
+	`createdBy` varchar(256) NOT NULL,
+	`createdAt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	`updatedAt` timestamp ON UPDATE CURRENT_TIMESTAMP,
+	`deletedAt` timestamp,
+	`role` enum('admin','member','guest') NOT NULL,
+	CONSTRAINT `workspace_members_id` PRIMARY KEY(`id`),
+	CONSTRAINT `workspace_members_publicId_unique` UNIQUE(`publicId`)
+);
+--> statement-breakpoint
+-- ALTER TABLE `workspace_members` ADD CONSTRAINT `workspace_members_userId_user_id_fk` FOREIGN KEY (`userId`) REFERENCES `user`(`id`) ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+-- ALTER TABLE `workspace_members` ADD CONSTRAINT `workspace_members_workspaceId_workspace_id_fk` FOREIGN KEY (`workspaceId`) REFERENCES `workspace`(`id`) ON DELETE no action ON UPDATE no action;
\ No newline at end of file
diff --git a/src/server/db/migrations/meta/0010_snapshot.json b/src/server/db/migrations/meta/0010_snapshot.json
new file mode 100644
index 00000000..05e2c905
--- /dev/null
+++ b/src/server/db/migrations/meta/0010_snapshot.json
@@ -0,0 +1,992 @@
+{
+  "version": "5",
+  "dialect": "mysql",
+  "id": "bb0a54cb-844f-4bf2-9cc8-0600d09cccdc",
+  "prevId": "29b7ae44-dce5-4353-ba56-ff398fa3e542",
+  "tables": {
+    "account": {
+      "name": "account",
+      "columns": {
+        "userId": {
+          "name": "userId",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "providerAccountId": {
+          "name": "providerAccountId",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "token_type": {
+          "name": "token_type",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "session_state": {
+          "name": "session_state",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "userId_idx": {
+          "name": "userId_idx",
+          "columns": [
+            "userId"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "account_provider_providerAccountId": {
+          "name": "account_provider_providerAccountId",
+          "columns": [
+            "provider",
+            "providerAccountId"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "board": {
+      "name": "board",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "publicId": {
+          "name": "publicId",
+          "type": "varchar(12)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdBy": {
+          "name": "createdBy",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "onUpdate": true
+        },
+        "deletedAt": {
+          "name": "deletedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deletedBy": {
+          "name": "deletedBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "importId": {
+          "name": "importId",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workspaceId": {
+          "name": "workspaceId",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "board_id": {
+          "name": "board_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {
+        "board_publicId_unique": {
+          "name": "board_publicId_unique",
+          "columns": [
+            "publicId"
+          ]
+        }
+      }
+    },
+    "card": {
+      "name": "card",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "publicId": {
+          "name": "publicId",
+          "type": "varchar(12)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdBy": {
+          "name": "createdBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "onUpdate": true
+        },
+        "listId": {
+          "name": "listId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "index": {
+          "name": "index",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "deletedAt": {
+          "name": "deletedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deletedBy": {
+          "name": "deletedBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "importId": {
+          "name": "importId",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "card_id": {
+          "name": "card_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {
+        "card_publicId_unique": {
+          "name": "card_publicId_unique",
+          "columns": [
+            "publicId"
+          ]
+        }
+      }
+    },
+    "card_label": {
+      "name": "card_label",
+      "columns": {
+        "cardId": {
+          "name": "cardId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "labelId": {
+          "name": "labelId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "card_label_cardId_card_id_fk": {
+          "name": "card_label_cardId_card_id_fk",
+          "tableFrom": "card_label",
+          "tableTo": "card",
+          "columnsFrom": [
+            "cardId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "card_label_labelId_label_id_fk": {
+          "name": "card_label_labelId_label_id_fk",
+          "tableFrom": "card_label",
+          "tableTo": "label",
+          "columnsFrom": [
+            "labelId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "card_label_cardId_labelId": {
+          "name": "card_label_cardId_labelId",
+          "columns": [
+            "cardId",
+            "labelId"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "import": {
+      "name": "import",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "publicId": {
+          "name": "publicId",
+          "type": "varchar(12)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source": {
+          "name": "source",
+          "type": "enum('trello')",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdBy": {
+          "name": "createdBy",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "status": {
+          "name": "status",
+          "type": "enum('started','success','failed')",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "import_id": {
+          "name": "import_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {
+        "import_publicId_unique": {
+          "name": "import_publicId_unique",
+          "columns": [
+            "publicId"
+          ]
+        }
+      }
+    },
+    "label": {
+      "name": "label",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "publicId": {
+          "name": "publicId",
+          "type": "varchar(12)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "colourCode": {
+          "name": "colourCode",
+          "type": "varchar(12)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdBy": {
+          "name": "createdBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "onUpdate": true
+        },
+        "boardId": {
+          "name": "boardId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "importId": {
+          "name": "importId",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "label_id": {
+          "name": "label_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {
+        "label_publicId_unique": {
+          "name": "label_publicId_unique",
+          "columns": [
+            "publicId"
+          ]
+        }
+      }
+    },
+    "list": {
+      "name": "list",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "publicId": {
+          "name": "publicId",
+          "type": "varchar(12)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdBy": {
+          "name": "createdBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "onUpdate": true
+        },
+        "boardId": {
+          "name": "boardId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "index": {
+          "name": "index",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "deletedAt": {
+          "name": "deletedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deletedBy": {
+          "name": "deletedBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "importId": {
+          "name": "importId",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "list_id": {
+          "name": "list_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {
+        "list_publicId_unique": {
+          "name": "list_publicId_unique",
+          "columns": [
+            "publicId"
+          ]
+        }
+      }
+    },
+    "session": {
+      "name": "session",
+      "columns": {
+        "sessionToken": {
+          "name": "sessionToken",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "userId": {
+          "name": "userId",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "userId_idx": {
+          "name": "userId_idx",
+          "columns": [
+            "userId"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "session_sessionToken": {
+          "name": "session_sessionToken",
+          "columns": [
+            "sessionToken"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3)"
+        },
+        "image": {
+          "name": "image",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "user_id": {
+          "name": "user_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "columns": [
+            "email"
+          ]
+        }
+      }
+    },
+    "verificationToken": {
+      "name": "verificationToken",
+      "columns": {
+        "identifier": {
+          "name": "identifier",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "verificationToken_identifier_token": {
+          "name": "verificationToken_identifier_token",
+          "columns": [
+            "identifier",
+            "token"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "workspace_members": {
+      "name": "workspace_members",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "publicId": {
+          "name": "publicId",
+          "type": "varchar(12)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "userId": {
+          "name": "userId",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspaceId": {
+          "name": "workspaceId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdBy": {
+          "name": "createdBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "onUpdate": true
+        },
+        "deletedAt": {
+          "name": "deletedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "enum('admin','member','guest')",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workspace_members_userId_user_id_fk": {
+          "name": "workspace_members_userId_user_id_fk",
+          "tableFrom": "workspace_members",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "workspace_members_workspaceId_workspace_id_fk": {
+          "name": "workspace_members_workspaceId_workspace_id_fk",
+          "tableFrom": "workspace_members",
+          "tableTo": "workspace",
+          "columnsFrom": [
+            "workspaceId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "workspace_members_id": {
+          "name": "workspace_members_id",
+          "columns": [
+            "id"
+          ]
+        },
+        "workspace_members_userId_workspaceId": {
+          "name": "workspace_members_userId_workspaceId",
+          "columns": [
+            "userId",
+            "workspaceId"
+          ]
+        }
+      },
+      "uniqueConstraints": {
+        "workspace_members_publicId_unique": {
+          "name": "workspace_members_publicId_unique",
+          "columns": [
+            "publicId"
+          ]
+        }
+      }
+    },
+    "workspace": {
+      "name": "workspace",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "publicId": {
+          "name": "publicId",
+          "type": "varchar(12)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdBy": {
+          "name": "createdBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "onUpdate": true
+        },
+        "deletedAt": {
+          "name": "deletedAt",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deletedBy": {
+          "name": "deletedBy",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "workspace_id": {
+          "name": "workspace_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {
+        "workspace_publicId_unique": {
+          "name": "workspace_publicId_unique",
+          "columns": [
+            "publicId"
+          ]
+        },
+        "workspace_slug_unique": {
+          "name": "workspace_slug_unique",
+          "columns": [
+            "slug"
+          ]
+        }
+      }
+    }
+  },
+  "schemas": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}
\ No newline at end of file
diff --git a/src/server/db/migrations/meta/_journal.json b/src/server/db/migrations/meta/_journal.json
index 7f0dce12..37aa5652 100644
--- a/src/server/db/migrations/meta/_journal.json
+++ b/src/server/db/migrations/meta/_journal.json
@@ -71,6 +71,13 @@
       "when": 1709314236852,
       "tag": "0009_massive_peter_parker",
       "breakpoints": true
+    },
+    {
+      "idx": 10,
+      "version": "5",
+      "when": 1709465628179,
+      "tag": "0010_jittery_zzzax",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/server/db/schema.ts b/src/server/db/schema.ts
index 461ea50b..87b759a0 100644
--- a/src/server/db/schema.ts
+++ b/src/server/db/schema.ts
@@ -128,7 +128,7 @@ export const cardsToLabels = mySqlTable(
   }),
 );
 
-export const cardOnLabelsRelations = relations(cardsToLabels, ({ one }) => ({
+export const cardToLabelsRelations = relations(cardsToLabels, ({ one }) => ({
 	card: one(cards, {
 		fields: [cardsToLabels.cardId],
 		references: [cards.id],
@@ -315,3 +315,36 @@ export const workspaces = mySqlTable(
 export const workspaceRelations = relations(workspaces, ({ one }) => ({
   user: one(users, { fields: [workspaces.createdBy], references: [users.id] }),
 }));
+
+export const workspaceMembers = mySqlTable(
+  "workspace_members",
+  {
+    id: bigint("id", { mode: "number" }).primaryKey().autoincrement(),
+    publicId: varchar("publicId", { length: 12 }).notNull().unique(),
+    userId: varchar("userId", { length: 256 }).notNull().references(() => users.id),
+    workspaceId: bigint("workspaceId", { mode: "number" }).notNull().references(() => workspaces.id),
+    createdBy: varchar("createdBy", { length: 256 }).notNull(),
+    createdAt: timestamp("createdAt")
+      .default(sql`CURRENT_TIMESTAMP`)
+      .notNull(),
+    updatedAt: timestamp("updatedAt").onUpdateNow(),
+    deletedAt: timestamp("deletedAt"),
+    role: mysqlEnum('role', ['admin', 'member', 'guest']).notNull(),
+  }, (t) => ({
+    pk: primaryKey(t.userId, t.workspaceId),
+  }),
+);
+
+export const usersToWorkspacesRelations = relations(workspaceMembers, ({ one }) => ({
+  addedBy: one(users, { fields: [workspaceMembers.createdBy], references: [users.id] }),
+	user: one(users, {
+		fields: [workspaceMembers.userId],
+		references: [users.id],
+	}),
+  workspace: one(workspaces, {
+		fields: [workspaceMembers.workspaceId],
+		references: [workspaces.id],
+	}),
+}));
+
+