From 1ffb29afaf481730427cb9ae9301347d0fb2dd2e Mon Sep 17 00:00:00 2001
From: NW Miller <nwmiller.516@gmail.com>
Date: Mon, 14 Oct 2024 22:03:19 -0700
Subject: [PATCH] Change files

Changed files to deal with conflicts that had arisen regarding the weeklyActivity section of Belinda's Closet dashboard.
---
 app/dashboard/page.tsx                                 |  2 +-
 .../{weeklyActivity.tsx => weeklyActivity/page.tsx}    |  4 +++-
 package-lock.json                                      | 10 ++++++----
 package.json                                           |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
 rename app/dashboard/{weeklyActivity.tsx => weeklyActivity/page.tsx} (99%)

diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index 84b98b5..8245eae 100644
--- 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 b/app/dashboard/weeklyActivity/page.tsx
similarity index 99%
rename from app/dashboard/weeklyActivity.tsx
rename to app/dashboard/weeklyActivity/page.tsx
index eaef98f..8a17287 100644
--- a/app/dashboard/weeklyActivity.tsx
+++ b/app/dashboard/weeklyActivity/page.tsx
@@ -176,4 +176,6 @@ export const WeeklyActivity = () =>  {
             </div>
         </>
     )
-}
\ No newline at end of file
+}
+
+export default WeeklyActivity;
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 7c9e58e..8ed1d1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,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",
@@ -3246,9 +3246,10 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.3.tgz",
-      "integrity": "sha512-qK1gkGSRYcJzqrrzdR6a+I0vQ4/R+SoODXyAjscQ/4mzuNzySaMCd+hyVxitSY1+L2fjPD1Gbn+ibNqRmwQeLw==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.4.tgz",
+      "integrity": "sha512-emICKGBABnxhMjUjlYRR12PmOXhJ2eJjEHL2/dZlWjxRAZT1D8xplLFq5M0tMQK8ja+wBS/tuVEJB5C6r7VxJA==",
+      "license": "MIT",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -7837,6 +7838,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-5.2.0.tgz",
       "integrity": "sha512-98iN5aguJyVSxp5U3CblRLH67J8gkfyGNbiK3c+l1QI/G4irHMPQw44aEPmjVag+YKTyQ260NcF82GTQ3bdscA==",
+      "license": "MIT",
       "peerDependencies": {
         "chart.js": "^4.1.1",
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
diff --git a/package.json b/package.json
index 27acedb..e242c08 100644
--- 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",