Merge branch 'main' of https://github.com/lashwi/TaskWeaver into tool…

…tips
lashwi · Dec 1, 2023 · 2a44702 · 2a44702
2 parents f8cc940 + bc0d676
commit 2a44702
Show file tree

Hide file tree

Showing 13 changed files with 756 additions and 781 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -12,9 +12,6 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@fluentui/react-icons": "^2.0.222",
-    "@mui/icons-material": "^5.14.16",
-    "@mui/joy": "^5.0.0-beta.14",
-    "@rsuite/icons": "^1.0.3",
     "next": "14.0.0",
     "react": "^18",
     "react-dom": "^18",

diff --git a/client/src/@types/index.d.ts b/client/src/@types/index.d.ts
@@ -1,7 +1,10 @@
 interface Board {
   id: number;
-  owner: User;
+  title: string;
+  owner?: User;
+  arrows: Arrow[];
   tasks: Task[];
+  users: User[];
 }
 interface Task {
   id: number;
@@ -14,11 +17,12 @@ interface Task {
   color: string;
   description?: string;
   status?: string;
-  priority?: number;
-  deadline?: Date;
+  priority?: string;
+  deadline?: string;
   assignees?: User[];
   arrowsOut?: Arrow[];
   arrowsIn?: Arrow[];
+  timeNeeded?: string;
 }
 interface Arrow {
   id: number;
@@ -27,7 +31,8 @@ interface Arrow {
   color: string;
 }
 interface User {
+  id: number;
   name: string;
-  email: string;
-  profilePicUrl: string;
+  email?: string;
+  profilePicUrl?: string;
 }
diff --git a/client/src/app/globals.css b/client/src/app/globals.css
@@ -19,6 +19,10 @@
 
 }
 
+.panel-surface-050 {
+  @apply bg-surface-050/50 border-2 border-surface-100 rounded-xl backdrop-blur-xl shadow-md;
+}
+
 .task-bubble {
   background-color: #86FAB9;
   padding: 10px;

diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 import { useState } from 'react';
 import Board from '@/components/Board';
-import Navbar from '@/components/Navbar';
 
 export default function Home() {
   // State to control whether the popup is visible
@@ -15,8 +14,6 @@ export default function Home() {
   return (
     <div className="absolute top-0 left-0 z-10 h-screen w-screen overflow-hidden bg-white">
       <Board />
-      <Navbar />
-
     </div>
   );
 }