Merge pull request #141 from 2022-Winter-Bootcamp-Team-K/refactor/#139-…

…DirectoryAndConsole 139 [refactor] 폴더 구조화, console.log 삭제
SVTeamK-ROLLIT · Feb 1, 2023 · 1374381 · 1374381
2 parents 74845c3 + 9c64bbd
commit 1374381
Show file tree

Hide file tree

Showing 90 changed files with 95 additions and 502 deletions.
diff --git a/src/App.css b/src/App.css
@@ -1,31 +1,32 @@
-.App{}
+.App {
+}
 @font-face {
   font-family: Cafe24Ssurround;
-  src: URL('./Styles/fonts/Cafe24Ssurround.ttf');
+  src: URL('./assets/font/Cafe24Ssurround.ttf');
 }
 
 @font-face {
   font-family: establishRoomNo703OTF;
-  src: URL('./Styles/fonts/establishRoomNo703OTF.ttf');
+  src: URL('./assets/font/establishRoomNo703OTF.ttf');
 }
 
 @font-face {
   font-family: KyoboHandwriting2021sjy;
-  src: URL('./Styles/fonts/KyoboHandwriting2021sjy.ttf');
+  src: URL('./assets/font/KyoboHandwriting2021sjy.ttf');
 }
 
 @font-face {
   font-family: TTTtangsbudaejjigaeB;
-  src: URL('./Styles/fonts/TTTtangsbudaejjigaeB.ttf');
+  src: URL('./assets/font/TTTtangsbudaejjigaeB.ttf');
 }
 
 @font-face {
   font-family: Ansungtangmyun;
-  src: URL('./Styles/fonts/Ansungtangmyun.ttf');
+  src: URL('./assets/font/Ansungtangmyun.ttf');
 }
 @font-face {
   font-family: SUIT-SemiBold;
-  src: URL('./Styles/fonts/SUIT-SemiBold.ttf');
+  src: URL('./assets/font/SUIT-SemiBold.ttf');
 }
 
 /* 카페24서라운드 */
@@ -62,4 +63,4 @@
   src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/establishRoomNo703OTF.woff') format('woff');
   font-weight: normal;
   font-style: normal;
-} */ 
+} */
diff --git a/src/App.js b/src/App.js
@@ -1,13 +1,13 @@
 import React from 'react';
 import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
 // import axios from 'axios';
-import Welcome from './Page/Welcome';
-import MyPage from './Page/MyPage';
-import MakeRolling from './Page/MakeRolling';
-import Rolling from './Page/Rolling';
-import Register from './Page/Register';
-import Memo from './Page/Memo';
-import Photo from './Page/PhotoModal';
+import Welcome from './page/Welcome/Welcome';
+import MyPage from './page/MyPage/MyPage';
+import MakeRolling from './page/MakeRolling/MakeRolling';
+import Rolling from './page/RollingPaper/Rolling';
+import Register from './page/Register';
+import Memo from './page/Memo/Memo';
+import Photo from './page/PhotoModal';
 
 import './App.css';
 

diff --git a/src/Image/RollIT.png b/src/Image/RollIT.png
diff --git a/src/Image/logo.png b/src/Image/logo.png
diff --git a/src/Image/logo2.png b/src/Image/logo2.png
diff --git a/src/Image/pencil.png b/src/Image/pencil.png
diff --git a/src/Image/poplogo.png b/src/Image/poplogo.png
diff --git a/src/Image/profile.png b/src/Image/profile.png
diff --git a/src/Image/sharemainimage.png b/src/Image/sharemainimage.png
diff --git a/src/Image/sketchbookLogin.png b/src/Image/sketchbookLogin.png
diff --git a/src/Image/sketchbookWelcome.png b/src/Image/sketchbookWelcome.png
diff --git a/src/Image/smallLogo.png b/src/Image/smallLogo.png
diff --git a/src/Image/smallpoplogo.png b/src/Image/smallpoplogo.png
diff --git a/src/Image/welcome2.png b/src/Image/welcome2.png
diff --git a/src/Image/welcome3.png b/src/Image/welcome3.png
diff --git a/src/Page/GlobalStyle.js b/src/Page/GlobalStyle.js
diff --git a/src/Page/PhotoUpload.js b/src/Page/PhotoUpload.js
diff --git a/src/Page/handMotion.js b/src/Page/handMotion.js
diff --git a/src/Page/snow.js b/src/Page/snow.js
diff --git a/src/Styles/fonts/Ansungtangmyun.ttf → src/assets/font/Ansungtangmyun.ttf b/src/Styles/fonts/Ansungtangmyun.ttf → src/assets/font/Ansungtangmyun.ttf
diff --git a/src/Styles/fonts/Cafe24Ssurround.ttf → src/assets/font/Cafe24Ssurround.ttf b/src/Styles/fonts/Cafe24Ssurround.ttf → src/assets/font/Cafe24Ssurround.ttf
diff --git a/src/Styles/fonts/KyoboHandwriting2021sjy.ttf → src/assets/font/KyoboHandwriting2021sjy.ttf b/src/Styles/fonts/KyoboHandwriting2021sjy.ttf → src/assets/font/KyoboHandwriting2021sjy.ttf
diff --git a/src/Styles/fonts/SUIT-SemiBold.ttf → src/assets/font/SUIT-SemiBold.ttf b/src/Styles/fonts/SUIT-SemiBold.ttf → src/assets/font/SUIT-SemiBold.ttf
diff --git a/src/Styles/fonts/TTTtangsbudaejjigaeB.ttf → src/assets/font/TTTtangsbudaejjigaeB.ttf b/src/Styles/fonts/TTTtangsbudaejjigaeB.ttf → src/assets/font/TTTtangsbudaejjigaeB.ttf
diff --git a/src/Styles/fonts/establishRoomNo703OTF.ttf → src/assets/font/establishRoomNo703OTF.ttf b/src/Styles/fonts/establishRoomNo703OTF.ttf → src/assets/font/establishRoomNo703OTF.ttf
diff --git a/src/Image/ID.png → src/assets/image/ID.png b/src/Image/ID.png → src/assets/image/ID.png
diff --git a/src/Image/PW.png → src/assets/image/PW.png b/src/Image/PW.png → src/assets/image/PW.png
diff --git a/src/Image/Sketchbook2.png → src/assets/image/Sketchbook2.png b/src/Image/Sketchbook2.png → src/assets/image/Sketchbook2.png
diff --git a/src/Image/down.png → src/assets/image/down.png b/src/Image/down.png → src/assets/image/down.png
diff --git a/src/Image/galleryicon.png → src/assets/image/galleryicon.png b/src/Image/galleryicon.png → src/assets/image/galleryicon.png
diff --git a/src/Image/image1.png → src/assets/image/image1.png b/src/Image/image1.png → src/assets/image/image1.png
diff --git a/src/Image/image2.png → src/assets/image/image2.png b/src/Image/image2.png → src/assets/image/image2.png
diff --git a/src/Image/image3.png → src/assets/image/image3.png b/src/Image/image3.png → src/assets/image/image3.png
diff --git a/src/Image/image4.png → src/assets/image/image4.png b/src/Image/image4.png → src/assets/image/image4.png
diff --git a/src/Image/image5.png → src/assets/image/image5.png b/src/Image/image5.png → src/assets/image/image5.png
diff --git a/src/Image/kakaobtn.png → src/assets/image/kakaobtn.png b/src/Image/kakaobtn.png → src/assets/image/kakaobtn.png
diff --git a/src/Image/memoicon.svg → src/assets/image/memoicon.svg b/src/Image/memoicon.svg → src/assets/image/memoicon.svg
diff --git a/src/Image/newlogo.png → src/assets/image/newlogo.png b/src/Image/newlogo.png → src/assets/image/newlogo.png
diff --git a/src/Image/pencilicon.png → src/assets/image/pencilicon.png b/src/Image/pencilicon.png → src/assets/image/pencilicon.png
diff --git a/src/Image/smallimage1.png → src/assets/image/smallimage1.png b/src/Image/smallimage1.png → src/assets/image/smallimage1.png
diff --git a/src/Image/smallimage2.png → src/assets/image/smallimage2.png b/src/Image/smallimage2.png → src/assets/image/smallimage2.png
diff --git a/src/Image/smallimage3.png → src/assets/image/smallimage3.png b/src/Image/smallimage3.png → src/assets/image/smallimage3.png
diff --git a/src/Image/smallimage4.png → src/assets/image/smallimage4.png b/src/Image/smallimage4.png → src/assets/image/smallimage4.png
diff --git a/src/Image/smallimage5.png → src/assets/image/smallimage5.png b/src/Image/smallimage5.png → src/assets/image/smallimage5.png
diff --git a/src/Image/upload.png → src/assets/image/upload.png b/src/Image/upload.png → src/assets/image/upload.png
diff --git a/src/Image/user.png → src/assets/image/user.png b/src/Image/user.png → src/assets/image/user.png
diff --git a/src/Image/userbackimg.png → src/assets/image/userbackimg.png b/src/Image/userbackimg.png → src/assets/image/userbackimg.png
diff --git a/src/Image/usericon.png → src/assets/image/usericon.png b/src/Image/usericon.png → src/assets/image/usericon.png
diff --git a/src/Image/welcome1.png → src/assets/image/welcome1.png b/src/Image/welcome1.png → src/assets/image/welcome1.png
diff --git a/src/assets/image/welcomedown.png b/src/assets/image/welcomedown.png
diff --git a/src/Component/DeleteBtn.js → src/component/DeleteBtn.js b/src/Component/DeleteBtn.js → src/component/DeleteBtn.js
diff --git a/src/Page/KakaoShare.js → src/component/KakaoShare.js b/src/Page/KakaoShare.js → src/component/KakaoShare.js
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 import styled from 'styled-components';
-import KakaoBtn from '../Image/kakaobtn.png';
+import KakaoBtn from '../assets/image/kakaobtn.png';
 
 // const kakaoJSKey = process.env.REACT_APP_KAKAO_KEY;
 
@@ -13,7 +13,6 @@ const KakaoShareBtn = styled.button`
 `;
 
 function KakaoShare() {
-  // console.log('@@@@@@@@@@@@@@@@@@@', kakaoJSKey);
   const location = useLocation();
   useEffect(() => {
     // 카카오톡 sdk 추가
@@ -23,9 +22,7 @@ function KakaoShare() {
     document.body.appendChild(script);
     return () => document.body.removeChild(script);
   }, []);
-  useEffect(() => {
-    console.log(location);
-  }, [location]);
+  useEffect(() => {}, [location]);
 
   const shareToKatalk = () => {
     // kakao sdk script 부른 후 window.Kakao로 접근

diff --git a/src/Page/Loading.js → src/component/Loading.js b/src/Page/Loading.js → src/component/Loading.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import './Loading.css';
+import '../style/Loading.css';
 
 function Loading() {
   return (

diff --git a/src/Page/anonymous.js → src/component/anonymous.js b/src/Page/anonymous.js → src/component/anonymous.js
@@ -2,4 +2,5 @@ export default function anonymous() {
   const randomNum = Math.floor(Math.random() * 50);
 
   return ` 익명  ${randomNum}`;
+  // 폴더 이름 변경
 }
diff --git a/src/Page/Cartoonize.js → src/page/Cartoonize.js b/src/Page/Cartoonize.js → src/page/Cartoonize.js
@@ -42,12 +42,12 @@ function Cartoonize({
     await formData.append('image', resizeFile);
 
     const response = await axios.post(`${backBaseUrl}/api/v1/photos`, formData);
-    console.log(response.data);
+
     const response2 = await axios.post(
       `${backBaseUrl}/api/v1/papers/cartoons`,
       response.data,
     );
-    // console.log(response2.data);
+
     return response2.data;
   }
   function run2(run1Result) {
@@ -60,9 +60,8 @@ function Cartoonize({
         .then(response => {
           /* eslint-disable no-plusplus */
           counter++;
-          console.log(response.data);
+
           if (counter >= 50 || response.data.image_url) {
-            console.log('response: ', response.data);
             clearInterval(interval);
             setPhoto(response.data);
             setLoading(false);
@@ -73,10 +72,8 @@ function Cartoonize({
         })
 
         .catch(error => {
-          console.log(error);
           clearInterval(interval);
         });
-      console.log('datas: ', datas);
     }, 2000);
   }
 
@@ -88,21 +85,9 @@ function Cartoonize({
     }
     setLoading(true);
     const run1Result = await run1();
-    console.log('2번쨰 데이터 값 ', run1Result.task_id);
     const run2Result = await run2(run1Result);
-    await console.log(1111);
-    await console.log(2222);
-    await console.log(3333);
-    await console.log(4444);
-
-    // await closeModal();
-    // await setRawLog(imageUrl);
-    // await setIsPhoto(true);
-    // await setIsActive(true);
   };
-  // console.log('@@@@@', imageUrl);
 
-  // const onSubmit = () => {};
   return (
     <CartoonBtn type="button" onClick={onSubmit}>
       만화필터로 <br />

diff --git a/src/Page/Login.js → src/page/Login.js b/src/Page/Login.js → src/page/Login.js
@@ -8,10 +8,10 @@ import { useNavigate } from 'react-router-dom';
 import 'react-toastify/dist/ReactToastify.css';
 import Modal from 'react-modal';
 
-import './Background.css';
+import '../style/Background.css';
 
-import ID from '../Image/ID.png';
-import PW from '../Image/PW.png';
+import ID from '../assets/image/ID.png';
+import PW from '../assets/image/PW.png';
 
 const backBaseUrl = process.env.REACT_APP_BACKEND_URL;
 

diff --git a/src/Page/MakeRolling.js → src/page/MakeRolling/MakeRolling.js b/src/Page/MakeRolling.js → src/page/MakeRolling/MakeRolling.js
@@ -4,7 +4,7 @@ import MakeRoll from './MakeRollingMypage';
 import RollText from './MakeRollingText';
 import Theme from './MakeRollingTheme';
 
-import background from '../Image/welcome1.png';
+import background from '../../assets/image/welcome1.png';
 
 const AllWrap = styled.div`
   height: 120vh;

diff --git a/src/Page/MakeRollingMypage.js → src/page/MakeRolling/MakeRollingMypage.js b/src/Page/MakeRollingMypage.js → src/page/MakeRolling/MakeRollingMypage.js
diff --git a/src/Page/MakeRollingText.js → src/page/MakeRolling/MakeRollingText.js b/src/Page/MakeRollingText.js → src/page/MakeRolling/MakeRollingText.js