diff --git a/src/App.css b/src/App.css index 77030be..50015c8 100644 --- 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/noonfonts_2112@1.0/establishRoomNo703OTF.woff') format('woff'); font-weight: normal; font-style: normal; -} */ \ No newline at end of file +} */ diff --git a/src/App.js b/src/App.js index bccad67..cec393d 100644 --- 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 deleted file mode 100644 index 33b1ea5..0000000 Binary files a/src/Image/RollIT.png and /dev/null differ diff --git a/src/Image/logo.png b/src/Image/logo.png deleted file mode 100644 index 3af4381..0000000 Binary files a/src/Image/logo.png and /dev/null differ diff --git a/src/Image/logo2.png b/src/Image/logo2.png deleted file mode 100644 index 7756bcd..0000000 Binary files a/src/Image/logo2.png and /dev/null differ diff --git a/src/Image/pencil.png b/src/Image/pencil.png deleted file mode 100644 index b2eb877..0000000 Binary files a/src/Image/pencil.png and /dev/null differ diff --git a/src/Image/poplogo.png b/src/Image/poplogo.png deleted file mode 100644 index 7fa489e..0000000 Binary files a/src/Image/poplogo.png and /dev/null differ diff --git a/src/Image/profile.png b/src/Image/profile.png deleted file mode 100644 index e35a13f..0000000 Binary files a/src/Image/profile.png and /dev/null differ diff --git a/src/Image/sharemainimage.png b/src/Image/sharemainimage.png deleted file mode 100644 index 2f2bf2d..0000000 Binary files a/src/Image/sharemainimage.png and /dev/null differ diff --git a/src/Image/sketchbookLogin.png b/src/Image/sketchbookLogin.png deleted file mode 100644 index 8aca19c..0000000 Binary files a/src/Image/sketchbookLogin.png and /dev/null differ diff --git a/src/Image/sketchbookWelcome.png b/src/Image/sketchbookWelcome.png deleted file mode 100644 index a45dce1..0000000 Binary files a/src/Image/sketchbookWelcome.png and /dev/null differ diff --git a/src/Image/smallLogo.png b/src/Image/smallLogo.png deleted file mode 100644 index 42969e8..0000000 Binary files a/src/Image/smallLogo.png and /dev/null differ diff --git a/src/Image/smallpoplogo.png b/src/Image/smallpoplogo.png deleted file mode 100644 index de00fd4..0000000 Binary files a/src/Image/smallpoplogo.png and /dev/null differ diff --git a/src/Image/welcome2.png b/src/Image/welcome2.png deleted file mode 100644 index a9c218a..0000000 Binary files a/src/Image/welcome2.png and /dev/null differ diff --git a/src/Image/welcome3.png b/src/Image/welcome3.png deleted file mode 100644 index faa0d44..0000000 Binary files a/src/Image/welcome3.png and /dev/null differ diff --git a/src/Page/GlobalStyle.js b/src/Page/GlobalStyle.js deleted file mode 100644 index eac5a68..0000000 --- a/src/Page/GlobalStyle.js +++ /dev/null @@ -1,15 +0,0 @@ -import { createGlobalStyle } from 'styled-components'; -import sketchbook from '../Image/sketchbookLogin.png'; - -const GlobalStyle = createGlobalStyle` - body .rolling { - margin: 0; - padding: 0; - background: url(${sketchbook}); - background-repeat: no-repeat; - background-size: 100rem 60rem; - background-position: center; - } -`; - -export default GlobalStyle; diff --git a/src/Page/PhotoUpload.js b/src/Page/PhotoUpload.js deleted file mode 100644 index d36a166..0000000 --- a/src/Page/PhotoUpload.js +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable react/jsx-props-no-spreading */ -import React from 'react'; -// import { useDropzone } from 'react-dropzone'; -// import styled from 'styled-components'; -// eslint-disable-next-line import/named - -function PhotoUpload() { - return
; -} - -export default PhotoUpload; diff --git a/src/Page/handMotion.js b/src/Page/handMotion.js deleted file mode 100644 index 7cc95ca..0000000 --- a/src/Page/handMotion.js +++ /dev/null @@ -1,158 +0,0 @@ -import React from 'react'; - -const handMotion = () => { - return ( -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ); -}; - -export default handMotion; diff --git a/src/Page/snow.js b/src/Page/snow.js deleted file mode 100644 index 3ab3f3b..0000000 --- a/src/Page/snow.js +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import Snowfall from 'react-snowfall'; -import styled from 'styled-components'; -import './snow.css'; - -const Bgcolor = styled.div` - color: white; - z-index: 999; -`; - -function Snow() { - return ( -
- -
- ); -} - -export default Snow; diff --git a/src/Styles/fonts/Ansungtangmyun.ttf b/src/assets/font/Ansungtangmyun.ttf similarity index 100% rename from src/Styles/fonts/Ansungtangmyun.ttf rename to src/assets/font/Ansungtangmyun.ttf diff --git a/src/Styles/fonts/Cafe24Ssurround.ttf b/src/assets/font/Cafe24Ssurround.ttf similarity index 100% rename from src/Styles/fonts/Cafe24Ssurround.ttf rename to src/assets/font/Cafe24Ssurround.ttf diff --git a/src/Styles/fonts/KyoboHandwriting2021sjy.ttf b/src/assets/font/KyoboHandwriting2021sjy.ttf similarity index 100% rename from src/Styles/fonts/KyoboHandwriting2021sjy.ttf rename to src/assets/font/KyoboHandwriting2021sjy.ttf diff --git a/src/Styles/fonts/SUIT-SemiBold.ttf b/src/assets/font/SUIT-SemiBold.ttf similarity index 100% rename from src/Styles/fonts/SUIT-SemiBold.ttf rename to src/assets/font/SUIT-SemiBold.ttf diff --git a/src/Styles/fonts/TTTtangsbudaejjigaeB.ttf b/src/assets/font/TTTtangsbudaejjigaeB.ttf similarity index 100% rename from src/Styles/fonts/TTTtangsbudaejjigaeB.ttf rename to src/assets/font/TTTtangsbudaejjigaeB.ttf diff --git a/src/Styles/fonts/establishRoomNo703OTF.ttf b/src/assets/font/establishRoomNo703OTF.ttf similarity index 100% rename from src/Styles/fonts/establishRoomNo703OTF.ttf rename to src/assets/font/establishRoomNo703OTF.ttf diff --git a/src/Image/ID.png b/src/assets/image/ID.png similarity index 100% rename from src/Image/ID.png rename to src/assets/image/ID.png diff --git a/src/Image/PW.png b/src/assets/image/PW.png similarity index 100% rename from src/Image/PW.png rename to src/assets/image/PW.png diff --git a/src/Image/Sketchbook2.png b/src/assets/image/Sketchbook2.png similarity index 100% rename from src/Image/Sketchbook2.png rename to src/assets/image/Sketchbook2.png diff --git a/src/Image/down.png b/src/assets/image/down.png similarity index 100% rename from src/Image/down.png rename to src/assets/image/down.png diff --git a/src/Image/galleryicon.png b/src/assets/image/galleryicon.png similarity index 100% rename from src/Image/galleryicon.png rename to src/assets/image/galleryicon.png diff --git a/src/Image/image1.png b/src/assets/image/image1.png similarity index 100% rename from src/Image/image1.png rename to src/assets/image/image1.png diff --git a/src/Image/image2.png b/src/assets/image/image2.png similarity index 100% rename from src/Image/image2.png rename to src/assets/image/image2.png diff --git a/src/Image/image3.png b/src/assets/image/image3.png similarity index 100% rename from src/Image/image3.png rename to src/assets/image/image3.png diff --git a/src/Image/image4.png b/src/assets/image/image4.png similarity index 100% rename from src/Image/image4.png rename to src/assets/image/image4.png diff --git a/src/Image/image5.png b/src/assets/image/image5.png similarity index 100% rename from src/Image/image5.png rename to src/assets/image/image5.png diff --git a/src/Image/kakaobtn.png b/src/assets/image/kakaobtn.png similarity index 100% rename from src/Image/kakaobtn.png rename to src/assets/image/kakaobtn.png diff --git a/src/Image/memoicon.svg b/src/assets/image/memoicon.svg similarity index 100% rename from src/Image/memoicon.svg rename to src/assets/image/memoicon.svg diff --git a/src/Image/newlogo.png b/src/assets/image/newlogo.png similarity index 100% rename from src/Image/newlogo.png rename to src/assets/image/newlogo.png diff --git a/src/Image/pencilicon.png b/src/assets/image/pencilicon.png similarity index 100% rename from src/Image/pencilicon.png rename to src/assets/image/pencilicon.png diff --git a/src/Image/smallimage1.png b/src/assets/image/smallimage1.png similarity index 100% rename from src/Image/smallimage1.png rename to src/assets/image/smallimage1.png diff --git a/src/Image/smallimage2.png b/src/assets/image/smallimage2.png similarity index 100% rename from src/Image/smallimage2.png rename to src/assets/image/smallimage2.png diff --git a/src/Image/smallimage3.png b/src/assets/image/smallimage3.png similarity index 100% rename from src/Image/smallimage3.png rename to src/assets/image/smallimage3.png diff --git a/src/Image/smallimage4.png b/src/assets/image/smallimage4.png similarity index 100% rename from src/Image/smallimage4.png rename to src/assets/image/smallimage4.png diff --git a/src/Image/smallimage5.png b/src/assets/image/smallimage5.png similarity index 100% rename from src/Image/smallimage5.png rename to src/assets/image/smallimage5.png diff --git a/src/Image/upload.png b/src/assets/image/upload.png similarity index 100% rename from src/Image/upload.png rename to src/assets/image/upload.png diff --git a/src/Image/user.png b/src/assets/image/user.png similarity index 100% rename from src/Image/user.png rename to src/assets/image/user.png diff --git a/src/Image/userbackimg.png b/src/assets/image/userbackimg.png similarity index 100% rename from src/Image/userbackimg.png rename to src/assets/image/userbackimg.png diff --git a/src/Image/usericon.png b/src/assets/image/usericon.png similarity index 100% rename from src/Image/usericon.png rename to src/assets/image/usericon.png diff --git a/src/Image/welcome1.png b/src/assets/image/welcome1.png similarity index 100% rename from src/Image/welcome1.png rename to src/assets/image/welcome1.png diff --git a/src/assets/image/welcomedown.png b/src/assets/image/welcomedown.png new file mode 100644 index 0000000..6714da8 Binary files /dev/null and b/src/assets/image/welcomedown.png differ diff --git a/src/Component/DeleteBtn.js b/src/component/DeleteBtn.js similarity index 100% rename from src/Component/DeleteBtn.js rename to src/component/DeleteBtn.js diff --git a/src/Page/KakaoShare.js b/src/component/KakaoShare.js similarity index 92% rename from src/Page/KakaoShare.js rename to src/component/KakaoShare.js index 5376336..428ea68 100644 --- a/src/Page/KakaoShare.js +++ b/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 b/src/component/Loading.js similarity index 95% rename from src/Page/Loading.js rename to src/component/Loading.js index bd83bc1..e8b8857 100644 --- a/src/Page/Loading.js +++ b/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 b/src/component/anonymous.js similarity index 83% rename from src/Page/anonymous.js rename to src/component/anonymous.js index 28a5d3e..772c1ba 100644 --- a/src/Page/anonymous.js +++ b/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 b/src/page/Cartoonize.js similarity index 79% rename from src/Page/Cartoonize.js rename to src/page/Cartoonize.js index c10f7ef..297e7fe 100644 --- a/src/Page/Cartoonize.js +++ b/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 ( 만화필터로
diff --git a/src/Page/Login.js b/src/page/Login.js similarity index 98% rename from src/Page/Login.js rename to src/page/Login.js index 622ce4b..23ea085 100644 --- a/src/Page/Login.js +++ b/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 b/src/page/MakeRolling/MakeRolling.js similarity index 91% rename from src/Page/MakeRolling.js rename to src/page/MakeRolling/MakeRolling.js index 27ecf98..c433e43 100644 --- a/src/Page/MakeRolling.js +++ b/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 b/src/page/MakeRolling/MakeRollingMypage.js similarity index 100% rename from src/Page/MakeRollingMypage.js rename to src/page/MakeRolling/MakeRollingMypage.js diff --git a/src/Page/MakeRollingText.js b/src/page/MakeRolling/MakeRollingText.js similarity index 100% rename from src/Page/MakeRollingText.js rename to src/page/MakeRolling/MakeRollingText.js diff --git a/src/Page/MakeRollingTheme.js b/src/page/MakeRolling/MakeRollingTheme.js similarity index 90% rename from src/Page/MakeRollingTheme.js rename to src/page/MakeRolling/MakeRollingTheme.js index d6564f9..94c5a22 100644 --- a/src/Page/MakeRollingTheme.js +++ b/src/page/MakeRolling/MakeRollingTheme.js @@ -12,7 +12,7 @@ import 'slick-carousel/slick/slick-theme.css'; import axios from 'axios'; import { useNavigate } from 'react-router-dom'; -import './button.css'; +import '../../style/button.css'; const backBaseUrl = process.env.REACT_APP_BACKEND_URL; @@ -116,11 +116,11 @@ const Count = styled.button` // -webkit-text-stroke-color: black; // `; -const imgUrl = require('../Image/image1.png'); -const imgUrl2 = require('../Image/image2.png'); -const imgUrl3 = require('../Image/image3.png'); -const imgUrl4 = require('../Image/image4.png'); -const imgUrl5 = require('../Image/image5.png'); +const imgUrl = require('../../assets/image/image1.png'); +const imgUrl2 = require('../../assets/image/image2.png'); +const imgUrl3 = require('../../assets/image/image3.png'); +const imgUrl4 = require('../../assets/image/image4.png'); +const imgUrl5 = require('../../assets/image/image5.png'); const items = [ { id: 1, url: imgUrl }, @@ -165,7 +165,6 @@ class SimpleSlider extends Component { }; const submit = async () => { const userId = localStorage.getItem('id'); - console.log(userId); try { const { data } = await axios.post( @@ -176,18 +175,14 @@ class SimpleSlider extends Component { title: this.state.value, }, ); - console.log('success'); - console.log(data.paper_id); this.props.navigate(`/rolling/${data.paper_id}`); } catch (e) { // 서버에서 받은 에러 메시지 출력 - console.log('fail'); } }; return ( - {console.log(this.state.value)} SELECT - {console.log(this.state.activeSlide + 1)} ); } diff --git a/src/Page/Memo.js b/src/page/Memo/Memo.js similarity index 97% rename from src/Page/Memo.js rename to src/page/Memo/Memo.js index c84b19b..1253ad2 100644 --- a/src/Page/Memo.js +++ b/src/page/Memo/Memo.js @@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom'; import MemoText from './MemoText'; import MemoColor from './MemoColor'; -import background from '../Image/welcome1.png'; +import background from '../../assets/image/welcome1.png'; const BackBtn = styled.button` //상단 뒤로가기 버튼 diff --git a/src/Page/MemoColor.js b/src/page/Memo/MemoColor.js similarity index 92% rename from src/Page/MemoColor.js rename to src/page/Memo/MemoColor.js index f3a6000..f7b9127 100644 --- a/src/Page/MemoColor.js +++ b/src/page/Memo/MemoColor.js @@ -166,19 +166,6 @@ function MemoColor({ pontType, setPontType, }) { - // const [pontType, setPontType] = useState('Cafe24Ssurround'); - - // const pontList = [ - // '카페24서라운드', - // '땅스부대찌개', - // '교보문고손글씨', - // '안성탕면체', - // '칠백삼체', - // ]; - // const handleSelect = () => { - // setPontType({ evalue }); - // console.log('글씨체: ', pontType); - // }; const onChange = useCallback( e => { setPontType(e.target.value); @@ -186,24 +173,19 @@ function MemoColor({ [pontType], ); // eslint-disable-next-line - console.log('글씨체: ', pontType); - // console.log(rollTypeColor); const onbackClick = a => { setRollBackColor(a); // eslint-disable-next-line - console.log('배경: ', rollBackColor); }; const ontypeClick = a => { setRollTypeColor(a); // eslint-disable-next-line - console.log('글씨: ', rollTypeColor); }; const handleInputChange = e => { setMemoName(e.target.value); // eslint-disable-next-line - console.log('작성: ', memoName); }; useCallback(onbackClick, [rollBackColor]); useCallback(ontypeClick, [rollTypeColor]); diff --git a/src/Page/MemoText.js b/src/page/Memo/MemoText.js similarity index 93% rename from src/Page/MemoText.js rename to src/page/Memo/MemoText.js index c8872d7..33de5cf 100644 --- a/src/Page/MemoText.js +++ b/src/page/Memo/MemoText.js @@ -4,9 +4,9 @@ import { useNavigate } from 'react-router-dom'; import 'react-toastify/dist/ReactToastify.css'; import { Formik, Form, ErrorMessage, Field } from 'formik'; import * as Yup from 'yup'; -import anonymous from './anonymous'; +import anonymous from '../../component/anonymous'; -import sketchbook from '../Image/Sketchbook2.png'; +import sketchbook from '../../assets/image/Sketchbook2.png'; const Div = styled.div` flex-grow: 3; @@ -116,7 +116,6 @@ function MemoText({ fontColor: rollTypeColor, password: 1, }; - console.log(textcase); if (textcase.nickname === '') { textcase.nickname = anonymous(); } @@ -125,11 +124,7 @@ function MemoText({ const paperId = localStorage.getItem('paperId'); navigate(`/rolling/${paperId}`); }; - // const handleInputChange = e => { - // setMemoContent(e.target.value); - // // eslint-disable-next-line - // console.log('작성내용: ', memoContent); - // }; + const MemoSchema = Yup.object().shape({ text: Yup.string().max(40, '40자가 넘었습니다!').required('비어있습니다!'), }); diff --git a/src/Page/MyPage.js b/src/page/MyPage/MyPage.js similarity index 91% rename from src/Page/MyPage.js rename to src/page/MyPage/MyPage.js index 8986f5f..11ea67a 100644 --- a/src/Page/MyPage.js +++ b/src/page/MyPage/MyPage.js @@ -9,9 +9,9 @@ import SketchBook from './MyPageSketch'; import Line from './MyPageLine'; import MyPageItems from './MyPageItems'; -import background from '../Image/welcome1.png'; +import background from '../../assets/image/welcome1.png'; -import './Mypage.css'; +import '../../style/Mypage.css'; const backBaseUrl = process.env.REACT_APP_BACKEND_URL; @@ -62,19 +62,15 @@ function MyPage() { try { const datas = await axios.get(`${backBaseUrl}/api/v1/users/${userId}`); // eslint-disable-next-line - console.log('successGet'); setMyRollPageData(datas.data); - console.log(datas); } catch (e) { // 서버에서 받은 에러 메시지 출력 // eslint-disable-next-line - console.log(e); } }; GetPapers(); }, []); // eslint-disable-next-line - // console.log(myRollPageData); const navigate = useNavigate(); return (
diff --git a/src/Page/MyPageItem.js b/src/page/MyPage/MyPageItem.js similarity index 93% rename from src/Page/MyPageItem.js rename to src/page/MyPage/MyPageItem.js index b1aad22..3bb1c5f 100644 --- a/src/Page/MyPageItem.js +++ b/src/page/MyPage/MyPageItem.js @@ -2,11 +2,11 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { useNavigate } from 'react-router-dom'; -import image1 from '../Image/smallimage1.png'; -import image2 from '../Image/smallimage2.png'; -import image3 from '../Image/smallimage3.png'; -import image4 from '../Image/smallimage4.png'; -import image5 from '../Image/smallimage5.png'; +import image1 from '../../assets/image/smallimage1.png'; +import image2 from '../../assets/image/smallimage2.png'; +import image3 from '../../assets/image/smallimage3.png'; +import image4 from '../../assets/image/smallimage4.png'; +import image5 from '../../assets/image/smallimage5.png'; const ButtonItem = styled.button` width: 20rem; @@ -58,8 +58,6 @@ function MyPageItem({ dataColumn }) { alert('복사 실패! (지원하지 않는 환경입니다)'); } }; - // console.log(dataColumn.title); - // console.log(dataColumn.create_at); const [backgroundImg, setBackgroundImg] = useState(); function bgimage(paperUrl) { if (paperUrl === '1') { diff --git a/src/Page/MyPageItems.js b/src/page/MyPage/MyPageItems.js similarity index 87% rename from src/Page/MyPageItems.js rename to src/page/MyPage/MyPageItems.js index 1a155b0..80736df 100644 --- a/src/Page/MyPageItems.js +++ b/src/page/MyPage/MyPageItems.js @@ -3,11 +3,8 @@ import styled from 'styled-components'; import MyPageItem from './MyPageItem'; function MyPageItems({ myRollPageData }) { - // console.log(myRollPageData?.paper_data); // const [isLoading, setIsLoading] = useState(false); const a = myRollPageData?.paper_data; - // console.log(a); - // console.log(typeof a); const paperList = a && a.map(dataColumn => ); // setIsLoading(true); diff --git a/src/Page/MyPageLine.js b/src/page/MyPage/MyPageLine.js similarity index 100% rename from src/Page/MyPageLine.js rename to src/page/MyPage/MyPageLine.js diff --git a/src/Page/MyPageProfile.js b/src/page/MyPage/MyPageProfile.js similarity index 96% rename from src/Page/MyPageProfile.js rename to src/page/MyPage/MyPageProfile.js index 907d44d..39635d1 100644 --- a/src/Page/MyPageProfile.js +++ b/src/page/MyPage/MyPageProfile.js @@ -1,6 +1,6 @@ import React from 'react'; import styled from 'styled-components'; -import user from '../Image/user.png'; +import user from '../../assets/image/user.png'; function Profile({ myRollPageData }) { return ( diff --git a/src/Page/MyPageSketch.js b/src/page/MyPage/MyPageSketch.js similarity index 75% rename from src/Page/MyPageSketch.js rename to src/page/MyPage/MyPageSketch.js index 7b5f194..bd0af77 100644 --- a/src/Page/MyPageSketch.js +++ b/src/page/MyPage/MyPageSketch.js @@ -1,14 +1,14 @@ import React from 'react'; import styled from 'styled-components'; -import sketchbook from '../Image/sketchbookLogin.png'; + import Profile from './MyPageProfile'; const SketchBookImg = styled.div` width: 80rem; height: 25rem; - // border: 5px solid #535353; + background-size: 80rem 25rem; - /* background-image: url(${sketchbook}); */ + margin: auto; `; diff --git a/src/Page/PhotoModal.js b/src/page/PhotoModal.js similarity index 98% rename from src/Page/PhotoModal.js rename to src/page/PhotoModal.js index 6b2017b..63b186e 100644 --- a/src/Page/PhotoModal.js +++ b/src/page/PhotoModal.js @@ -3,7 +3,7 @@ import React, { useCallback, useState } from 'react'; import { useLocation } from 'react-router-dom'; import ReactDOM from 'react-dom'; import Modal from 'react-modal'; -import './Background.css'; +import '../style/Background.css'; import styled from 'styled-components'; import 'react-toastify/dist/ReactToastify.css'; import { toast, ToastContainer } from 'react-toastify'; @@ -160,7 +160,6 @@ function PhotoModal({ { - // console.log(files[0].file); ClickUpload(); closeModal(); }} diff --git a/src/Page/PhotoReSizing.js b/src/page/PhotoReSizing.js similarity index 94% rename from src/Page/PhotoReSizing.js rename to src/page/PhotoReSizing.js index 880f72c..792f805 100644 --- a/src/Page/PhotoReSizing.js +++ b/src/page/PhotoReSizing.js @@ -17,7 +17,6 @@ const PhotoReSizing = async function resizing(unReSizePhoto) { }); return resultFile; - // console.log('PhotoResizing Success'); // resize된 이미지의 url을 받아 fileUrl에 저장 // const promise = imageCompression.getDataUrlFromFile(compressedFile); diff --git a/src/Page/Register.js b/src/page/Register.js similarity index 98% rename from src/Page/Register.js rename to src/page/Register.js index 08e73db..cae57bb 100644 --- a/src/Page/Register.js +++ b/src/page/Register.js @@ -8,10 +8,10 @@ import { useNavigate } from 'react-router-dom'; import 'react-toastify/dist/ReactToastify.css'; import Modal from './Login'; -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; @@ -157,7 +157,6 @@ function Register({ setLogState }) { setIsSubmit(true); const { email, nickname, password } = values; - console.log(backBaseUrl); try { await axios.post(`${backBaseUrl}/api/v1/users/signup`, { email, diff --git a/src/Page/NewPhoto.js b/src/page/RollingPaper/NewPhoto.js similarity index 62% rename from src/Page/NewPhoto.js rename to src/page/RollingPaper/NewPhoto.js index 4426fba..16dd8a9 100644 --- a/src/Page/NewPhoto.js +++ b/src/page/RollingPaper/NewPhoto.js @@ -1,17 +1,9 @@ // import styled from 'styled-components'; -import React, { useState, useEffect } from 'react'; +import React, { useState } from 'react'; import ResizableRect from 'react-resizable-rotatable-draggable'; -// import photoReSizing from './PhotoReSizing'; - -// import img from '../Image/ID.png'; export default function NewPhoto({ parentFunction, photo }) { - // const [width2, setWidth] = useState(200); - // const [height2, setHeight] = useState(100); - // const [top2, setTop] = useState(100); - // const [left2, setLeft] = useState(100); - // const [rotateAngle, setRotateAngle] = useState(0); const [position, setPosition] = useState({ width2: 100, height2: 100, @@ -34,14 +26,12 @@ export default function NewPhoto({ parentFunction, photo }) { height2: height, left2: left, })); - // console.log(position); }; const handleRotate = rotateAngle2 => { setPosition(prevState => ({ ...prevState, rotate2: rotateAngle2, })); - // console.log(position); }; const handleDrag = (deltaX, deltaY) => { @@ -50,32 +40,14 @@ export default function NewPhoto({ parentFunction, photo }) { top2: position.top2 + deltaY, left2: position.left2 + deltaX, })); - // console.log(position); }; parentFunction(position); - // const [rawLog, setRawLog] = useState(); - // useEffect(() => { - // const reader = new FileReader(); - // reader.readAsDataURL(photo); // 파일을 읽는 메서드 - // reader.onload = () => { - // setRawLog(reader.result); - // // console.log('@@@@@@@@@@@@@@@@', rawLog); - // }; - // }, []); - - // photoReSizing(rawLog, setRawLog); - useEffect(() => { - // console.log(photo); - }, [photo]); - return (
); } - -// const Image = styled.div` -// width: 100%; -// height: 100%; -// background-image: url(https://vignette.wikia.nocookie.net/blogclan-2/images/b/b9/Random-image-15.jpg/revision/latest?cb=20160706220047); -// background-size: 100% 100%; -// `; -// const MemoBox = styled.div` -// width: 160px; -// height: 160px; -// background-color: yellow; -// border-radius: 15px; -// `; diff --git a/src/Page/NewSticky.js b/src/page/RollingPaper/NewSticky.js similarity index 92% rename from src/Page/NewSticky.js rename to src/page/RollingPaper/NewSticky.js index 44c8bd6..355919d 100644 --- a/src/Page/NewSticky.js +++ b/src/page/RollingPaper/NewSticky.js @@ -1,11 +1,11 @@ import styled from 'styled-components'; import React, { useState, useRef } from 'react'; import Draggable from 'react-draggable'; -import './Active.css'; +import '../../style/Active.css'; export default function NewSticky({ skickyUrl, setCoor }) { const nodeRef = useRef(null); - const [position, setPosition] = useState({ x: 0, y: 0 }); + const [position, setPosition] = useState({ x: 70, y: 70 }); const [Opacity, setOpacity] = useState(false); diff --git a/src/Page/Rolling.js b/src/page/RollingPaper/Rolling.js similarity index 90% rename from src/Page/Rolling.js rename to src/page/RollingPaper/Rolling.js index cac4f71..b2100e8 100644 --- a/src/Page/Rolling.js +++ b/src/page/RollingPaper/Rolling.js @@ -5,33 +5,33 @@ import { FcExpand, FcCancel } from 'react-icons/fc'; import { useNavigate, useLocation } from 'react-router-dom'; import styled from 'styled-components'; import axios from 'axios'; -import Loading from './Loading'; - -import image1 from '../Image/image1.png'; -import image2 from '../Image/image2.png'; -import image3 from '../Image/image3.png'; -import image4 from '../Image/image4.png'; -import image5 from '../Image/image5.png'; -import PhotoModal from './PhotoModal'; +import Loading from '../../component/Loading'; + +import image1 from '../../assets/image/image1.png'; +import image2 from '../../assets/image/image2.png'; +import image3 from '../../assets/image/image3.png'; +import image4 from '../../assets/image/image4.png'; +import image5 from '../../assets/image/image5.png'; +import PhotoModal from '../PhotoModal'; import Memo from './RollingMemo'; import Sticky from './RollingSticky'; import Photo from './RollingPhoto'; -import NewPhoto from './NewPhoto'; import NewMemo from './newMemo'; import NewSticky from './NewSticky'; +import NewPhoto from './NewPhoto'; -import pencilicon from '../Image/pencilicon.png'; -import galleryicon from '../Image/galleryicon.png'; -import memoicon from '../Image/memoicon.svg'; -import usericon from '../Image/usericon.png'; -import StickerModal from './StickerModal'; +import pencilicon from '../../assets/image/pencilicon.png'; +import galleryicon from '../../assets/image/galleryicon.png'; +import memoicon from '../../assets/image/memoicon.svg'; +import usericon from '../../assets/image/usericon.png'; +import StickerModal from '../StickerModal'; import 'react-toastify/dist/ReactToastify.css'; -import userback from '../Image/userbackimg.png'; +import userback from '../../assets/image/userbackimg.png'; -import './snow.css'; +import '../../style/snow.css'; -import KakaoShare from './KakaoShare'; +import KakaoShare from '../../component/KakaoShare'; const backBaseUrl = process.env.REACT_APP_BACKEND_URL; @@ -243,23 +243,18 @@ function Rolling() { try { const item = await axios.get(`${backBaseUrl}/api/v1/papers/${paperId}/`); // ###관리자로 로그인 돼있을 경우 IsAdmin활성화!####### - // console.log(item.data); if (item.data.user === localStorage.getItem('id')) { setIsAdmin(true); - // console.log('hihihihihihi'); } // /########################### - console.log('폴링 중입니다!!!!!!!!!!!'); setItems(item.data); setLength( item.data.memo.length + item.data.image.length + item.data.sticker.length, ); - // console.log(backgroundImg); } catch (e) { // 서버에서 받은 에러 메시지 출력 - console.log('FailGet'); } }; @@ -293,9 +288,7 @@ function Rolling() { } }, []); - useEffect(() => { - console.log(memoData); - }, [memoData]); + useEffect(() => {}, [memoData]); const openPhotoModal = useCallback(() => setIsPhotoOpen(true), []); // 사진 모달창 열기 const closePhotoModal = useCallback(() => setIsPhotoOpen(false), []); // 사진 모달창 닫기 const openStickyModal = useCallback(() => setIsStickyOpen(true), []); // 스티커 모달창 열기 @@ -314,7 +307,6 @@ function Rolling() { password: '1', }) .then(() => { - console.log('delete!!!!!!!!!!!!!!'); setDeleteAction(true); }); }, []); @@ -324,7 +316,6 @@ function Rolling() { password: '1', }) .then(() => { - console.log('delete!!!!!!!!!!!!!!'); setDeleteAction(true); }); }, []); @@ -335,7 +326,6 @@ function Rolling() { password: '1234', }) .then(() => { - console.log('delete!!!!!!!!!!!!!!'); setDeleteAction(true); }); }, []); @@ -350,20 +340,16 @@ function Rolling() { return; } - console.log(memoData); - try { await axios.post( `${backBaseUrl}/api/v1/papers/${paperId}/memos`, memoData, ); - console.log('successSave!!!!'); setIsMemo(false); // 메모기능 비활성화 setIsActive(false); // 수정기능 비활성화 } catch (e) { // 서버에서 받은 에러 메시지 출력 - console.log(e); } }; @@ -383,12 +369,10 @@ function Rolling() { rotate: 30, }); - console.log('successSticky!!!!'); setIsSticky(false); // 스티커 기능 비활성화 setIsActive(false); // 수정 기능 비활성화 } catch (e) { // 서버에서 받은 에러 메시지 출력 - console.log(e); } }; @@ -398,11 +382,9 @@ function Rolling() { setIsPhoto(false); // 사진기능 비활성화 setIsActive(false); // 수정기능 비활성화 setPhoto(''); - console.log(photo.image_id); HandlePhotoDelete(photo.image_id); return; } - console.log(photo); // if (photo === '') { // setIsPhoto(false); // 사진기능 비활성화 // setIsActive(false); // 수정기능 비활성화 @@ -410,7 +392,6 @@ function Rolling() { setLoading(true); - console.log('start Resizing'); axios .post(`${backBaseUrl}/api/v1/papers/${paperId}/xyphotos`, { image_id: photo.image_id, @@ -422,15 +403,12 @@ function Rolling() { height: coor.height2, }) .then(() => { - console.log('successPhoto!!!!'); setIsPhoto(false); // 사진 기능 비활성화 setIsActive(false); // 수정 기능 비활성화 setPhoto(''); setLoading(false); }) .catch(() => { - console.log(photo.image_id); - console.log('fail save photo'); setLoading(true); }); }; @@ -442,10 +420,8 @@ function Rolling() { `${backBaseUrl}/api/v1/papers/${paperId}/`, ); // ###관리자로 로그인 돼있을 경우 IsAdmin활성화!####### - // console.log(item.data); if (item.data.user === localStorage.getItem('id')) { setIsAdmin(true); - // console.log('hihihihihihi'); } // /########################### setItems(item.data); @@ -455,23 +431,18 @@ function Rolling() { item.data.sticker.length, ); bgimage(item.data.paper_url); - // console.log(backgroundImg); } catch (e) { // 서버에서 받은 에러 메시지 출력 - console.log('FailGet'); } setDeleteAction(false); }; getMemos(); }, [isActive, deleteAction]); - // console.log(backgroundImg); const parentFunction = positon => { setCoor(positon); - // console.log(coor); }; - // console.log(items.image); // 스티커?메모지?사진? 확인해주고 어떤 것이 새로 생겨서 움직일 것인지 정해주는 함수 function isItem() { return isMemo ? ( diff --git a/src/Page/RollingMemo.js b/src/page/RollingPaper/RollingMemo.js similarity index 77% rename from src/Page/RollingMemo.js rename to src/page/RollingPaper/RollingMemo.js index f932597..5b3040b 100644 --- a/src/Page/RollingMemo.js +++ b/src/page/RollingPaper/RollingMemo.js @@ -2,11 +2,7 @@ import styled from 'styled-components'; import React, { useState, useRef } from 'react'; import Draggable from 'react-draggable'; -import DeleteBtn from '../Component/DeleteBtn'; -// import axios from 'axios'; - -// import axios from 'axios'; -// const backBaseUrl = process.env.REACT_APP_BACKEND_URL; +import DeleteBtn from '../../component/DeleteBtn'; export default function App({ list, isAdmin, HandleMemoDelete }) { const nodeRef = useRef(null); @@ -23,7 +19,6 @@ export default function App({ list, isAdmin, HandleMemoDelete }) { // password, } = list; - // console.log(list); // eslint-disable-next-line no-unused-vars const [position, setPosition] = useState({ x: 0, y: 0 }); @@ -36,25 +31,9 @@ export default function App({ list, isAdmin, HandleMemoDelete }) { const handleStart = () => { setOpacity(true); }; - // const paperId = localStorage.getItem('paperId'); const handleEnd = async () => { setOpacity(false); - // try { - // // ###############새로운 api들어와야 함!!!!!!!!!!!!!!!!!!!!!!!!######## - // await axios.post(`${backBaseUrl}/api/v1/papers/${paperId}/memos`, { - // content, - // nickname, - // font, - // password, - // color, - // font_color, - // xcoor, - // ycoor, - // }); - // } catch (e) { - // console.log('error!!!!!!!!!!!'); - // } }; return ( diff --git a/src/Page/RollingPhoto.js b/src/page/RollingPaper/RollingPhoto.js similarity index 74% rename from src/Page/RollingPhoto.js rename to src/page/RollingPaper/RollingPhoto.js index a4f469e..ff7e020 100644 --- a/src/Page/RollingPhoto.js +++ b/src/page/RollingPaper/RollingPhoto.js @@ -2,11 +2,10 @@ import React, { useState } from 'react'; import ResizableRect from 'react-resizable-rotatable-draggable'; -import DeleteBtn from '../Component/DeleteBtn'; +import DeleteBtn from '../../component/DeleteBtn'; export default function NewPhoto({ list, isAdmin, HandlePhotoDelete }) { const { image_url, xcoor, ycoor, rotate, width, height, image_id } = list; - // console.log(list); // eslint-disable-next-line no-unused-vars const [position, setPosition] = useState({ width2: width, @@ -15,41 +14,7 @@ export default function NewPhoto({ list, isAdmin, HandlePhotoDelete }) { left2: ycoor, rotate2: rotate, }); - // console.log(position); - // console.log(setPosition); - // const handleDrag = (deltaX, deltaY) => { - // setPosition(prevState => ({ - // ...prevState, - // top2: position.top2 + deltaY, - // left2: position.left2 + deltaX, - // })); - // // console.log(position); - // }; - - // const handleResize = style => { - // // eslint-disable-next-line no-shadow - // let { top, left, width, height } = style; - // top = Math.round(top); - // left = Math.round(left); - // width = Math.round(width); - // height = Math.round(height); - // setPosition(prevState => ({ - // ...prevState, - // width2: width, - // top2: top, - // height2: height, - // left2: left, - // })); - // // console.log(position); - // }; - // const handleRotate = rotateAngle2 => { - // setPosition(prevState => ({ - // ...prevState, - // rotate2: rotateAngle2, - // })); - // // console.log(position); - // }; return (
{isAdmin ? ( @@ -64,7 +29,6 @@ export default function NewPhoto({ list, isAdmin, HandlePhotoDelete }) { rotate: `${rotate}deg`, position: 'absolute', zIndex: 1, - // border: '1px solid black', }} alt="" /> @@ -75,9 +39,7 @@ export default function NewPhoto({ list, isAdmin, HandlePhotoDelete }) { left: xcoor, top: ycoor, position: 'absolute', - // border: '1px solid black', rotate: `${rotate}deg`, - // zIndex: 0, }} > { try { setFiles(await axios.get(`${backBaseUrl}/api/v1/papers/sticker_list`)); - console.log(files); - console.log('filesget'); } catch (e) { console.log(e); } diff --git a/src/Page/Onlog.js b/src/page/Welcome/Onlog.js similarity index 98% rename from src/Page/Onlog.js rename to src/page/Welcome/Onlog.js index 21ada08..fa5fa86 100644 --- a/src/Page/Onlog.js +++ b/src/page/Welcome/Onlog.js @@ -1,7 +1,7 @@ import React, { useCallback, useState } from 'react'; import { useNavigate } from 'react-router-dom'; import styled from 'styled-components'; -import Modal from './Login'; +import Modal from '../Login'; const TopPosition = styled.div` /* background-color: #fcedb0; */ diff --git a/src/Page/Outlog.js b/src/page/Welcome/Outlog.js similarity index 100% rename from src/Page/Outlog.js rename to src/page/Welcome/Outlog.js diff --git a/src/Page/Welcome.js b/src/page/Welcome/Welcome.js similarity index 89% rename from src/Page/Welcome.js rename to src/page/Welcome/Welcome.js index ec90467..c39f856 100644 --- a/src/Page/Welcome.js +++ b/src/page/Welcome/Welcome.js @@ -2,18 +2,18 @@ import React, { useState, useEffect, useCallback } from 'react'; import styled from 'styled-components'; import { useNavigate } from 'react-router-dom'; -import Modal from './Login'; +import Modal from '../Login'; // import HandMotion from './handMotion'; -import './welcome.css'; -import './button.css'; +import '../../style/welcome.css'; +import '../../style/button.css'; import OnLog from './Onlog'; import Outlog from './Outlog'; -import background from '../Image/welcome1.png'; -import logo from '../Image/newlogo.png'; -import back from '../Image/welcome3.png'; -import down from '../Image/down.png'; +import background from '../../assets/image/welcome1.png'; +import logo from '../../assets/image/newlogo.png'; +import back from '../../assets/image/welcomedown.png'; +import down from '../../assets/image/down.png'; const UpBtn = styled.button` display: inline; @@ -49,8 +49,8 @@ const RollITLogo = styled.div` `; const BackImg = styled.div` height: 100vh; - background-color: #ffcdcd; - background-size: 68rem 43rem; + background-color: #ffd7e9; + background-size: 53rem 38rem; background-repeat: no-repeat; background-position: center; background-image: url(${back}); diff --git a/src/Page/Active.css b/src/style/Active.css similarity index 100% rename from src/Page/Active.css rename to src/style/Active.css diff --git a/src/Page/Background.css b/src/style/Background.css similarity index 65% rename from src/Page/Background.css rename to src/style/Background.css index d8048c3..7d73c66 100644 --- a/src/Page/Background.css +++ b/src/style/Background.css @@ -1,5 +1,5 @@ body .register { - background: url(../Image/welcome1.png); + background: url(../assets/image/welcome1.png); background-repeat: no-repeat; background-size: cover; background-position: center; @@ -11,7 +11,7 @@ body .register { } body .mypage { - background: url(../Image/welcome1.png); + background: url(../assets/image/welcome1.png); /* width: 100vw; */ background-repeat: no-repeat; background-size: cover; @@ -22,26 +22,12 @@ body .mypage { height: 100vh; } */ -body .login { - background: url(../Image/sketchbookLogin.png); - background-repeat: no-repeat; - background-color: #fcedb0; - background-size: cover; - background-size: 90rem 50rem; - background-position: center; -} -@media screen and (max-width: 63rem) { - body .login { - background-size: 50rem 40rem; - } -} - body .filepond--root, .filepond--root { height: 30rem; background-color: white; margin: auto; - border-color: #FFD7E3; + border-color: #ffd7e3; border-width: 10px; border-style: dashed; border-radius: 25px; @@ -49,7 +35,7 @@ body .filepond--root, body .filepond--drop-label { height: 29rem; background-color: white; - background-image: url(../Image/upload.png); + background-image: url(../assets/image/upload.png); background-position: center; background-repeat: no-repeat; diff --git a/src/Page/Loading.css b/src/style/Loading.css similarity index 100% rename from src/Page/Loading.css rename to src/style/Loading.css diff --git a/src/Page/Mypage.css b/src/style/Mypage.css similarity index 100% rename from src/Page/Mypage.css rename to src/style/Mypage.css diff --git a/src/Page/button.css b/src/style/button.css similarity index 100% rename from src/Page/button.css rename to src/style/button.css diff --git a/src/Page/snow.css b/src/style/snow.css similarity index 100% rename from src/Page/snow.css rename to src/style/snow.css diff --git a/src/Page/welcome.css b/src/style/welcome.css similarity index 86% rename from src/Page/welcome.css rename to src/style/welcome.css index 89c7c51..77489dd 100644 --- a/src/Page/welcome.css +++ b/src/style/welcome.css @@ -13,19 +13,17 @@ } .topBtn { - background-image: url(../Image/down.png); + background-image: url(../assets/image/down.png); background-size: cover; margin-left: 12.5rem; - position: absolute; + position: absolute; bottom: 2rem; - width: 5rem; + width: 5rem; height: 5rem; border-radius: 100%; cursor: pointer; } - - @keyframes handmove { 0% { transform: rotate(0deg) translateY(0px);