Merge remote-tracking branch 'upstream/develop' into web_develop

IT-Cotato · Aug 8, 2024 · d15e565 · d15e565
2 parents 71b7736 + bdaf893
commit d15e565
Show file tree

Hide file tree

Showing 21 changed files with 355 additions and 3,699 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "@testing-library/user-event": "^13.5.0",
     "axios": "^1.7.2",
     "jwt-decode": "^4.0.0",
+    "date-fns": "^3.6.0",
     "react": "^18.3.1",
     "react-calendar": "^5.0.0",
     "react-dom": "^18.3.1",

diff --git a/src/components/MainLayout.jsx b/src/components/MainLayout.jsx
@@ -22,6 +22,7 @@ function MainLayout({ children }) {
   return (
     <LayoutContainer>
       <Content>{children}</Content>
+
       <MainNavigationBar />
     </LayoutContainer>
   );

diff --git a/src/pages/group/BasicInfo.jsx b/src/pages/group/BasicInfo.jsx
diff --git a/src/pages/group/Rank.jsx b/src/pages/group/Rank.jsx
diff --git a/src/pages/group/Schedule.jsx b/src/pages/group/Schedule.jsx