bugfix, docs : minor bugfix(#75), modified readme(#73)

2ood · Mar 28, 2023 · 1c2b882 · 1c2b882
1 parent 41a70e4
commit 1c2b882
Show file tree

Hide file tree

Showing 102 changed files with 23 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -42,13 +42,17 @@ Friend mentor is a lecture provider platform where lectures recorded by students
 
 [4. Project Architecture](#4)
 
-&nbsp;&nbsp;&nbsp;&nbsp;[4.1) Flowchart](#4-1)
+&nbsp;&nbsp;&nbsp;&nbsp;[4.1) Project structure](#4-1)
 
 &nbsp;&nbsp;&nbsp;&nbsp;[4.2) Techs Used](#4-2)
 
+&nbsp;&nbsp;&nbsp;&nbsp;[4.3) Dependencies](#4-3)
+
 
 [5. Contributors](#5)
 
+
+
 <a name="1"></a>
 # 1. Backgrounds
 
@@ -138,6 +142,9 @@ npm build
 <a name="4-2"></a>
 ## 4.2) Techs Used
 
+<a name="4-3"></a>
+## 4.3) Dependancies
+
 
 <a name="5"></a>
 # 5. Contributors

diff --git a/frontend/.circleci/config.yml → friends-mentor/.circleci/config.yml b/frontend/.circleci/config.yml → friends-mentor/.circleci/config.yml
diff --git a/frontend/.gitignore → friends-mentor/.gitignore b/frontend/.gitignore → friends-mentor/.gitignore
diff --git a/frontend/README.md → friends-mentor/README.md b/frontend/README.md → friends-mentor/README.md
diff --git a/frontend/jsconfig.json → friends-mentor/jsconfig.json b/frontend/jsconfig.json → friends-mentor/jsconfig.json
diff --git a/frontend/package-lock.json → friends-mentor/package-lock.json b/frontend/package-lock.json → friends-mentor/package-lock.json
diff --git a/frontend/package.json → friends-mentor/package.json b/frontend/package.json → friends-mentor/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "frontend",
+  "name": "friends-mentor",
   "version": "0.1.0",
   "private": true,
   "dependencies": {

diff --git a/friends-mentor/public/android-chrome-192x192.png b/friends-mentor/public/android-chrome-192x192.png
diff --git a/friends-mentor/public/android-chrome-512x512.png b/friends-mentor/public/android-chrome-512x512.png
diff --git a/friends-mentor/public/favicon-16x16.png b/friends-mentor/public/favicon-16x16.png
diff --git a/friends-mentor/public/favicon-32x32.png b/friends-mentor/public/favicon-32x32.png
diff --git a/friends-mentor/public/favicon.ico b/friends-mentor/public/favicon.ico
diff --git a/frontend/public/index.html → friends-mentor/public/index.html b/frontend/public/index.html → friends-mentor/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>Friends Mentor</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/frontend/public/logo192.png → friends-mentor/public/logo192.png b/frontend/public/logo192.png → friends-mentor/public/logo192.png
diff --git a/frontend/public/logo512.png → friends-mentor/public/logo512.png b/frontend/public/logo512.png → friends-mentor/public/logo512.png
diff --git a/frontend/public/manifest.json → friends-mentor/public/manifest.json b/frontend/public/manifest.json → friends-mentor/public/manifest.json
diff --git a/frontend/public/robots.txt → friends-mentor/public/robots.txt b/frontend/public/robots.txt → friends-mentor/public/robots.txt
diff --git a/frontend/src/App.css → friends-mentor/src/App.css b/frontend/src/App.css → friends-mentor/src/App.css
diff --git a/frontend/src/App.js → friends-mentor/src/App.js b/frontend/src/App.js → friends-mentor/src/App.js
diff --git a/frontend/src/App.test.js → friends-mentor/src/App.test.js b/frontend/src/App.test.js → friends-mentor/src/App.test.js
diff --git a/frontend/src/components/CertificateFrame.jsx → ...entor/src/components/CertificateFrame.jsx b/frontend/src/components/CertificateFrame.jsx → ...entor/src/components/CertificateFrame.jsx
diff --git a/frontend/src/components/Components.jsx → friends-mentor/src/components/Components.jsx b/frontend/src/components/Components.jsx → friends-mentor/src/components/Components.jsx
diff --git a/frontend/src/components/GradeSelect.jsx → ...nds-mentor/src/components/GradeSelect.jsx b/frontend/src/components/GradeSelect.jsx → ...nds-mentor/src/components/GradeSelect.jsx
@@ -10,7 +10,7 @@ function GradeSelect(props){
     var six = "🖼️6th grade";
     var seven = "📙7th grade";
     var eight = "📙8th grade";
-    var nine = "📚9th grade";
+    var nine = "📙9th grade";
     var ten = "📚10th grade";
     var eleven = "📚11th grade";
     var twelve = "📚12th grade";
@@ -20,7 +20,7 @@ function GradeSelect(props){
         six = "🖼️6th grade";
         seven = "📙7th grade";
         eight = "📙8th grade";
-        nine = "📚9th grade";
+        nine = "📙9th grade";
         ten = "📚10th grade";
         eleven = "📚11th grade";
         twelve = "📚12th grade";

diff --git a/frontend/src/components/HorizontalInput.jsx → ...mentor/src/components/HorizontalInput.jsx b/frontend/src/components/HorizontalInput.jsx → ...mentor/src/components/HorizontalInput.jsx
diff --git a/frontend/src/components/LectureBox.jsx → friends-mentor/src/components/LectureBox.jsx b/frontend/src/components/LectureBox.jsx → friends-mentor/src/components/LectureBox.jsx
diff --git a/frontend/src/components/LecturePlayer.jsx → ...s-mentor/src/components/LecturePlayer.jsx b/frontend/src/components/LecturePlayer.jsx → ...s-mentor/src/components/LecturePlayer.jsx
diff --git a/frontend/src/components/LikeEmoji.jsx → friends-mentor/src/components/LikeEmoji.jsx b/frontend/src/components/LikeEmoji.jsx → friends-mentor/src/components/LikeEmoji.jsx
diff --git a/frontend/src/components/RecentLectures.jsx → ...-mentor/src/components/RecentLectures.jsx b/frontend/src/components/RecentLectures.jsx → ...-mentor/src/components/RecentLectures.jsx
diff --git a/frontend/src/components/ThemedToast.jsx → ...nds-mentor/src/components/ThemedToast.jsx b/frontend/src/components/ThemedToast.jsx → ...nds-mentor/src/components/ThemedToast.jsx
diff --git a/frontend/src/components/TopBar.jsx → friends-mentor/src/components/TopBar.jsx b/frontend/src/components/TopBar.jsx → friends-mentor/src/components/TopBar.jsx
diff --git a/frontend/src/components/TrendingLecture.jsx → ...mentor/src/components/TrendingLecture.jsx b/frontend/src/components/TrendingLecture.jsx → ...mentor/src/components/TrendingLecture.jsx
diff --git a/frontend/src/components/VerticalInput.jsx → ...s-mentor/src/components/VerticalInput.jsx b/frontend/src/components/VerticalInput.jsx → ...s-mentor/src/components/VerticalInput.jsx
diff --git a/frontend/src/fonts/Gulim.ttf → friends-mentor/src/fonts/Gulim.ttf b/frontend/src/fonts/Gulim.ttf → friends-mentor/src/fonts/Gulim.ttf
diff --git a/frontend/src/fonts/Neverland.otf → friends-mentor/src/fonts/Neverland.otf b/frontend/src/fonts/Neverland.otf → friends-mentor/src/fonts/Neverland.otf
diff --git a/frontend/src/img/back.png → friends-mentor/src/img/back.png b/frontend/src/img/back.png → friends-mentor/src/img/back.png
diff --git a/frontend/src/img/blackboard-compressed.jpg → ...-mentor/src/img/blackboard-compressed.jpg b/frontend/src/img/blackboard-compressed.jpg → ...-mentor/src/img/blackboard-compressed.jpg
diff --git a/frontend/src/img/bottom_safezone.png → friends-mentor/src/img/bottom_safezone.png b/frontend/src/img/bottom_safezone.png → friends-mentor/src/img/bottom_safezone.png
diff --git a/frontend/src/img/certificateImg.png → friends-mentor/src/img/certificateImg.png b/frontend/src/img/certificateImg.png → friends-mentor/src/img/certificateImg.png
diff --git a/frontend/src/img/changeLang.png → friends-mentor/src/img/changeLang.png b/frontend/src/img/changeLang.png → friends-mentor/src/img/changeLang.png
diff --git a/frontend/src/img/clear.png → friends-mentor/src/img/clear.png b/frontend/src/img/clear.png → friends-mentor/src/img/clear.png
diff --git a/frontend/src/img/gohome.png → friends-mentor/src/img/gohome.png b/frontend/src/img/gohome.png → friends-mentor/src/img/gohome.png
diff --git a/frontend/src/img/home.png → friends-mentor/src/img/home.png b/frontend/src/img/home.png → friends-mentor/src/img/home.png
diff --git a/frontend/src/img/left.png → friends-mentor/src/img/left.png b/frontend/src/img/left.png → friends-mentor/src/img/left.png
diff --git a/frontend/src/img/mainlogo.png → friends-mentor/src/img/mainlogo.png b/frontend/src/img/mainlogo.png → friends-mentor/src/img/mainlogo.png
diff --git a/frontend/src/img/profile.png → friends-mentor/src/img/profile.png b/frontend/src/img/profile.png → friends-mentor/src/img/profile.png
diff --git a/frontend/src/img/project-flow2.drawio.png → ...s-mentor/src/img/project-flow2.drawio.png b/frontend/src/img/project-flow2.drawio.png → ...s-mentor/src/img/project-flow2.drawio.png
diff --git a/frontend/src/img/right.png → friends-mentor/src/img/right.png b/frontend/src/img/right.png → friends-mentor/src/img/right.png
diff --git a/frontend/src/img/signature.png → friends-mentor/src/img/signature.png b/frontend/src/img/signature.png → friends-mentor/src/img/signature.png
diff --git a/frontend/src/img/top_safezone.png → friends-mentor/src/img/top_safezone.png b/frontend/src/img/top_safezone.png → friends-mentor/src/img/top_safezone.png
diff --git a/frontend/src/img/white.png → friends-mentor/src/img/white.png b/frontend/src/img/white.png → friends-mentor/src/img/white.png
diff --git a/frontend/src/index.css → friends-mentor/src/index.css b/frontend/src/index.css → friends-mentor/src/index.css
diff --git a/frontend/src/index.js → friends-mentor/src/index.js b/frontend/src/index.js → friends-mentor/src/index.js
diff --git a/frontend/src/pages/AxiosTestPage.jsx → friends-mentor/src/pages/AxiosTestPage.jsx b/frontend/src/pages/AxiosTestPage.jsx → friends-mentor/src/pages/AxiosTestPage.jsx
diff --git a/frontend/src/pages/CertificatePage.jsx → friends-mentor/src/pages/CertificatePage.jsx b/frontend/src/pages/CertificatePage.jsx → friends-mentor/src/pages/CertificatePage.jsx
diff --git a/frontend/src/pages/LectureRoomPage.jsx → friends-mentor/src/pages/LectureRoomPage.jsx b/frontend/src/pages/LectureRoomPage.jsx → friends-mentor/src/pages/LectureRoomPage.jsx
diff --git a/frontend/src/pages/LectureUploadPage.jsx → ...ds-mentor/src/pages/LectureUploadPage.jsx b/frontend/src/pages/LectureUploadPage.jsx → ...ds-mentor/src/pages/LectureUploadPage.jsx
@@ -6,6 +6,7 @@ import ModularRequest from "util/ModularRequest";
 import {toast } from 'react-toastify';
 import { useAtom } from "jotai";
 import { LanguageChangeAtom } from "util/atom";
+import { FE_PATH } from "util/Enums";
 
 
 function LectureUploadPage(){
@@ -57,6 +58,7 @@ function LectureUploadPage(){
             m1.send().then((res)=>{
                 if(res.status=== 200) {
                     notify("successfully added a lecture!");
+                    setTimeout(()=>{navigate(FE_PATH.course.list);},2000);
                 } else {
                     notify("there was an error in adding lecture!");
                 }

diff --git a/frontend/src/pages/LectureViewPage.jsx → friends-mentor/src/pages/LectureViewPage.jsx b/frontend/src/pages/LectureViewPage.jsx → friends-mentor/src/pages/LectureViewPage.jsx
diff --git a/frontend/src/pages/LoginTestPage.jsx → friends-mentor/src/pages/LoginTestPage.jsx b/frontend/src/pages/LoginTestPage.jsx → friends-mentor/src/pages/LoginTestPage.jsx
diff --git a/frontend/src/pages/MainPage.jsx → friends-mentor/src/pages/MainPage.jsx b/frontend/src/pages/MainPage.jsx → friends-mentor/src/pages/MainPage.jsx
diff --git a/frontend/src/pages/Mypage.jsx → friends-mentor/src/pages/Mypage.jsx b/frontend/src/pages/Mypage.jsx → friends-mentor/src/pages/Mypage.jsx
diff --git a/frontend/src/pages/Pages.jsx → friends-mentor/src/pages/Pages.jsx b/frontend/src/pages/Pages.jsx → friends-mentor/src/pages/Pages.jsx
diff --git a/frontend/src/pages/SignInPage.jsx → friends-mentor/src/pages/SignInPage.jsx b/frontend/src/pages/SignInPage.jsx → friends-mentor/src/pages/SignInPage.jsx
diff --git a/frontend/src/pages/SignUpPage.jsx → friends-mentor/src/pages/SignUpPage.jsx b/frontend/src/pages/SignUpPage.jsx → friends-mentor/src/pages/SignUpPage.jsx
@@ -227,15 +227,15 @@ function SignUpPage() {
                         paddingBottom: '7px', }}>
 
                     <option selected default value="" disabled > {Enteryourgrade}</option>
-                    <option value="1">🖼️4th grade(초4)</option>
-                    <option value="2">🖼️5th grade(초5)</option>
-                    <option value="3">🖼️6th grade(초6)</option>
-                    <option value="4">📙7th grade(중1)</option>
-                    <option value="5">📙8th grade(중2)</option>
-                    <option value="6">📚9th grade(중3)</option>
-                    <option value="7">📚10th grade(고1)</option>
-                    <option value="8">📚11th grade(고2)</option>
-                    <option value="9">📚12th grade(고3)</option>
+                    <option value="4">🖼️4th grade(초4)</option>
+                    <option value="5">🖼️5th grade(초5)</option>
+                    <option value="6">🖼️6th grade(초6)</option>
+                    <option value="7">📙7th grade(중1)</option>
+                    <option value="8">📙8th grade(중2)</option>
+                    <option value="9">📚9th grade(중3)</option>
+                    <option value="10">📚10th grade(고1)</option>
+                    <option value="11">📚11th grade(고2)</option>
+                    <option value="12">📚12th grade(고3)</option>
                     </select>
                 <HorizonLine/>
             </div>

diff --git a/frontend/src/pages/TestPage.jsx → friends-mentor/src/pages/TestPage.jsx b/frontend/src/pages/TestPage.jsx → friends-mentor/src/pages/TestPage.jsx
diff --git a/frontend/src/reportWebVitals.js → friends-mentor/src/reportWebVitals.js b/frontend/src/reportWebVitals.js → friends-mentor/src/reportWebVitals.js
diff --git a/frontend/src/setupTests.js → friends-mentor/src/setupTests.js b/frontend/src/setupTests.js → friends-mentor/src/setupTests.js
diff --git a/frontend/src/styles/ComponentStyles.jsx → ...nds-mentor/src/styles/ComponentStyles.jsx b/frontend/src/styles/ComponentStyles.jsx → ...nds-mentor/src/styles/ComponentStyles.jsx
diff --git a/frontend/src/styles/style.bootstrap.css → ...nds-mentor/src/styles/style.bootstrap.css b/frontend/src/styles/style.bootstrap.css → ...nds-mentor/src/styles/style.bootstrap.css
diff --git a/...s/styled-components/ButtonGroup.style.jsx → ...s/styled-components/ButtonGroup.style.jsx b/...s/styled-components/ButtonGroup.style.jsx → ...s/styled-components/ButtonGroup.style.jsx
diff --git a/...led-components/CertificateFrame.style.jsx → ...led-components/CertificateFrame.style.jsx b/...led-components/CertificateFrame.style.jsx → ...led-components/CertificateFrame.style.jsx
diff --git a/...yles/styled-components/EmptyBox.style.jsx → ...yles/styled-components/EmptyBox.style.jsx b/...yles/styled-components/EmptyBox.style.jsx → ...yles/styled-components/EmptyBox.style.jsx
diff --git a/...s/styled-components/GradeSelect.style.jsx → ...s/styled-components/GradeSelect.style.jsx b/...s/styled-components/GradeSelect.style.jsx → ...s/styled-components/GradeSelect.style.jsx
diff --git a/...yled-components/HorizontalInput.style.jsx → ...yled-components/HorizontalInput.style.jsx b/...yled-components/HorizontalInput.style.jsx → ...yled-components/HorizontalInput.style.jsx
diff --git a/...yles/styled-components/HorizontalLine.jsx → ...yles/styled-components/HorizontalLine.jsx b/...yles/styled-components/HorizontalLine.jsx → ...yles/styled-components/HorizontalLine.jsx
diff --git a/...components/LectureBoxComponents.style.jsx → ...components/LectureBoxComponents.style.jsx b/...components/LectureBoxComponents.style.jsx → ...components/LectureBoxComponents.style.jsx
diff --git a/...styled-components/LecturePlayer.style.jsx → ...styled-components/LecturePlayer.style.jsx b/...styled-components/LecturePlayer.style.jsx → ...styled-components/LecturePlayer.style.jsx
diff --git a/.../styled-components/Lecturegroup.style.jsx → .../styled-components/Lecturegroup.style.jsx b/.../styled-components/Lecturegroup.style.jsx → .../styled-components/Lecturegroup.style.jsx
diff --git a/...les/styled-components/LoginTest.style.jsx → ...les/styled-components/LoginTest.style.jsx b/...les/styled-components/LoginTest.style.jsx → ...les/styled-components/LoginTest.style.jsx
diff --git a/...styled-components/MainBodyFrame.style.jsx → ...styled-components/MainBodyFrame.style.jsx b/...styled-components/MainBodyFrame.style.jsx → ...styled-components/MainBodyFrame.style.jsx
diff --git a/...nd/src/styles/styled-components/Modal.jsx → ...or/src/styles/styled-components/Modal.jsx b/...nd/src/styles/styled-components/Modal.jsx → ...or/src/styles/styled-components/Modal.jsx
diff --git a/...d/src/styles/styled-components/Modal2.jsx → ...r/src/styles/styled-components/Modal2.jsx b/...d/src/styles/styled-components/Modal2.jsx → ...r/src/styles/styled-components/Modal2.jsx
diff --git a/...c/styles/styled-components/ModalTitle.jsx → ...c/styles/styled-components/ModalTitle.jsx b/...c/styles/styled-components/ModalTitle.jsx → ...c/styles/styled-components/ModalTitle.jsx
diff --git a/...rc/styles/styled-components/Modaltext.jsx → ...rc/styles/styled-components/Modaltext.jsx b/...rc/styles/styled-components/Modaltext.jsx → ...rc/styles/styled-components/Modaltext.jsx
diff --git a/...led-components/MyPageComponents.style.jsx → ...led-components/MyPageComponents.style.jsx b/...led-components/MyPageComponents.style.jsx → ...led-components/MyPageComponents.style.jsx
diff --git a/...s/styled-components/SignInUpBar.style.jsx → ...s/styled-components/SignInUpBar.style.jsx b/...s/styled-components/SignInUpBar.style.jsx → ...s/styled-components/SignInUpBar.style.jsx
diff --git a/...les/styled-components/ThemedBox.style.jsx → ...les/styled-components/ThemedBox.style.jsx b/...les/styled-components/ThemedBox.style.jsx → ...les/styled-components/ThemedBox.style.jsx
diff --git a/...tyled-components/ThemedBoxRound.style.jsx → ...tyled-components/ThemedBoxRound.style.jsx b/...tyled-components/ThemedBoxRound.style.jsx → ...tyled-components/ThemedBoxRound.style.jsx
diff --git a/...tyled-components/ThemedBoxUnder.style.jsx → ...tyled-components/ThemedBoxUnder.style.jsx b/...tyled-components/ThemedBoxUnder.style.jsx → ...tyled-components/ThemedBoxUnder.style.jsx
diff --git a/.../styled-components/ThemedButton.style.jsx → .../styled-components/ThemedButton.style.jsx b/.../styled-components/ThemedButton.style.jsx → .../styled-components/ThemedButton.style.jsx
diff --git a/...yled-components/ThemedTextBlock.style.jsx → ...yled-components/ThemedTextBlock.style.jsx b/...yled-components/ThemedTextBlock.style.jsx → ...yled-components/ThemedTextBlock.style.jsx
diff --git a/...tyled-components/ThemedTextarea.style.jsx → ...tyled-components/ThemedTextarea.style.jsx b/...tyled-components/ThemedTextarea.style.jsx → ...tyled-components/ThemedTextarea.style.jsx
diff --git a/...s/styled-components/ThemedTitle.style.jsx → ...s/styled-components/ThemedTitle.style.jsx b/...s/styled-components/ThemedTitle.style.jsx → ...s/styled-components/ThemedTitle.style.jsx
diff --git a/...styles/styled-components/Topbar.style.jsx → ...styles/styled-components/Topbar.style.jsx b/...styles/styled-components/Topbar.style.jsx → ...styles/styled-components/Topbar.style.jsx
diff --git a/...yled-components/UnderlinedTitle.style.jsx → ...yled-components/UnderlinedTitle.style.jsx b/...yled-components/UnderlinedTitle.style.jsx → ...yled-components/UnderlinedTitle.style.jsx
diff --git a/...styled-components/VerticalInput.style.jsx → ...styled-components/VerticalInput.style.jsx b/...styled-components/VerticalInput.style.jsx → ...styled-components/VerticalInput.style.jsx
diff --git a/frontend/src/util/Enums.jsx → friends-mentor/src/util/Enums.jsx b/frontend/src/util/Enums.jsx → friends-mentor/src/util/Enums.jsx
diff --git a/frontend/src/util/ModularRequest.jsx → friends-mentor/src/util/ModularRequest.jsx b/frontend/src/util/ModularRequest.jsx → friends-mentor/src/util/ModularRequest.jsx
diff --git a/frontend/src/util/atom.jsx → friends-mentor/src/util/atom.jsx b/frontend/src/util/atom.jsx → friends-mentor/src/util/atom.jsx
diff --git a/frontend/src/util/modalPortal.jsx → friends-mentor/src/util/modalPortal.jsx b/frontend/src/util/modalPortal.jsx → friends-mentor/src/util/modalPortal.jsx
diff --git a/frontend/yarn.lock → friends-mentor/yarn.lock b/frontend/yarn.lock → friends-mentor/yarn.lock
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
diff --git a/frontend/src/logo.svg b/frontend/src/logo.svg