Merge pull request #13 from SW-Palindrome/feature/detail-studies-1

스터디 상세 페이지의 Activities 구현
SW-Palindrome · Mar 11, 2024 · b984ef8 · b984ef8
2 parents a80a636 + 638ba2a
commit b984ef8
Show file tree

Hide file tree

Showing 13 changed files with 557 additions and 2 deletions.
diff --git a/public/data/data.json b/public/data/data.json
@@ -278,6 +278,43 @@
     "fine": 2000,
     "setting": "Private"
   },
+  "studyActivities": [
+    {
+      "student": "Hooing",
+      "title": null,
+      "date": "24.03.11 ~ 24.03.17",
+      "status": "Incompleted",
+      "url": null
+    },
+    {
+      "student": "Hooing",
+      "title": "React - 1주차 과제",
+      "date": "23.12.26 ~ 23.12.31",
+      "status": "Completed",
+      "url": "https://velog.io/@milkbottle0305"
+    },
+    {
+      "student": "Hooing",
+      "title": "딥러닝 - 1주차 과제",
+      "date": "23.12.26 ~ 23.12.31",
+      "status": "Completed",
+      "url": "https://velog.io/@milkbottle0305"
+    },
+    {
+      "student": "Milkyway",
+      "title": null,
+      "date": "23.12.26 ~ 23.12.31",
+      "status": "Incompleted",
+      "url": null
+    },
+    {
+      "student": "papa",
+      "title": null,
+      "date": "23.12.26 ~ 23.12.31",
+      "status": "Incompleted",
+      "url": null
+    }
+  ],
   "fineStatus": {
     "weekDuration": [
       "12.25 ~ 12.31",

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Studit</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/src/assets/intergrate.png b/src/assets/intergrate.png
diff --git a/src/assets/study-invite.png b/src/assets/study-invite.png
diff --git a/src/assets/study-mng.png b/src/assets/study-mng.png
diff --git a/src/assets/study-setting.png b/src/assets/study-setting.png
diff --git a/src/pages/Mystudies/DetailMystudy.js b/src/pages/Mystudies/DetailMystudy.js
@@ -1,5 +1,6 @@
 import styled from "styled-components";
 import Nav from "../../components/Nav";
+import DetailStudy from "./components/DetailStudy";
 
 const StyledDetailMystudy = styled.div`
   display: flex;
@@ -12,6 +13,7 @@ function DetailMystudy() {
   return (
     <StyledDetailMystudy>
       <Nav selectedMenu="mystudies" />
+      <DetailStudy />
     </StyledDetailMystudy>
   );
 }