Change files

Changed files to deal with conflicts that had arisen regarding the weeklyActivity section of Belinda's Closet dashboard.
SeattleColleges · Oct 15, 2024 · 1ffb29a · 1ffb29a
1 parent f7238c9
commit 1ffb29a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
@@ -3,7 +3,7 @@ import { Typography, Drawer, List, ListItem, ListItemText, IconButton } from "@m
 import { SetStateAction, useEffect, useState } from "react";
 import MenuIcon from '@mui/icons-material/Menu';
 import UnauthorizedPageMessage from "@/components/UnauthorizedPageMessage";
-import {WeeklyActivity} from "@/app/dashboard/weeklyActivity";
+import WeeklyActivity from "@/app/dashboard/weeklyActivity/page";
 
 const Dashboard = () => {
   const [drawerOpen, setDrawerOpen] = useState(false);

diff --git a/app/dashboard/weeklyActivity.tsx → app/dashboard/weeklyActivity/page.tsx b/app/dashboard/weeklyActivity.tsx → app/dashboard/weeklyActivity/page.tsx
@@ -176,4 +176,6 @@ export const WeeklyActivity = () =>  {
             </div>
         </>
     )
-}
+}
+
+export default WeeklyActivity;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "@types/react-dom": "18.2.6",
     "autoprefixer": "10.4.14",
     "bcrypt": "5.1.0",
-    "chart.js": "^4.4.3",
+    "chart.js": "^4.4.4",
     "eslint": "8.44.0",
     "eslint-config-next": "13.4.9",
     "mongoose": "^7.4.3",
-Original file line number
+Diff line change
@@ Expand Up / @@ -176,4 +176,6 @@ export const WeeklyActivity = () => { @@
                 </div>
             </>
         )
-    }
+    }
+    export default WeeklyActivity;