From 3dce38499f1b652c7dcd17f14c89b0cff2677f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=98=81=ED=98=B8?= Date: Mon, 12 Feb 2024 21:10:31 +0900 Subject: [PATCH 01/17] refactor: app.js --- src/App.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/App.js b/src/App.js index f14dab7..05a84fb 100644 --- a/src/App.js +++ b/src/App.js @@ -1,11 +1,13 @@ import React, { useEffect } from "react"; import "./App.css"; import { Routes, Route, Navigate, useLocation } from "react-router-dom"; +import { useAsync } from "react-async"; import "bootstrap/dist/css/bootstrap.min.css"; // layouts import MainLayout from "./layouts/MainLayout"; import ApplyBanner from "./layouts/applyBanner/ApplyBanner"; +import ScrollToTop from "layouts/ScrollToTop"; // pages import Main from "./pages/main_page/Main"; @@ -16,11 +18,12 @@ import ApplyGuide from "./pages/apply_page/applyGuide/ApplyGuide"; import Not_allow_apply from "pages/Not_allow_page/Not_allow_apply"; import { MiddleResult } from "pages/result_page/MiddleResult"; import { FinalResult } from "pages/result_page/FinalResult"; -import ScrollToTop from "layouts/ScrollToTop"; import NotFound from "pages/NotFound"; + +// apis import { get_recruit_info } from "apis/get_recruit"; -import { useAsync } from "react-async"; +// hooks import usePageTracking from "./hooks/ga_tracking"; import ReactGA from "react-ga"; @@ -37,9 +40,7 @@ const App = () => { } /> } /> } /> - {/* 추가된 부분 */} } /> - {/* apply페이지 경로 -> */} } /> } /> } /> @@ -55,6 +56,7 @@ const App = () => { ); }; +// ApplyPage 이동 권한 확인 후 이동 const ApplyCheck = () => { const { data, error, isLoading } = useAsync({ promiseFn: get_recruit_info }); From 8f2ee39d9764678cff6531cf6cee3d7ac117fef1 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 14:51:45 +0900 Subject: [PATCH 02/17] refactor: ImgMain style --- src/pages/main_page/ImgMain/ImgMain.css | 120 +++++++++++++++++++++++ src/pages/main_page/ImgMain/ImgMain.js | 5 +- src/pages/main_page/ImgMain/ImgMain_1.js | 12 +-- src/pages/main_page/ImgMain/ImgMain_2.js | 96 ++---------------- src/pages/main_page/ImgMain/ImgMain_3.js | 90 ++++------------- src/pages/main_page/Main.css | 1 - 6 files changed, 153 insertions(+), 171 deletions(-) create mode 100644 src/pages/main_page/ImgMain/ImgMain.css diff --git a/src/pages/main_page/ImgMain/ImgMain.css b/src/pages/main_page/ImgMain/ImgMain.css new file mode 100644 index 0000000..13ec3b3 --- /dev/null +++ b/src/pages/main_page/ImgMain/ImgMain.css @@ -0,0 +1,120 @@ +.ImgMain { + position: relative; + + font-family: 'IBMPlexSans-Regular'; + text-align: center; + font-style: normal; + + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + color: black; +} + +.ImgMainBox { + position: relative; + + width: 1920px; + height: 1005px; + + display: flex; + + justify-content: center; +} + +.ImgMainStyle { + width: 1920px; + height: 1005px; +} + +.BlackBackgroundStyle { + /* position: "relative"; */ + + width: 1920px; + height: 1005px; + + background: black; +} + +.GrayFilterStyle { + position: absolute; + + width: 1920px; + height: 1005px; + /* height: 100%; */ + + display: flex; + justify-content: center; + + /* background: rgba(100, 10, 200, 0.6); */ + background: rgba(0, 0, 0, 0.6); +} + + +.LetterBox_1 { + position: absolute; + + top: 805px; +} + +.LetterBox_2 { + position: relative; + text-align: left; + + top: 444px; + left: 310px; + + /* width: 466px; */ + width: 480px; + height: 135px; +} + +.LetterBox_2_1{ + display: inline-block; +} + +.LetterBox_3 { + position: absolute; + + width: 1300px; + height: 80px; + + text-align: left; + + justify-content: space-between; + display: flex; + + top: 721px; +} + +.LetterBox_3_1 { + position: relative; + + /* width: 341px; */ + width: 370px; + + display: inline-block, ; + justify-content: left; +} + +.WhiteWord { + color: #ffffff; +} + +.BlueWord { + color: #55A9BE; +} + +.Title { + font-weight: 700; + font-size: 30px; + line-height: 150%; +} + +.Content { + font-weight: 400; + font-size: 20px; + line-height: 150%; +} \ No newline at end of file diff --git a/src/pages/main_page/ImgMain/ImgMain.js b/src/pages/main_page/ImgMain/ImgMain.js index 50368e1..3aa3cec 100644 --- a/src/pages/main_page/ImgMain/ImgMain.js +++ b/src/pages/main_page/ImgMain/ImgMain.js @@ -4,12 +4,11 @@ import ImgMain_1 from "./ImgMain_1"; import ImgMain_2 from "./ImgMain_2"; import ImgMain_3 from "./ImgMain_3"; -// styles -import "../Main.css"; +import "./ImgMain.css"; const ImgMain = () => { return ( -
+
diff --git a/src/pages/main_page/ImgMain/ImgMain_1.js b/src/pages/main_page/ImgMain/ImgMain_1.js index 7aa75e8..8b6bc3d 100644 --- a/src/pages/main_page/ImgMain/ImgMain_1.js +++ b/src/pages/main_page/ImgMain/ImgMain_1.js @@ -4,19 +4,13 @@ import img_1 from "../components/img/main_img_1.png"; import GoToApply from "../components/GoToApply"; -import "../Main.css"; +import "./ImgMain.css"; const ImgMain_1 = () => { return ( -
+
-
+
2023 1학기 신입 부원 모집
diff --git a/src/pages/main_page/ImgMain/ImgMain_2.js b/src/pages/main_page/ImgMain/ImgMain_2.js index 750ee3a..22b713b 100644 --- a/src/pages/main_page/ImgMain/ImgMain_2.js +++ b/src/pages/main_page/ImgMain/ImgMain_2.js @@ -1,98 +1,18 @@ import React from "react"; +// 사용하지 않는 이미지 -> 삭제 필요 import img_2 from "../components/img/main_img_2.png"; -import "../Main.css"; +import "./ImgMain.css"; const ImgMain_2 = () => { return ( -
-
-
-
- CSPCLAB은 -
-
-
- 소수정예 -
-
- 를 지향하는 -
-
-
- 서강대학교 컴퓨터공학과 학회입니다. -
-
+
+
+
CSPCLAB은
+
소수정예
+
를 지향하는
+
서강대학교 컴퓨터공학과 학회입니다.
); diff --git a/src/pages/main_page/ImgMain/ImgMain_3.js b/src/pages/main_page/ImgMain/ImgMain_3.js index 33cc146..e67daf9 100644 --- a/src/pages/main_page/ImgMain/ImgMain_3.js +++ b/src/pages/main_page/ImgMain/ImgMain_3.js @@ -4,85 +4,35 @@ import img_3 from "../components/img/main_img_3.png"; import "../components/GoToApply"; -import "../Main.css"; +import "./ImgMain.css"; + import GoToApply from "../components/GoToApply"; const ImgMain_3 = () => { return ( -
+
- {/* gray rectangle */} -
-
-
랩실 관리
-
- 리치과학관 914호 실습실을 관리합니다. -
-
- 스터디/프로젝트 -
-
- 함께 배우고 싶은 것 무엇이든 응원합니다. +
+
+
+
랩실관리
+
+ 리치과학관 914호를 관리합니다. +
-
- 선배 찬스 +
+
스터디/프로젝트
+
+ 함께 배우고 싶은 것 무엇이든 응원합니다. +
-
- 언제든 물어볼 수 있는 선배가 있어 든든합니다. +
+
선배 찬스
+
+ 언제든 물어볼 수 있는 선배가 있어 든든합니다. +
-
); diff --git a/src/pages/main_page/Main.css b/src/pages/main_page/Main.css index 1f1c8bc..9860717 100644 --- a/src/pages/main_page/Main.css +++ b/src/pages/main_page/Main.css @@ -17,7 +17,6 @@ src: url('./components/fonts/IBMPlexSans-Regular.ttf'); } - .ImgMainStyle { position: relative; width: 1920px; From 7f03dbd3e6e4abca87f9cceec0a878971d65351c Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 15:30:39 +0900 Subject: [PATCH 03/17] refactor: GoToApply --- src/pages/main_page/components/GoToApply.css | 3 +++ src/pages/main_page/components/GoToApply.js | 12 +++--------- 2 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 src/pages/main_page/components/GoToApply.css diff --git a/src/pages/main_page/components/GoToApply.css b/src/pages/main_page/components/GoToApply.css new file mode 100644 index 0000000..9e4f0eb --- /dev/null +++ b/src/pages/main_page/components/GoToApply.css @@ -0,0 +1,3 @@ +.GoToApplyStyle { + position: absolute; +} \ No newline at end of file diff --git a/src/pages/main_page/components/GoToApply.js b/src/pages/main_page/components/GoToApply.js index d70553c..62a9416 100644 --- a/src/pages/main_page/components/GoToApply.js +++ b/src/pages/main_page/components/GoToApply.js @@ -1,19 +1,13 @@ import React from "react"; import { Link } from "react-router-dom"; -import Apply from "../../apply_page/Apply"; +// import Apply from "../../apply_page/Apply"; -import "../Main.css"; +import "./GoToApply.css"; const GoToApply = ({ top, left }) => { return ( -
+
From 594dbda8dacc0cb612618611a4b2bd7a287fb11c Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 16:09:24 +0900 Subject: [PATCH 04/17] refactor: ImgMain fix --- src/pages/main_page/ImgMain/ImgMain.css | 36 ++++++++++++++++++------ src/pages/main_page/ImgMain/ImgMain_1.js | 2 +- src/pages/main_page/ImgMain/ImgMain_2.js | 8 +++--- src/pages/main_page/ImgMain/ImgMain_3.js | 22 +++++++-------- src/pages/main_page/Main.css | 25 ++++++++-------- src/pages/main_page/Main.js | 2 +- 6 files changed, 56 insertions(+), 39 deletions(-) diff --git a/src/pages/main_page/ImgMain/ImgMain.css b/src/pages/main_page/ImgMain/ImgMain.css index 13ec3b3..d5a6eb3 100644 --- a/src/pages/main_page/ImgMain/ImgMain.css +++ b/src/pages/main_page/ImgMain/ImgMain.css @@ -20,16 +20,20 @@ height: 1005px; display: flex; + + background-color: aqua; justify-content: center; } .ImgMainStyle { + position: absolute; + width: 1920px; height: 1005px; } -.BlackBackgroundStyle { +.ImgMainBlackBackgroundStyle { /* position: "relative"; */ width: 1920px; @@ -38,7 +42,7 @@ background: black; } -.GrayFilterStyle { +.ImgMainGrayFilterStyle { position: absolute; width: 1920px; @@ -53,13 +57,15 @@ } -.LetterBox_1 { +.ImgMainLetterBox_1 { position: absolute; + font-size: 24px; + top: 805px; } -.LetterBox_2 { +.ImgMainLetterBox_2 { position: relative; text-align: left; @@ -71,11 +77,11 @@ height: 135px; } -.LetterBox_2_1{ +.ImgMainLetterBox_2_1{ display: inline-block; } -.LetterBox_3 { +.ImgMainLetterBox_3 { position: absolute; width: 1300px; @@ -89,7 +95,7 @@ top: 721px; } -.LetterBox_3_1 { +.ImgMainLetterBox_3_1 { position: relative; /* width: 341px; */ @@ -107,13 +113,25 @@ color: #55A9BE; } -.Title { +.ImgMain_1_Title { + font-weight: 700; + font-size: 24px; + line-height: 150%; +} + +.ImgMain_2_Title { + font-weight: 700; + font-size: 30px; + line-height: 150%; +} + +.ImgMain_3_Title { font-weight: 700; font-size: 30px; line-height: 150%; } -.Content { +.ImgMain_3_Content { font-weight: 400; font-size: 20px; line-height: 150%; diff --git a/src/pages/main_page/ImgMain/ImgMain_1.js b/src/pages/main_page/ImgMain/ImgMain_1.js index 8b6bc3d..55eadd2 100644 --- a/src/pages/main_page/ImgMain/ImgMain_1.js +++ b/src/pages/main_page/ImgMain/ImgMain_1.js @@ -10,7 +10,7 @@ const ImgMain_1 = () => { return (
-
+
2023 1학기 신입 부원 모집
diff --git a/src/pages/main_page/ImgMain/ImgMain_2.js b/src/pages/main_page/ImgMain/ImgMain_2.js index 22b713b..f21d439 100644 --- a/src/pages/main_page/ImgMain/ImgMain_2.js +++ b/src/pages/main_page/ImgMain/ImgMain_2.js @@ -7,11 +7,11 @@ import "./ImgMain.css"; const ImgMain_2 = () => { return ( -
-
+
+
CSPCLAB은
-
소수정예
-
를 지향하는
+
소수정예
+
를 지향하는
서강대학교 컴퓨터공학과 학회입니다.
diff --git a/src/pages/main_page/ImgMain/ImgMain_3.js b/src/pages/main_page/ImgMain/ImgMain_3.js index e67daf9..9cd3492 100644 --- a/src/pages/main_page/ImgMain/ImgMain_3.js +++ b/src/pages/main_page/ImgMain/ImgMain_3.js @@ -12,23 +12,23 @@ const ImgMain_3 = () => { return (
-
-
-
-
랩실관리
-
+
+
+
+
랩실관리
+
리치과학관 914호를 관리합니다.
-
-
스터디/프로젝트
-
+
+
스터디/프로젝트
+
함께 배우고 싶은 것 무엇이든 응원합니다.
-
-
선배 찬스
-
+
+
선배 찬스
+
언제든 물어볼 수 있는 선배가 있어 든든합니다.
diff --git a/src/pages/main_page/Main.css b/src/pages/main_page/Main.css index 9860717..4d417f5 100644 --- a/src/pages/main_page/Main.css +++ b/src/pages/main_page/Main.css @@ -17,43 +17,43 @@ src: url('./components/fonts/IBMPlexSans-Regular.ttf'); } -.ImgMainStyle { +/* .ImgMainStyle { position: relative; width: 1920px; height: 1005px; -} +} */ -.letterStyle_1 { +/* .letterStyle_1 { position: absolute; color: #ffffff; font-weight: 700; font-size: 24px; line-height: 31px; -} +} */ -.letterStyle_2 { +/* .letterStyle_2 { position: absolute; color: #ffffff; font-weight: 700; font-size: 20px; line-height: 26px; -} +} */ -.letterStyle_3 { +/* .letterStyle_3 { position: absolute; color: #ffffff; font-weight: 700; font-size: 30px; line-height: 39px; -} +} */ -.letterStyle_4 { +/* .letterStyle_4 { position: absolute; color: #ffffff; font-weight: 400; font-size: 20px; line-height: 26px; -} +} */ .letterStyle_5 { height: 45px; @@ -88,7 +88,6 @@ color: #ffffff; - /* 그림자 */ box-shadow: 0 10px 35px rgba(0, 0, 0, 0.05), 0 6px 6px rgba(0, 0, 0, 0.1); } @@ -131,7 +130,7 @@ border-radius: 10px; } -.WhiteWord { +/* .WhiteWord { font-weight: 700; font-size: 30px; line-height: 150%; @@ -145,4 +144,4 @@ line-height: 150%; color: #55A9BE; -} \ No newline at end of file +} */ \ No newline at end of file diff --git a/src/pages/main_page/Main.js b/src/pages/main_page/Main.js index cb899cf..84dfd31 100644 --- a/src/pages/main_page/Main.js +++ b/src/pages/main_page/Main.js @@ -2,7 +2,7 @@ import React from "react"; // components import ImgMain from "./ImgMain/ImgMain"; -import IntroduceMain from "./IntroduceMain"; +import IntroduceMain from "./IntroduceMain/IntroduceMain"; import MoreStory from "./MoreStory"; import MainApplyCard from "./MainApplyCard"; From 04f074007af83a6634430ec9d372e24cfc65a740 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 16:46:55 +0900 Subject: [PATCH 05/17] refactor: IntroduceMain --- src/pages/main_page/ImgMain/ImgMain.css | 2 +- src/pages/main_page/IntroduceMain.js | 104 ------------------ .../main_page/IntroduceMain/IntroduceMain.css | 77 +++++++++++++ .../main_page/IntroduceMain/IntroduceMain.js | 38 +++++++ .../main_page/IntroduceMain/MoreStory.css | 19 ++++ .../main_page/IntroduceMain/MoreStory.js | 16 +++ src/pages/main_page/Main.css | 9 +- src/pages/main_page/Main.js | 2 - src/pages/main_page/MoreStory.js | 23 ---- 9 files changed, 156 insertions(+), 134 deletions(-) delete mode 100644 src/pages/main_page/IntroduceMain.js create mode 100644 src/pages/main_page/IntroduceMain/IntroduceMain.css create mode 100644 src/pages/main_page/IntroduceMain/IntroduceMain.js create mode 100644 src/pages/main_page/IntroduceMain/MoreStory.css create mode 100644 src/pages/main_page/IntroduceMain/MoreStory.js delete mode 100644 src/pages/main_page/MoreStory.js diff --git a/src/pages/main_page/ImgMain/ImgMain.css b/src/pages/main_page/ImgMain/ImgMain.css index d5a6eb3..d61f63d 100644 --- a/src/pages/main_page/ImgMain/ImgMain.css +++ b/src/pages/main_page/ImgMain/ImgMain.css @@ -101,7 +101,7 @@ /* width: 341px; */ width: 370px; - display: inline-block, ; + display: inline-block; justify-content: left; } diff --git a/src/pages/main_page/IntroduceMain.js b/src/pages/main_page/IntroduceMain.js deleted file mode 100644 index b5266bc..0000000 --- a/src/pages/main_page/IntroduceMain.js +++ /dev/null @@ -1,104 +0,0 @@ -import React from "react"; -import "./Main.css"; - -// image -import img_picnic from "./components/img/main_img_picnic.png"; -import img_mt from "./components/img/main_img_mt.png"; -import img_party from "./components/img/main_img_party.png"; - -const IntroduceMain = () => { - return ( -
-
-
- 소수라서 더 끈끈한 -
- -
-
- -
- 소풍 -
-
-
- -
- MT -
-
-
- -
- 크리스마스 파티 -
-
-
-
-
- ); -}; - -export default IntroduceMain; diff --git a/src/pages/main_page/IntroduceMain/IntroduceMain.css b/src/pages/main_page/IntroduceMain/IntroduceMain.css new file mode 100644 index 0000000..028dbc0 --- /dev/null +++ b/src/pages/main_page/IntroduceMain/IntroduceMain.css @@ -0,0 +1,77 @@ +.IntroduceMain { + position: relative; + + font-family: 'IBMPlexSans-Regular'; + text-align: center; + font-style: normal; + + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + color: black; +} + +.IntroduceMainBox { + position: relative; + + text-align: left; + + width: 1300px; + height: 850px; +} + + +.IntroduceMainLetterBox_1 { + position: absolute; + + font-size: 30px; + font-weight: bold; + line-height: 150%; + + top: 167px; +} + +.IntroduceMainLetterBox_2 { + margin-top: 15px; + + font-size: 20px; + font-weight: bold; +} + +.IntroduceMainPictureBox_1 { + position: absolute; + + width: 1300px; + + justify-content: space-between; + display: flex; + + top: 242px; +} + +.IntroduceMainPictureBox_1_1 { + position: relative; + + display: inline-block; +} + +.ImgIntroduceStyle { + width: 390px; + height: 325px; + + border-radius: 10px; +} + +.IntroduceMainMoreStory { + position: absolute; + + display: flex; + justify-content: center; + align-items: center; + + width: 100%; + + top: 738px; +} \ No newline at end of file diff --git a/src/pages/main_page/IntroduceMain/IntroduceMain.js b/src/pages/main_page/IntroduceMain/IntroduceMain.js new file mode 100644 index 0000000..ffefffb --- /dev/null +++ b/src/pages/main_page/IntroduceMain/IntroduceMain.js @@ -0,0 +1,38 @@ +import React from "react"; +import "./IntroduceMain.css"; + +import MoreStory from "./MoreStory"; + +// image +import img_picnic from "../components/img/main_img_picnic.png"; +import img_mt from "../components/img/main_img_mt.png"; +import img_party from "../components/img/main_img_party.png"; + +const IntroduceMain = () => { + return ( +
+
+
소수라서 더 끈끈한
+
+
+ +
소풍
+
+
+ +
MT
+
+
+ +
크리스마스 파티
+
+
+
+ +
+
+
+ ); +}; + +export default IntroduceMain; diff --git a/src/pages/main_page/IntroduceMain/MoreStory.css b/src/pages/main_page/IntroduceMain/MoreStory.css new file mode 100644 index 0000000..cb4b032 --- /dev/null +++ b/src/pages/main_page/IntroduceMain/MoreStory.css @@ -0,0 +1,19 @@ +.MoreStory { + text-align: center; + + width: 193px; + height: 49px; +} + +.MoreStoryButton { + background: #000000; + color: #ffffff; + + font-size: 15px; + + width: 193px; + height: 49px; + + border-radius: 33px; + border: none; +} \ No newline at end of file diff --git a/src/pages/main_page/IntroduceMain/MoreStory.js b/src/pages/main_page/IntroduceMain/MoreStory.js new file mode 100644 index 0000000..994d537 --- /dev/null +++ b/src/pages/main_page/IntroduceMain/MoreStory.js @@ -0,0 +1,16 @@ +import React from "react"; +import { Link } from "react-router-dom"; + +import "./MoreStory.css"; + +const MoreStory = () => { + return ( +
+ + + +
+ ); +}; + +export default MoreStory; diff --git a/src/pages/main_page/Main.css b/src/pages/main_page/Main.css index 4d417f5..4055584 100644 --- a/src/pages/main_page/Main.css +++ b/src/pages/main_page/Main.css @@ -123,11 +123,12 @@ align-items: flex-end; } -.ImgIntroduceStyle{ +.WhiteWord { + color: #ffffff; +} - height: 356px; - - border-radius: 10px; +.BlueWord { + color: #55A9BE; } /* .WhiteWord { diff --git a/src/pages/main_page/Main.js b/src/pages/main_page/Main.js index 84dfd31..a8f4190 100644 --- a/src/pages/main_page/Main.js +++ b/src/pages/main_page/Main.js @@ -3,7 +3,6 @@ import React from "react"; // components import ImgMain from "./ImgMain/ImgMain"; import IntroduceMain from "./IntroduceMain/IntroduceMain"; -import MoreStory from "./MoreStory"; import MainApplyCard from "./MainApplyCard"; const Main = () => { @@ -11,7 +10,6 @@ const Main = () => { <> - ); diff --git a/src/pages/main_page/MoreStory.js b/src/pages/main_page/MoreStory.js deleted file mode 100644 index d513a7d..0000000 --- a/src/pages/main_page/MoreStory.js +++ /dev/null @@ -1,23 +0,0 @@ -import React from "react"; -import { Link } from "react-router-dom"; - -import "./Main.css"; - -const MoreStory = () => { - return ( -
- - - -
- ); -}; - -export default MoreStory; From 04c54d50797fe02693f5506a770da7b10936fd53 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 16:49:16 +0900 Subject: [PATCH 06/17] add: GoToApply --- src/pages/main_page/ImgMain/ImgMain.css | 2 -- src/pages/main_page/ImgMain/ImgMain_3.js | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/main_page/ImgMain/ImgMain.css b/src/pages/main_page/ImgMain/ImgMain.css index d61f63d..7eba7af 100644 --- a/src/pages/main_page/ImgMain/ImgMain.css +++ b/src/pages/main_page/ImgMain/ImgMain.css @@ -20,8 +20,6 @@ height: 1005px; display: flex; - - background-color: aqua; justify-content: center; } diff --git a/src/pages/main_page/ImgMain/ImgMain_3.js b/src/pages/main_page/ImgMain/ImgMain_3.js index 9cd3492..9ad8c48 100644 --- a/src/pages/main_page/ImgMain/ImgMain_3.js +++ b/src/pages/main_page/ImgMain/ImgMain_3.js @@ -34,6 +34,7 @@ const ImgMain_3 = () => {
+
); }; From 19ab4a9bd2a165b84dba2c6fdd95d70188cb0a3f Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 17:14:06 +0900 Subject: [PATCH 07/17] fix: GoToApply button style --- src/pages/main_page/components/GoToApply.css | 21 ++++++++++++++++++++ src/pages/main_page/components/GoToApply.js | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/pages/main_page/components/GoToApply.css b/src/pages/main_page/components/GoToApply.css index 9e4f0eb..f64e2a0 100644 --- a/src/pages/main_page/components/GoToApply.css +++ b/src/pages/main_page/components/GoToApply.css @@ -1,3 +1,24 @@ .GoToApplyStyle { position: absolute; +} + +.GoToButtonStyle { + width: 193px; + height: 49px; + + background: #55a9be; + border-radius: 194.5px; + border: #55a9be; + + font-weight: bold; + font-size: 20px; + + color: #ffffff; + + box-shadow: 0 10px 35px rgba(0, 0, 0, 0.05), 0 6px 6px rgba(0, 0, 0, 0.1); +} + +.GoToButtonStyle:hover { + background: #ffffff; + color: #55a9be; } \ No newline at end of file diff --git a/src/pages/main_page/components/GoToApply.js b/src/pages/main_page/components/GoToApply.js index 62a9416..b2ba674 100644 --- a/src/pages/main_page/components/GoToApply.js +++ b/src/pages/main_page/components/GoToApply.js @@ -9,7 +9,7 @@ const GoToApply = ({ top, left }) => { return (
- +
); From d7804df67e0b62327fdc05bf6a39c38931414e9c Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 17:14:32 +0900 Subject: [PATCH 08/17] refactor: MainApplyCard --- src/pages/main_page/ImgMain/ImgMain.css | 8 ++-- .../ApplyCardMain/MainApplyCard.css | 38 ++++++++++++++++ .../ApplyCardMain/MainApplyCard.js | 23 ++++++++++ src/pages/main_page/Main.js | 2 +- src/pages/main_page/MainApplyCard.js | 45 ------------------- 5 files changed, 66 insertions(+), 50 deletions(-) create mode 100644 src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.css create mode 100644 src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.js delete mode 100644 src/pages/main_page/MainApplyCard.js diff --git a/src/pages/main_page/ImgMain/ImgMain.css b/src/pages/main_page/ImgMain/ImgMain.css index 7eba7af..252810f 100644 --- a/src/pages/main_page/ImgMain/ImgMain.css +++ b/src/pages/main_page/ImgMain/ImgMain.css @@ -1,16 +1,13 @@ .ImgMain { position: relative; - font-family: 'IBMPlexSans-Regular'; + /* font-family: 'IBMPlexSans-Regular'; */ text-align: center; - font-style: normal; display: flex; justify-content: center; align-items: center; flex-direction: column; - - color: black; } .ImgMainBox { @@ -59,6 +56,7 @@ position: absolute; font-size: 24px; + font-weight: bold; top: 805px; } @@ -67,6 +65,8 @@ position: relative; text-align: left; + font-weight: bold; + top: 444px; left: 310px; diff --git a/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.css b/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.css new file mode 100644 index 0000000..054f6a3 --- /dev/null +++ b/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.css @@ -0,0 +1,38 @@ +.MainApplyCard { + position: relative; + + text-align: center; + font-style: normal; + + display: flex; + justify-content: center; + align-items: center; +} + +.MainApplyCardBox { + position: relative; + + width: 1320px; + height: 420px; +} + +.MainApplyCardImg { + width: 1300px; + height: 258px; + + border-radius: 15px; +} + +.MainApplyCardLetterBox { + position: absolute; + + top: 70px; + left: 69px; + + font-size: 30px; + font-weight: bold; +} + +.WhiteWord { + color: #ffffff; +} \ No newline at end of file diff --git a/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.js b/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.js new file mode 100644 index 0000000..cf8b9ae --- /dev/null +++ b/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.js @@ -0,0 +1,23 @@ +import React from "react"; + +import img from "../../components/img/main_apply_img.png"; + +import GoToApply from "../../components/GoToApply"; + +import "./MainApplyCard.css"; + +const MainApplyCard = () => { + return ( +
+
+ +
+ 2024 1학기 신입부원 모집 +
+ +
+
+ ); +}; + +export default MainApplyCard; diff --git a/src/pages/main_page/Main.js b/src/pages/main_page/Main.js index a8f4190..53c722c 100644 --- a/src/pages/main_page/Main.js +++ b/src/pages/main_page/Main.js @@ -3,7 +3,7 @@ import React from "react"; // components import ImgMain from "./ImgMain/ImgMain"; import IntroduceMain from "./IntroduceMain/IntroduceMain"; -import MainApplyCard from "./MainApplyCard"; +import MainApplyCard from "./IntroduceMain/ApplyCardMain/MainApplyCard"; const Main = () => { return ( diff --git a/src/pages/main_page/MainApplyCard.js b/src/pages/main_page/MainApplyCard.js deleted file mode 100644 index 5e49a9e..0000000 --- a/src/pages/main_page/MainApplyCard.js +++ /dev/null @@ -1,45 +0,0 @@ -import React from "react"; - -import img from "./components/img/main_apply_img.png"; - -import GoToApply from "./components/GoToApply"; - -import "./Main.css"; - -const MainApplyCard = () => { - return ( -
-
- -
- 2023 1학기 신입 부원 모집 -
- -
-
- ); -}; - -export default MainApplyCard; From df7e6e2feb6dcd0eb40685473a99a36813751fdc Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 17:21:23 +0900 Subject: [PATCH 09/17] rename: /login_page/main.js -> Login.js --- src/App.js | 2 +- src/pages/apply_page/Apply.js | 6 +++--- src/pages/doing_page/Introduce_5/Introduce_5.js | 2 +- src/pages/login_page/{Main.js => Login.js} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/pages/login_page/{Main.js => Login.js} (91%) diff --git a/src/App.js b/src/App.js index 05a84fb..7d0bb20 100644 --- a/src/App.js +++ b/src/App.js @@ -13,7 +13,7 @@ import ScrollToTop from "layouts/ScrollToTop"; import Main from "./pages/main_page/Main"; import Apply from "./pages/apply_page/Apply"; import Introduce from "./pages/doing_page/Introduce"; -import { Login } from "./pages/login_page/Main"; +import { Login } from "./pages/login_page/Login"; import ApplyGuide from "./pages/apply_page/applyGuide/ApplyGuide"; import Not_allow_apply from "pages/Not_allow_page/Not_allow_apply"; import { MiddleResult } from "pages/result_page/MiddleResult"; diff --git a/src/pages/apply_page/Apply.js b/src/pages/apply_page/Apply.js index 3b84793..cd24bd7 100644 --- a/src/pages/apply_page/Apply.js +++ b/src/pages/apply_page/Apply.js @@ -8,7 +8,7 @@ import { post_resume, update_resume } from "../../apis/resume"; import NotFound from "pages/NotFound"; //// pages //Login -import { Login } from "../login_page/Main"; +import { Login } from "../login_page/Login"; // First Login import ApplyFirst from "./ApplyFirst/ApplyFirst"; // Second Login @@ -70,7 +70,7 @@ const Apply = () => { etc: "", interview_requirement: "", } - : data, + : data ); const postContent = async () => { @@ -102,7 +102,7 @@ const Apply = () => { } if (contents.interview_time_choice.length == 0) { alert( - "면접시간을 최소 하나 선택해주세요.\n가능하신 시간이 없으면 학회장에게 문의해주세요.", + "면접시간을 최소 하나 선택해주세요.\n가능하신 시간이 없으면 학회장에게 문의해주세요." ); return false; } diff --git a/src/pages/doing_page/Introduce_5/Introduce_5.js b/src/pages/doing_page/Introduce_5/Introduce_5.js index 78f4ab7..4552c86 100644 --- a/src/pages/doing_page/Introduce_5/Introduce_5.js +++ b/src/pages/doing_page/Introduce_5/Introduce_5.js @@ -1,5 +1,5 @@ import React from "react"; -import MainApplyCard from "../../main_page/MainApplyCard"; +import MainApplyCard from "../../main_page/IntroduceMain/ApplyCardMain/MainApplyCard"; import "../Introduce.css"; import "./Introduce_5.css"; diff --git a/src/pages/login_page/Main.js b/src/pages/login_page/Login.js similarity index 91% rename from src/pages/login_page/Main.js rename to src/pages/login_page/Login.js index cb5d888..97fa70c 100644 --- a/src/pages/login_page/Main.js +++ b/src/pages/login_page/Login.js @@ -1,7 +1,7 @@ import { LoginForm } from "./components/LoginForm"; import RecruitProcess from "./components/RecruitProcess"; import { useAsync } from "react-async"; -import { get_recruit_info } from "./../../apis/get_recruit"; +import { get_recruit_info } from "../../apis/get_recruit"; import Not_allow_apply from "pages/Not_allow_page/Not_allow_apply"; export const Login = () => { const { data, error, isLoading } = useAsync({ promiseFn: get_recruit_info }); From 40fd49e064157aeb834e752b33e8e9e192a93294 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 20:06:23 +0900 Subject: [PATCH 10/17] refactor: MainPage images move to assets --- .../images/main}/main_apply_img.png | Bin .../img => assets/images/main}/main_img_1.png | Bin .../img => assets/images/main}/main_img_2.png | Bin .../img => assets/images/main}/main_img_3.png | Bin .../img => assets/images/main}/main_img_mt.png | Bin .../images/main}/main_img_party.png | Bin .../images/main}/main_img_picnic.png | Bin .../doing_page/Introduce_5/Introduce_5.js | 2 +- .../ApplyCardMain/MainApplyCard.css | 0 .../ApplyCardMain/MainApplyCard.js | 4 ++-- src/pages/main_page/ImgMain/ImgMain_1.js | 2 +- src/pages/main_page/ImgMain/ImgMain_2.js | 3 --- src/pages/main_page/ImgMain/ImgMain_3.js | 2 +- .../main_page/IntroduceMain/IntroduceMain.js | 6 +++--- src/pages/main_page/Main.js | 2 +- src/pages/main_page/background_main.png | Bin 16382 -> 0 bytes .../components/fonts/IBMPlexSans-Regular.ttf | Bin 175748 -> 0 bytes 17 files changed, 9 insertions(+), 12 deletions(-) rename src/{pages/main_page/components/img => assets/images/main}/main_apply_img.png (100%) rename src/{pages/main_page/components/img => assets/images/main}/main_img_1.png (100%) rename src/{pages/main_page/components/img => assets/images/main}/main_img_2.png (100%) rename src/{pages/main_page/components/img => assets/images/main}/main_img_3.png (100%) rename src/{pages/main_page/components/img => assets/images/main}/main_img_mt.png (100%) rename src/{pages/main_page/components/img => assets/images/main}/main_img_party.png (100%) rename src/{pages/main_page/components/img => assets/images/main}/main_img_picnic.png (100%) rename src/pages/main_page/{IntroduceMain => }/ApplyCardMain/MainApplyCard.css (100%) rename src/pages/main_page/{IntroduceMain => }/ApplyCardMain/MainApplyCard.js (80%) delete mode 100644 src/pages/main_page/background_main.png delete mode 100644 src/pages/main_page/components/fonts/IBMPlexSans-Regular.ttf diff --git a/src/pages/main_page/components/img/main_apply_img.png b/src/assets/images/main/main_apply_img.png similarity index 100% rename from src/pages/main_page/components/img/main_apply_img.png rename to src/assets/images/main/main_apply_img.png diff --git a/src/pages/main_page/components/img/main_img_1.png b/src/assets/images/main/main_img_1.png similarity index 100% rename from src/pages/main_page/components/img/main_img_1.png rename to src/assets/images/main/main_img_1.png diff --git a/src/pages/main_page/components/img/main_img_2.png b/src/assets/images/main/main_img_2.png similarity index 100% rename from src/pages/main_page/components/img/main_img_2.png rename to src/assets/images/main/main_img_2.png diff --git a/src/pages/main_page/components/img/main_img_3.png b/src/assets/images/main/main_img_3.png similarity index 100% rename from src/pages/main_page/components/img/main_img_3.png rename to src/assets/images/main/main_img_3.png diff --git a/src/pages/main_page/components/img/main_img_mt.png b/src/assets/images/main/main_img_mt.png similarity index 100% rename from src/pages/main_page/components/img/main_img_mt.png rename to src/assets/images/main/main_img_mt.png diff --git a/src/pages/main_page/components/img/main_img_party.png b/src/assets/images/main/main_img_party.png similarity index 100% rename from src/pages/main_page/components/img/main_img_party.png rename to src/assets/images/main/main_img_party.png diff --git a/src/pages/main_page/components/img/main_img_picnic.png b/src/assets/images/main/main_img_picnic.png similarity index 100% rename from src/pages/main_page/components/img/main_img_picnic.png rename to src/assets/images/main/main_img_picnic.png diff --git a/src/pages/doing_page/Introduce_5/Introduce_5.js b/src/pages/doing_page/Introduce_5/Introduce_5.js index 4552c86..2584454 100644 --- a/src/pages/doing_page/Introduce_5/Introduce_5.js +++ b/src/pages/doing_page/Introduce_5/Introduce_5.js @@ -1,5 +1,5 @@ import React from "react"; -import MainApplyCard from "../../main_page/IntroduceMain/ApplyCardMain/MainApplyCard"; +import MainApplyCard from "../../main_page/ApplyCardMain/MainApplyCard"; import "../Introduce.css"; import "./Introduce_5.css"; diff --git a/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.css b/src/pages/main_page/ApplyCardMain/MainApplyCard.css similarity index 100% rename from src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.css rename to src/pages/main_page/ApplyCardMain/MainApplyCard.css diff --git a/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.js b/src/pages/main_page/ApplyCardMain/MainApplyCard.js similarity index 80% rename from src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.js rename to src/pages/main_page/ApplyCardMain/MainApplyCard.js index cf8b9ae..437b428 100644 --- a/src/pages/main_page/IntroduceMain/ApplyCardMain/MainApplyCard.js +++ b/src/pages/main_page/ApplyCardMain/MainApplyCard.js @@ -1,8 +1,8 @@ import React from "react"; -import img from "../../components/img/main_apply_img.png"; +import img from "../../../assets/images/main/main_apply_img.png"; -import GoToApply from "../../components/GoToApply"; +import GoToApply from "../components/GoToApply"; import "./MainApplyCard.css"; diff --git a/src/pages/main_page/ImgMain/ImgMain_1.js b/src/pages/main_page/ImgMain/ImgMain_1.js index 55eadd2..b5d0f39 100644 --- a/src/pages/main_page/ImgMain/ImgMain_1.js +++ b/src/pages/main_page/ImgMain/ImgMain_1.js @@ -1,6 +1,6 @@ import React from "react"; -import img_1 from "../components/img/main_img_1.png"; +import img_1 from "../../../assets/images/main/main_img_1.png"; import GoToApply from "../components/GoToApply"; diff --git a/src/pages/main_page/ImgMain/ImgMain_2.js b/src/pages/main_page/ImgMain/ImgMain_2.js index f21d439..e880258 100644 --- a/src/pages/main_page/ImgMain/ImgMain_2.js +++ b/src/pages/main_page/ImgMain/ImgMain_2.js @@ -1,8 +1,5 @@ import React from "react"; -// 사용하지 않는 이미지 -> 삭제 필요 -import img_2 from "../components/img/main_img_2.png"; - import "./ImgMain.css"; const ImgMain_2 = () => { diff --git a/src/pages/main_page/ImgMain/ImgMain_3.js b/src/pages/main_page/ImgMain/ImgMain_3.js index 9ad8c48..64107b7 100644 --- a/src/pages/main_page/ImgMain/ImgMain_3.js +++ b/src/pages/main_page/ImgMain/ImgMain_3.js @@ -1,6 +1,6 @@ import React from "react"; -import img_3 from "../components/img/main_img_3.png"; +import img_3 from "../../../assets/images/main/main_img_3.png"; import "../components/GoToApply"; diff --git a/src/pages/main_page/IntroduceMain/IntroduceMain.js b/src/pages/main_page/IntroduceMain/IntroduceMain.js index ffefffb..9b1caf5 100644 --- a/src/pages/main_page/IntroduceMain/IntroduceMain.js +++ b/src/pages/main_page/IntroduceMain/IntroduceMain.js @@ -4,9 +4,9 @@ import "./IntroduceMain.css"; import MoreStory from "./MoreStory"; // image -import img_picnic from "../components/img/main_img_picnic.png"; -import img_mt from "../components/img/main_img_mt.png"; -import img_party from "../components/img/main_img_party.png"; +import img_picnic from "../../../assets/images/main/main_img_picnic.png"; +import img_mt from "../../../assets/images/main/main_img_mt.png"; +import img_party from "../../../assets/images/main/main_img_party.png"; const IntroduceMain = () => { return ( diff --git a/src/pages/main_page/Main.js b/src/pages/main_page/Main.js index 53c722c..d9570d1 100644 --- a/src/pages/main_page/Main.js +++ b/src/pages/main_page/Main.js @@ -3,7 +3,7 @@ import React from "react"; // components import ImgMain from "./ImgMain/ImgMain"; import IntroduceMain from "./IntroduceMain/IntroduceMain"; -import MainApplyCard from "./IntroduceMain/ApplyCardMain/MainApplyCard"; +import MainApplyCard from "./ApplyCardMain/MainApplyCard"; const Main = () => { return ( diff --git a/src/pages/main_page/background_main.png b/src/pages/main_page/background_main.png deleted file mode 100644 index ce3292c72547bd8a7609558fda76f568b193ba6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16382 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 Omrr(PR(4MAwEho+ftIfT From 96dc6ffcf5d51c426570aa1ade0a359fe97ea75c Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 20:10:29 +0900 Subject: [PATCH 11/17] refactor: ResultPage images move to assets --- .../images/result}/map-marker-Filled.png | Bin .../img => assets/images/result}/map.png | Bin .../Doc_result_pass_page/Doc_result_pass.js | 6 ++++-- 3 files changed, 4 insertions(+), 2 deletions(-) rename src/{pages/result_page/img => assets/images/result}/map-marker-Filled.png (100%) rename src/{pages/result_page/img => assets/images/result}/map.png (100%) diff --git a/src/pages/result_page/img/map-marker-Filled.png b/src/assets/images/result/map-marker-Filled.png similarity index 100% rename from src/pages/result_page/img/map-marker-Filled.png rename to src/assets/images/result/map-marker-Filled.png diff --git a/src/pages/result_page/img/map.png b/src/assets/images/result/map.png similarity index 100% rename from src/pages/result_page/img/map.png rename to src/assets/images/result/map.png diff --git a/src/pages/result_page/Doc_result_pass_page/Doc_result_pass.js b/src/pages/result_page/Doc_result_pass_page/Doc_result_pass.js index 38da9e3..b1c6b52 100644 --- a/src/pages/result_page/Doc_result_pass_page/Doc_result_pass.js +++ b/src/pages/result_page/Doc_result_pass_page/Doc_result_pass.js @@ -1,7 +1,9 @@ import React from "react"; import "./Doc_result_pass.css"; -import imgMap from "../img/map.png"; -import imgSpot from "../img/map-marker-Filled.png"; + +import imgMap from "../../../assets/images/result/map.png"; +import imgSpot from "../../../assets/images/result/map-marker-Filled.png"; + import dateFormat, { masks } from "dateformat"; const Doc_result_pass = ({ resume }) => { From 9c444c3085bf0d548177eb24d9f075268c057b9a Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 20:15:35 +0900 Subject: [PATCH 12/17] refactor: DoingPage images move to assets --- .../img => assets/images/doing}/bookmark.png | Bin .../img => assets/images/doing}/cspcLogo.png | Bin .../img => assets/images/doing}/desktop.png | Bin .../img => assets/images/doing}/dic.png | Bin .../img => assets/images/doing}/food.jpg | Bin .../img => assets/images/doing}/foood.jpg | Bin .../img => assets/images/doing}/haek.png | Bin .../img => assets/images/doing}/map-pin.png | Bin .../img => assets/images/doing}/mt.png | Bin .../img => assets/images/doing}/mt2.jpg | Bin .../img => assets/images/doing}/party.png | Bin .../img => assets/images/doing}/picnic.png | Bin .../img => assets/images/doing}/semina.jpg | Bin .../doing/\354\272\241\354\262\230.PNG" | Bin .../doing_page/Introduce_2/Introduce_2.js | 7 ++++--- .../doing_page/Introduce_3/Introduce_3.js | 4 ---- .../doing_page/Introduce_4/Introduce_4.js | 18 ++++++++++-------- 17 files changed, 14 insertions(+), 15 deletions(-) rename src/{pages/doing_page/img => assets/images/doing}/bookmark.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/cspcLogo.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/desktop.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/dic.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/food.jpg (100%) rename src/{pages/doing_page/img => assets/images/doing}/foood.jpg (100%) rename src/{pages/doing_page/img => assets/images/doing}/haek.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/map-pin.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/mt.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/mt2.jpg (100%) rename src/{pages/doing_page/img => assets/images/doing}/party.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/picnic.png (100%) rename src/{pages/doing_page/img => assets/images/doing}/semina.jpg (100%) rename "src/pages/doing_page/img/\354\272\241\354\262\230.PNG" => "src/assets/images/doing/\354\272\241\354\262\230.PNG" (100%) diff --git a/src/pages/doing_page/img/bookmark.png b/src/assets/images/doing/bookmark.png similarity index 100% rename from src/pages/doing_page/img/bookmark.png rename to src/assets/images/doing/bookmark.png diff --git a/src/pages/doing_page/img/cspcLogo.png b/src/assets/images/doing/cspcLogo.png similarity index 100% rename from src/pages/doing_page/img/cspcLogo.png rename to src/assets/images/doing/cspcLogo.png diff --git a/src/pages/doing_page/img/desktop.png b/src/assets/images/doing/desktop.png similarity index 100% rename from src/pages/doing_page/img/desktop.png rename to src/assets/images/doing/desktop.png diff --git a/src/pages/doing_page/img/dic.png b/src/assets/images/doing/dic.png similarity index 100% rename from src/pages/doing_page/img/dic.png rename to src/assets/images/doing/dic.png diff --git a/src/pages/doing_page/img/food.jpg b/src/assets/images/doing/food.jpg similarity index 100% rename from src/pages/doing_page/img/food.jpg rename to src/assets/images/doing/food.jpg diff --git a/src/pages/doing_page/img/foood.jpg b/src/assets/images/doing/foood.jpg similarity index 100% rename from src/pages/doing_page/img/foood.jpg rename to src/assets/images/doing/foood.jpg diff --git a/src/pages/doing_page/img/haek.png b/src/assets/images/doing/haek.png similarity index 100% rename from src/pages/doing_page/img/haek.png rename to src/assets/images/doing/haek.png diff --git a/src/pages/doing_page/img/map-pin.png b/src/assets/images/doing/map-pin.png similarity index 100% rename from src/pages/doing_page/img/map-pin.png rename to src/assets/images/doing/map-pin.png diff --git a/src/pages/doing_page/img/mt.png b/src/assets/images/doing/mt.png similarity index 100% rename from src/pages/doing_page/img/mt.png rename to src/assets/images/doing/mt.png diff --git a/src/pages/doing_page/img/mt2.jpg b/src/assets/images/doing/mt2.jpg similarity index 100% rename from src/pages/doing_page/img/mt2.jpg rename to src/assets/images/doing/mt2.jpg diff --git a/src/pages/doing_page/img/party.png b/src/assets/images/doing/party.png similarity index 100% rename from src/pages/doing_page/img/party.png rename to src/assets/images/doing/party.png diff --git a/src/pages/doing_page/img/picnic.png b/src/assets/images/doing/picnic.png similarity index 100% rename from src/pages/doing_page/img/picnic.png rename to src/assets/images/doing/picnic.png diff --git a/src/pages/doing_page/img/semina.jpg b/src/assets/images/doing/semina.jpg similarity index 100% rename from src/pages/doing_page/img/semina.jpg rename to src/assets/images/doing/semina.jpg diff --git "a/src/pages/doing_page/img/\354\272\241\354\262\230.PNG" "b/src/assets/images/doing/\354\272\241\354\262\230.PNG" similarity index 100% rename from "src/pages/doing_page/img/\354\272\241\354\262\230.PNG" rename to "src/assets/images/doing/\354\272\241\354\262\230.PNG" diff --git a/src/pages/doing_page/Introduce_2/Introduce_2.js b/src/pages/doing_page/Introduce_2/Introduce_2.js index f16723e..20e8204 100644 --- a/src/pages/doing_page/Introduce_2/Introduce_2.js +++ b/src/pages/doing_page/Introduce_2/Introduce_2.js @@ -1,9 +1,10 @@ import React from "react"; import "../Introduce.css"; import "./Introduce_2.css"; -import bookmark from "../../doing_page/img/bookmark.png"; -import desktop from "../../doing_page/img/desktop.png"; -import mapPin from "../../doing_page/img/map-pin.png"; + +import bookmark from "../../../assets/images/doing/bookmark.png"; +import desktop from "../../../assets/images/doing/desktop.png"; +import mapPin from "../../../assets/images/doing/map-pin.png"; const Introduce_2 = () => { return ( diff --git a/src/pages/doing_page/Introduce_3/Introduce_3.js b/src/pages/doing_page/Introduce_3/Introduce_3.js index 1b8e8f7..717a9a7 100644 --- a/src/pages/doing_page/Introduce_3/Introduce_3.js +++ b/src/pages/doing_page/Introduce_3/Introduce_3.js @@ -2,10 +2,6 @@ import React from "react"; import "../Introduce.css"; import "./Introduce_3.css"; import { Container, Row } from "react-bootstrap"; -import imgPicnic from "../../doing_page/img/picnic.png"; -import imgHaek from "../../doing_page/img/haek.png"; -import imgMt from "../../doing_page/img/mt.png"; -import imgParty from "../../doing_page/img/party.png"; const Introduce_3 = () => { return ( diff --git a/src/pages/doing_page/Introduce_4/Introduce_4.js b/src/pages/doing_page/Introduce_4/Introduce_4.js index 3eb5ee9..794940b 100644 --- a/src/pages/doing_page/Introduce_4/Introduce_4.js +++ b/src/pages/doing_page/Introduce_4/Introduce_4.js @@ -1,14 +1,16 @@ import React from "react"; import "../Introduce.css"; import "./Introduce_4.css"; -import imgPicnic from "../../doing_page/img/picnic.png"; -import imgHaek from "../../doing_page/img/haek.png"; -import imgMt from "../../doing_page/img/mt.png"; -import imgDiscord from "../../doing_page/img/dic.png"; -import imgParty from "../../doing_page/img/party.png"; -import imgSemina from "../../doing_page/img/semina.jpg"; -import imgFoood from "../../doing_page/img/foood.jpg"; -import imgLogo from "../../doing_page/img/cspcLogo.png"; + +// images +import imgPicnic from "../../../assets/images/doing/picnic.png"; +import imgHaek from "../../../assets/images/doing/haek.png"; +import imgMt from "../../../assets/images/doing/mt.png"; +import imgParty from "../../../assets/images/doing/party.png"; +import imgSemina from "../../../assets/images/doing/semina.jpg"; +import imgFoood from "../../../assets/images/doing/food.jpg"; +import imgLogo from "../../../assets/images/doing/cspcLogo.png"; + import { Container, Row, Col } from "react-bootstrap"; const Introduce_4 = () => { From ef2d3d855f51b6abf93e4e4b814f5c5f41a75ac7 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Tue, 13 Feb 2024 20:17:55 +0900 Subject: [PATCH 13/17] refactor: ApplyPage images move to assets --- .../img => assets/images/apply}/checkedButton.png | Bin .../img => assets/images/apply}/unCheckedButton.png | Bin src/pages/apply_page/ApplyFirst/AgreeAbove.css | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{pages/apply_page/Components/img => assets/images/apply}/checkedButton.png (100%) rename src/{pages/apply_page/Components/img => assets/images/apply}/unCheckedButton.png (100%) diff --git a/src/pages/apply_page/Components/img/checkedButton.png b/src/assets/images/apply/checkedButton.png similarity index 100% rename from src/pages/apply_page/Components/img/checkedButton.png rename to src/assets/images/apply/checkedButton.png diff --git a/src/pages/apply_page/Components/img/unCheckedButton.png b/src/assets/images/apply/unCheckedButton.png similarity index 100% rename from src/pages/apply_page/Components/img/unCheckedButton.png rename to src/assets/images/apply/unCheckedButton.png diff --git a/src/pages/apply_page/ApplyFirst/AgreeAbove.css b/src/pages/apply_page/ApplyFirst/AgreeAbove.css index 994d078..c9847e6 100644 --- a/src/pages/apply_page/ApplyFirst/AgreeAbove.css +++ b/src/pages/apply_page/ApplyFirst/AgreeAbove.css @@ -37,14 +37,14 @@ } .checked{ - background: url('../Components/img/checkedButton.png'); + background: url('../../../assets/images/apply/checkedButton.png'); background-position: center; background-repeat: no-repeat; background-size: contain; } .unChecked{ - background: url('../Components/img/unCheckedButton.png'); + background: url('../../../assets/images/apply/unCheckedButton.png'); background-position: center; background-repeat: no-repeat; background-size: contain; From 2d2393dcde61b102cd817df43afe2a7b82a08255 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Wed, 14 Feb 2024 21:28:35 +0900 Subject: [PATCH 14/17] refactor: Directory structure, file name refactor --- src/App.js | 29 ++++++++++++------ src/pages/{apply_page => ApplyPage}/Apply.js | 14 ++++----- .../components/Complete}/ApplyComplete.js | 4 +-- .../components/Complete}/CompleteMessage.css | 0 .../components/Complete}/CompleteMessage.js | 0 .../components/First}/AgreeAbove.js | 4 +-- .../components/First}/AgreePrivacy.js | 2 +- .../components/First}/ApplyFirst.js | 4 +-- .../components/Form}/ApplyForm.js | 4 +-- .../components/Form}/basicinfo/BasicInfo.css | 0 .../components/Form}/basicinfo/BasicInfo.js | 0 .../Form}/basicinfo/components/Required.css | 0 .../basicinfo/components/RequiredName.js | 0 .../basicinfo/components/RequiredPhone.js | 0 .../basicinfo/components/RequiredSemester.js | 0 .../basicinfo/components/RequiredStudentId.js | 0 .../Form}/basicinfo/requiredInput.png | Bin .../components/Form}/context/index.js | 0 .../Form}/coverLetter/CoverLetter.css | 0 .../Form}/coverLetter/CoverLetter.js | 0 .../components/Form}/coverLetter/InputBox.css | 0 .../components/Form}/coverLetter/InputBox.js | 0 .../Form}/interviewTime/CheckBox.js | 0 .../Form}/interviewTime/InterviewTime.css | 0 .../Form}/interviewTime/InterviewTime.js | 0 .../Form}/interviewTime/TimeTable.css | 0 .../Form}/interviewTime/TimeTable.js | 2 +- .../Form}/interviewTime/checkBox.png | Bin .../components}/GoWriteApply.js | 2 +- .../components/Guide}/ApplyGuide.js | 8 +++-- .../components/Guide}/ApplyGuide_1.js | 6 ++-- .../components/Guide}/ApplyGuide_2.js | 6 ++-- .../Guide}/applyGuide_2/ButtonClick.js | 0 .../components/Second}/ApplySecond.js | 2 +- .../Second}/ExistenceApplication.css | 0 .../Second}/ExistenceApplication.js | 2 +- .../components}/StepButton.js | 0 .../components}/Steps.js | 2 +- .../components}/WriteApplication.js | 2 +- .../components/styles}/AgreeAbove.css | 4 +-- .../components/styles}/AgreePrivacy.css | 0 .../components/styles}/Apply.css | 2 +- .../components/styles}/ApplyGuide.css | 2 +- .../components/styles}/ApplyGuide_1.css | 0 .../components/styles}/ApplyGuide_2.css | 0 .../components/styles}/Components.css | 0 src/pages/IntroducePage/Introduce.js | 28 +++++++++++++++++ .../components/ApplyCardIntorduce.js | 16 ++++++++++ .../components/Benefit.js} | 9 +++--- .../components/Elite.js} | 10 +++--- .../components/ImgIntroduce.js} | 9 +++--- .../components/Info.js} | 9 +++--- .../components/styles/ApplyCardIntroduce.css} | 0 .../components/styles/Benefit.css} | 0 .../components/styles/Elite.css} | 0 .../components/styles/ImgIntroduce.css} | 0 .../components/styles/Info.css} | 0 .../components/styles}/Introduce.css | 2 +- src/pages/{login_page => LoginPage}/Login.js | 9 +++++- .../components/LoginForm.js | 8 +++-- .../components/RecruitProcess.js | 4 ++- .../components/styles}/LoginForm.css | 0 .../styles}/RecruitProcess.module.css | 0 src/pages/{main_page => MainPage}/Main.js | 6 ++-- .../components/GoToApply.js | 2 +- .../components/ImgMain/FirstImg.js} | 10 +++--- .../MainPage/components/ImgMain/ImgMain.js | 19 ++++++++++++ .../components/ImgMain/SecondImg.js} | 6 ++-- .../components/ImgMain/ThirdImg.js} | 12 ++++---- .../components}/IntroduceMain.js | 2 +- .../components}/MainApplyCard.js | 4 +-- .../components}/MoreStory.js | 2 +- .../components/styles}/GoToApply.css | 0 .../components/styles}/ImgMain.css | 0 .../components/styles}/IntroduceMain.css | 0 .../components/styles}/Main.css | 0 .../components/styles}/MainApplyCard.css | 0 .../components/styles}/MoreStory.css | 0 .../NotAllowApply.js} | 4 ++- .../components/styles/NotAllowApply.css} | 2 +- .../FinalResult.js | 4 +-- .../MiddleResult.js | 4 +-- .../components/DocumentFail.js} | 3 +- .../components/DocumentPass.js} | 2 +- .../components/InterviewFail.js} | 2 +- .../components/InterviewPass.js} | 2 +- .../components/styles/DocumentFail.css} | 2 +- .../components/styles/DocumentPass.css} | 2 +- .../components/styles/InterviewFail.css} | 2 +- .../components/styles/InterviewPass.css} | 2 +- src/pages/doing_page/Introduce.js | 26 ---------------- .../doing_page/Introduce_5/Introduce_5.js | 15 --------- src/pages/main_page/ImgMain/ImgMain.js | 19 ------------ 93 files changed, 199 insertions(+), 160 deletions(-) rename src/pages/{apply_page => ApplyPage}/Apply.js (91%) rename src/pages/{apply_page/applyComplete => ApplyPage/components/Complete}/ApplyComplete.js (72%) rename src/pages/{apply_page/applyComplete => ApplyPage/components/Complete}/CompleteMessage.css (100%) rename src/pages/{apply_page/applyComplete => ApplyPage/components/Complete}/CompleteMessage.js (100%) rename src/pages/{apply_page/ApplyFirst => ApplyPage/components/First}/AgreeAbove.js (91%) rename src/pages/{apply_page/ApplyFirst => ApplyPage/components/First}/AgreePrivacy.js (96%) rename src/pages/{apply_page/ApplyFirst => ApplyPage/components/First}/ApplyFirst.js (74%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/ApplyForm.js (86%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/basicinfo/BasicInfo.css (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/basicinfo/BasicInfo.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/basicinfo/components/Required.css (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/basicinfo/components/RequiredName.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/basicinfo/components/RequiredPhone.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/basicinfo/components/RequiredSemester.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/basicinfo/components/RequiredStudentId.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/basicinfo/requiredInput.png (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/context/index.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/coverLetter/CoverLetter.css (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/coverLetter/CoverLetter.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/coverLetter/InputBox.css (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/coverLetter/InputBox.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/interviewTime/CheckBox.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/interviewTime/InterviewTime.css (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/interviewTime/InterviewTime.js (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/interviewTime/TimeTable.css (100%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/interviewTime/TimeTable.js (97%) rename src/pages/{apply_page/ApplyForm => ApplyPage/components/Form}/interviewTime/checkBox.png (100%) rename src/pages/{apply_page/Components => ApplyPage/components}/GoWriteApply.js (94%) rename src/pages/{apply_page/applyGuide => ApplyPage/components/Guide}/ApplyGuide.js (64%) rename src/pages/{apply_page/applyGuide/applyGuide_1 => ApplyPage/components/Guide}/ApplyGuide_1.js (96%) rename src/pages/{apply_page/applyGuide/applyGuide_2 => ApplyPage/components/Guide}/ApplyGuide_2.js (96%) rename src/pages/{apply_page/applyGuide => ApplyPage/components/Guide}/applyGuide_2/ButtonClick.js (100%) rename src/pages/{apply_page/ApplySecond => ApplyPage/components/Second}/ApplySecond.js (83%) rename src/pages/{apply_page/ApplySecond => ApplyPage/components/Second}/ExistenceApplication.css (100%) rename src/pages/{apply_page/ApplySecond => ApplyPage/components/Second}/ExistenceApplication.js (92%) rename src/pages/{apply_page/Components => ApplyPage/components}/StepButton.js (100%) rename src/pages/{apply_page/Components => ApplyPage/components}/Steps.js (92%) rename src/pages/{apply_page/Components => ApplyPage/components}/WriteApplication.js (87%) rename src/pages/{apply_page/ApplyFirst => ApplyPage/components/styles}/AgreeAbove.css (81%) rename src/pages/{apply_page/ApplyFirst => ApplyPage/components/styles}/AgreePrivacy.css (100%) rename src/pages/{apply_page => ApplyPage/components/styles}/Apply.css (77%) rename src/pages/{apply_page/applyGuide => ApplyPage/components/styles}/ApplyGuide.css (77%) rename src/pages/{apply_page/applyGuide/applyGuide_1 => ApplyPage/components/styles}/ApplyGuide_1.css (100%) rename src/pages/{apply_page/applyGuide/applyGuide_2 => ApplyPage/components/styles}/ApplyGuide_2.css (100%) rename src/pages/{apply_page/Components => ApplyPage/components/styles}/Components.css (100%) create mode 100644 src/pages/IntroducePage/Introduce.js create mode 100644 src/pages/IntroducePage/components/ApplyCardIntorduce.js rename src/pages/{doing_page/Introduce_2/Introduce_2.js => IntroducePage/components/Benefit.js} (92%) rename src/pages/{doing_page/Introduce_3/Introduce_3.js => IntroducePage/components/Elite.js} (81%) rename src/pages/{doing_page/Introduce_4/Introduce_4.js => IntroducePage/components/ImgIntroduce.js} (95%) rename src/pages/{doing_page/Introduce_1/Introduce_1.js => IntroducePage/components/Info.js} (95%) rename src/pages/{doing_page/Introduce_5/Introduce_5.css => IntroducePage/components/styles/ApplyCardIntroduce.css} (100%) rename src/pages/{doing_page/Introduce_2/Introduce_2.css => IntroducePage/components/styles/Benefit.css} (100%) rename src/pages/{doing_page/Introduce_3/Introduce_3.css => IntroducePage/components/styles/Elite.css} (100%) rename src/pages/{doing_page/Introduce_4/Introduce_4.css => IntroducePage/components/styles/ImgIntroduce.css} (100%) rename src/pages/{doing_page/Introduce_1/Introduce_1.css => IntroducePage/components/styles/Info.css} (100%) rename src/pages/{doing_page => IntroducePage/components/styles}/Introduce.css (91%) rename src/pages/{login_page => LoginPage}/Login.js (75%) rename src/pages/{login_page => LoginPage}/components/LoginForm.js (96%) rename src/pages/{login_page => LoginPage}/components/RecruitProcess.js (97%) rename src/pages/{login_page/components => LoginPage/components/styles}/LoginForm.css (100%) rename src/pages/{login_page/components => LoginPage/components/styles}/RecruitProcess.module.css (100%) rename src/pages/{main_page => MainPage}/Main.js (53%) rename src/pages/{main_page => MainPage}/components/GoToApply.js (92%) rename src/pages/{main_page/ImgMain/ImgMain_1.js => MainPage/components/ImgMain/FirstImg.js} (61%) create mode 100644 src/pages/MainPage/components/ImgMain/ImgMain.js rename src/pages/{main_page/ImgMain/ImgMain_2.js => MainPage/components/ImgMain/SecondImg.js} (85%) rename src/pages/{main_page/ImgMain/ImgMain_3.js => MainPage/components/ImgMain/ThirdImg.js} (84%) rename src/pages/{main_page/IntroduceMain => MainPage/components}/IntroduceMain.js (97%) rename src/pages/{main_page/ApplyCardMain => MainPage/components}/MainApplyCard.js (86%) rename src/pages/{main_page/IntroduceMain => MainPage/components}/MoreStory.js (90%) rename src/pages/{main_page/components => MainPage/components/styles}/GoToApply.css (100%) rename src/pages/{main_page/ImgMain => MainPage/components/styles}/ImgMain.css (100%) rename src/pages/{main_page/IntroduceMain => MainPage/components/styles}/IntroduceMain.css (100%) rename src/pages/{main_page => MainPage/components/styles}/Main.css (100%) rename src/pages/{main_page/ApplyCardMain => MainPage/components/styles}/MainApplyCard.css (100%) rename src/pages/{main_page/IntroduceMain => MainPage/components/styles}/MoreStory.css (100%) rename src/pages/{Not_allow_page/Not_allow_apply.js => NotAllowPage/NotAllowApply.js} (96%) rename src/pages/{Not_allow_page/Not_allow_apply.css => NotAllowPage/components/styles/NotAllowApply.css} (92%) rename src/pages/{result_page => ResultPage}/FinalResult.js (76%) rename src/pages/{result_page => ResultPage}/MiddleResult.js (79%) rename src/pages/{result_page/Doc_result_fail_page/Doc_result_fail.js => ResultPage/components/DocumentFail.js} (96%) rename src/pages/{result_page/Doc_result_pass_page/Doc_result_pass.js => ResultPage/components/DocumentPass.js} (97%) rename src/pages/{result_page/Interview_result_fail_page/In_result_fail.js => ResultPage/components/InterviewFail.js} (96%) rename src/pages/{result_page/Interview_result_pass_page/In_result_pass.js => ResultPage/components/InterviewPass.js} (97%) rename src/pages/{result_page/Doc_result_fail_page/Doc_result_fail.css => ResultPage/components/styles/DocumentFail.css} (94%) rename src/pages/{result_page/Doc_result_pass_page/Doc_result_pass.css => ResultPage/components/styles/DocumentPass.css} (96%) rename src/pages/{result_page/Interview_result_fail_page/In_result_fail.css => ResultPage/components/styles/InterviewFail.css} (94%) rename src/pages/{result_page/Interview_result_pass_page/In_result_pass.css => ResultPage/components/styles/InterviewPass.css} (94%) delete mode 100644 src/pages/doing_page/Introduce.js delete mode 100644 src/pages/doing_page/Introduce_5/Introduce_5.js delete mode 100644 src/pages/main_page/ImgMain/ImgMain.js diff --git a/src/App.js b/src/App.js index 7d0bb20..8702b0f 100644 --- a/src/App.js +++ b/src/App.js @@ -10,14 +10,14 @@ import ApplyBanner from "./layouts/applyBanner/ApplyBanner"; import ScrollToTop from "layouts/ScrollToTop"; // pages -import Main from "./pages/main_page/Main"; -import Apply from "./pages/apply_page/Apply"; -import Introduce from "./pages/doing_page/Introduce"; -import { Login } from "./pages/login_page/Login"; -import ApplyGuide from "./pages/apply_page/applyGuide/ApplyGuide"; -import Not_allow_apply from "pages/Not_allow_page/Not_allow_apply"; -import { MiddleResult } from "pages/result_page/MiddleResult"; -import { FinalResult } from "pages/result_page/FinalResult"; +import Main from "./pages/MainPage/Main"; +import Apply from "./pages/ApplyPage/Apply"; +import Introduce from "./pages/IntroducePage/Introduce"; +import { Login } from "./pages/LoginPage/Login"; +import ApplyGuide from "./pages/ApplyPage/components/Guide/ApplyGuide"; +import Not_allow_apply from "pages/NotAllowPage/NotAllowApply"; +import { MiddleResult } from "pages/ResultPage/MiddleResult"; +import { FinalResult } from "pages/ResultPage/FinalResult"; import NotFound from "pages/NotFound"; // apis @@ -43,7 +43,7 @@ const App = () => { } /> } /> } /> - } /> + } /> }> } /> @@ -68,4 +68,15 @@ const ApplyCheck = () => { } }; +const LoginCheck = () => { + const { data, error, isLoading } = useAsync({ promiseFn: get_recruit_info }); + + if (isLoading) return "Loading..."; + if (error) return `Something went wrong: ${error.message}`; + if (data) { + if (data.process == "close") return ; + else return ; + } +}; + export default App; diff --git a/src/pages/apply_page/Apply.js b/src/pages/ApplyPage/Apply.js similarity index 91% rename from src/pages/apply_page/Apply.js rename to src/pages/ApplyPage/Apply.js index cd24bd7..8e8949c 100644 --- a/src/pages/apply_page/Apply.js +++ b/src/pages/ApplyPage/Apply.js @@ -8,18 +8,18 @@ import { post_resume, update_resume } from "../../apis/resume"; import NotFound from "pages/NotFound"; //// pages //Login -import { Login } from "../login_page/Login"; +import { Login } from "../LoginPage/Login"; // First Login -import ApplyFirst from "./ApplyFirst/ApplyFirst"; +import ApplyFirst from "./components/First/ApplyFirst"; // Second Login -import ApplySecond from "./ApplySecond/ApplySecond"; +import ApplySecond from "./components/Second/ApplySecond"; // Apply From -import ApplyForm from "./ApplyForm/ApplyForm"; +import ApplyForm from "./components/Form/ApplyForm"; // Complete Apply -import ApplyComplete from "./applyComplete/ApplyComplete"; +import ApplyComplete from "./components/Complete/ApplyComplete"; // css -import "./Apply.css"; +import "./components/styles/Apply.css"; // applybanner import ApplyBanner from "../../layouts/applyBanner/ApplyBanner"; @@ -27,7 +27,7 @@ import ApplyBanner from "../../layouts/applyBanner/ApplyBanner"; // Login.js에서 firstLogin 여부 확인해서 처리하기 // context -import { Provider } from "./ApplyForm/context/index"; +import { Provider } from "./components/Form/context/index"; import { get_auth_header } from "hooks/check_login"; const Apply = () => { diff --git a/src/pages/apply_page/applyComplete/ApplyComplete.js b/src/pages/ApplyPage/components/Complete/ApplyComplete.js similarity index 72% rename from src/pages/apply_page/applyComplete/ApplyComplete.js rename to src/pages/ApplyPage/components/Complete/ApplyComplete.js index 02827f3..dc1c859 100644 --- a/src/pages/apply_page/applyComplete/ApplyComplete.js +++ b/src/pages/ApplyPage/components/Complete/ApplyComplete.js @@ -1,7 +1,7 @@ import React from "react"; -import WriteApplication from "../Components/WriteApplication"; -import Steps from "../Components/Steps"; +import WriteApplication from "../WriteApplication"; +import Steps from "../Steps"; import CompleteMessage from "./CompleteMessage"; const ApplyComplete = () => { diff --git a/src/pages/apply_page/applyComplete/CompleteMessage.css b/src/pages/ApplyPage/components/Complete/CompleteMessage.css similarity index 100% rename from src/pages/apply_page/applyComplete/CompleteMessage.css rename to src/pages/ApplyPage/components/Complete/CompleteMessage.css diff --git a/src/pages/apply_page/applyComplete/CompleteMessage.js b/src/pages/ApplyPage/components/Complete/CompleteMessage.js similarity index 100% rename from src/pages/apply_page/applyComplete/CompleteMessage.js rename to src/pages/ApplyPage/components/Complete/CompleteMessage.js diff --git a/src/pages/apply_page/ApplyFirst/AgreeAbove.js b/src/pages/ApplyPage/components/First/AgreeAbove.js similarity index 91% rename from src/pages/apply_page/ApplyFirst/AgreeAbove.js rename to src/pages/ApplyPage/components/First/AgreeAbove.js index b00b127..edc9445 100644 --- a/src/pages/apply_page/ApplyFirst/AgreeAbove.js +++ b/src/pages/ApplyPage/components/First/AgreeAbove.js @@ -1,8 +1,8 @@ import React, { useState } from "react"; -import GoWriteApply from "../Components/GoWriteApply"; +import GoWriteApply from "../GoWriteApply"; -import "./AgreeAbove.css"; +import "../styles/AgreeAbove.css"; const AgreeAbove = ({ setPage }) => { const [checked, setChecked] = useState(0); diff --git a/src/pages/apply_page/ApplyFirst/AgreePrivacy.js b/src/pages/ApplyPage/components/First/AgreePrivacy.js similarity index 96% rename from src/pages/apply_page/ApplyFirst/AgreePrivacy.js rename to src/pages/ApplyPage/components/First/AgreePrivacy.js index 9a7a3bc..a18c9a9 100644 --- a/src/pages/apply_page/ApplyFirst/AgreePrivacy.js +++ b/src/pages/ApplyPage/components/First/AgreePrivacy.js @@ -1,6 +1,6 @@ import React from "react"; -import "./AgreePrivacy.css"; +import "../styles/AgreePrivacy.css"; import AgreeAbove from "./AgreeAbove"; diff --git a/src/pages/apply_page/ApplyFirst/ApplyFirst.js b/src/pages/ApplyPage/components/First/ApplyFirst.js similarity index 74% rename from src/pages/apply_page/ApplyFirst/ApplyFirst.js rename to src/pages/ApplyPage/components/First/ApplyFirst.js index d49cf77..36567a4 100644 --- a/src/pages/apply_page/ApplyFirst/ApplyFirst.js +++ b/src/pages/ApplyPage/components/First/ApplyFirst.js @@ -1,8 +1,8 @@ import React from "react"; // components -import WriteApplication from "../Components/WriteApplication"; -import Steps from "../Components/Steps"; +import WriteApplication from "../WriteApplication"; +import Steps from "../Steps"; import AgreePrivacy from "./AgreePrivacy"; const ApplyFirst = ({ setPage }) => { diff --git a/src/pages/apply_page/ApplyForm/ApplyForm.js b/src/pages/ApplyPage/components/Form/ApplyForm.js similarity index 86% rename from src/pages/apply_page/ApplyForm/ApplyForm.js rename to src/pages/ApplyPage/components/Form/ApplyForm.js index 2e4d6d3..44b01bd 100644 --- a/src/pages/apply_page/ApplyForm/ApplyForm.js +++ b/src/pages/ApplyPage/components/Form/ApplyForm.js @@ -2,8 +2,8 @@ import React from "react"; import axios from "axios"; -import WriteApplication from "../Components/WriteApplication"; -import Steps from "../Components/Steps"; +import WriteApplication from "../WriteApplication"; +import Steps from "../Steps"; import BasicInfo from "./basicinfo/BasicInfo"; import CoverLetter from "./coverLetter/CoverLetter"; import InterviewTime from "./interviewTime/InterviewTime"; diff --git a/src/pages/apply_page/ApplyForm/basicinfo/BasicInfo.css b/src/pages/ApplyPage/components/Form/basicinfo/BasicInfo.css similarity index 100% rename from src/pages/apply_page/ApplyForm/basicinfo/BasicInfo.css rename to src/pages/ApplyPage/components/Form/basicinfo/BasicInfo.css diff --git a/src/pages/apply_page/ApplyForm/basicinfo/BasicInfo.js b/src/pages/ApplyPage/components/Form/basicinfo/BasicInfo.js similarity index 100% rename from src/pages/apply_page/ApplyForm/basicinfo/BasicInfo.js rename to src/pages/ApplyPage/components/Form/basicinfo/BasicInfo.js diff --git a/src/pages/apply_page/ApplyForm/basicinfo/components/Required.css b/src/pages/ApplyPage/components/Form/basicinfo/components/Required.css similarity index 100% rename from src/pages/apply_page/ApplyForm/basicinfo/components/Required.css rename to src/pages/ApplyPage/components/Form/basicinfo/components/Required.css diff --git a/src/pages/apply_page/ApplyForm/basicinfo/components/RequiredName.js b/src/pages/ApplyPage/components/Form/basicinfo/components/RequiredName.js similarity index 100% rename from src/pages/apply_page/ApplyForm/basicinfo/components/RequiredName.js rename to src/pages/ApplyPage/components/Form/basicinfo/components/RequiredName.js diff --git a/src/pages/apply_page/ApplyForm/basicinfo/components/RequiredPhone.js b/src/pages/ApplyPage/components/Form/basicinfo/components/RequiredPhone.js similarity index 100% rename from src/pages/apply_page/ApplyForm/basicinfo/components/RequiredPhone.js rename to src/pages/ApplyPage/components/Form/basicinfo/components/RequiredPhone.js diff --git a/src/pages/apply_page/ApplyForm/basicinfo/components/RequiredSemester.js b/src/pages/ApplyPage/components/Form/basicinfo/components/RequiredSemester.js similarity index 100% rename from src/pages/apply_page/ApplyForm/basicinfo/components/RequiredSemester.js rename to src/pages/ApplyPage/components/Form/basicinfo/components/RequiredSemester.js diff --git a/src/pages/apply_page/ApplyForm/basicinfo/components/RequiredStudentId.js b/src/pages/ApplyPage/components/Form/basicinfo/components/RequiredStudentId.js similarity index 100% rename from src/pages/apply_page/ApplyForm/basicinfo/components/RequiredStudentId.js rename to src/pages/ApplyPage/components/Form/basicinfo/components/RequiredStudentId.js diff --git a/src/pages/apply_page/ApplyForm/basicinfo/requiredInput.png b/src/pages/ApplyPage/components/Form/basicinfo/requiredInput.png similarity index 100% rename from src/pages/apply_page/ApplyForm/basicinfo/requiredInput.png rename to src/pages/ApplyPage/components/Form/basicinfo/requiredInput.png diff --git a/src/pages/apply_page/ApplyForm/context/index.js b/src/pages/ApplyPage/components/Form/context/index.js similarity index 100% rename from src/pages/apply_page/ApplyForm/context/index.js rename to src/pages/ApplyPage/components/Form/context/index.js diff --git a/src/pages/apply_page/ApplyForm/coverLetter/CoverLetter.css b/src/pages/ApplyPage/components/Form/coverLetter/CoverLetter.css similarity index 100% rename from src/pages/apply_page/ApplyForm/coverLetter/CoverLetter.css rename to src/pages/ApplyPage/components/Form/coverLetter/CoverLetter.css diff --git a/src/pages/apply_page/ApplyForm/coverLetter/CoverLetter.js b/src/pages/ApplyPage/components/Form/coverLetter/CoverLetter.js similarity index 100% rename from src/pages/apply_page/ApplyForm/coverLetter/CoverLetter.js rename to src/pages/ApplyPage/components/Form/coverLetter/CoverLetter.js diff --git a/src/pages/apply_page/ApplyForm/coverLetter/InputBox.css b/src/pages/ApplyPage/components/Form/coverLetter/InputBox.css similarity index 100% rename from src/pages/apply_page/ApplyForm/coverLetter/InputBox.css rename to src/pages/ApplyPage/components/Form/coverLetter/InputBox.css diff --git a/src/pages/apply_page/ApplyForm/coverLetter/InputBox.js b/src/pages/ApplyPage/components/Form/coverLetter/InputBox.js similarity index 100% rename from src/pages/apply_page/ApplyForm/coverLetter/InputBox.js rename to src/pages/ApplyPage/components/Form/coverLetter/InputBox.js diff --git a/src/pages/apply_page/ApplyForm/interviewTime/CheckBox.js b/src/pages/ApplyPage/components/Form/interviewTime/CheckBox.js similarity index 100% rename from src/pages/apply_page/ApplyForm/interviewTime/CheckBox.js rename to src/pages/ApplyPage/components/Form/interviewTime/CheckBox.js diff --git a/src/pages/apply_page/ApplyForm/interviewTime/InterviewTime.css b/src/pages/ApplyPage/components/Form/interviewTime/InterviewTime.css similarity index 100% rename from src/pages/apply_page/ApplyForm/interviewTime/InterviewTime.css rename to src/pages/ApplyPage/components/Form/interviewTime/InterviewTime.css diff --git a/src/pages/apply_page/ApplyForm/interviewTime/InterviewTime.js b/src/pages/ApplyPage/components/Form/interviewTime/InterviewTime.js similarity index 100% rename from src/pages/apply_page/ApplyForm/interviewTime/InterviewTime.js rename to src/pages/ApplyPage/components/Form/interviewTime/InterviewTime.js diff --git a/src/pages/apply_page/ApplyForm/interviewTime/TimeTable.css b/src/pages/ApplyPage/components/Form/interviewTime/TimeTable.css similarity index 100% rename from src/pages/apply_page/ApplyForm/interviewTime/TimeTable.css rename to src/pages/ApplyPage/components/Form/interviewTime/TimeTable.css diff --git a/src/pages/apply_page/ApplyForm/interviewTime/TimeTable.js b/src/pages/ApplyPage/components/Form/interviewTime/TimeTable.js similarity index 97% rename from src/pages/apply_page/ApplyForm/interviewTime/TimeTable.js rename to src/pages/ApplyPage/components/Form/interviewTime/TimeTable.js index 4d90d8c..dcd394c 100644 --- a/src/pages/apply_page/ApplyForm/interviewTime/TimeTable.js +++ b/src/pages/ApplyPage/components/Form/interviewTime/TimeTable.js @@ -3,7 +3,7 @@ import { useState } from "react"; import { useAsync } from "react-async"; import dateFormat, { masks } from "dateformat"; -import { interview } from "../../../../apis/interview"; +import { interview } from "../../../../../apis/interview"; import "./TimeTable.css"; diff --git a/src/pages/apply_page/ApplyForm/interviewTime/checkBox.png b/src/pages/ApplyPage/components/Form/interviewTime/checkBox.png similarity index 100% rename from src/pages/apply_page/ApplyForm/interviewTime/checkBox.png rename to src/pages/ApplyPage/components/Form/interviewTime/checkBox.png diff --git a/src/pages/apply_page/Components/GoWriteApply.js b/src/pages/ApplyPage/components/GoWriteApply.js similarity index 94% rename from src/pages/apply_page/Components/GoWriteApply.js rename to src/pages/ApplyPage/components/GoWriteApply.js index b6def28..36888b5 100644 --- a/src/pages/apply_page/Components/GoWriteApply.js +++ b/src/pages/ApplyPage/components/GoWriteApply.js @@ -1,6 +1,6 @@ import React from "react"; -import "./Components.css"; +import "./styles/Components.css"; const GoWriteApply = ({ isChecked, first, second, setPage }) => { // isChecked=true 일 때만 이동 diff --git a/src/pages/apply_page/applyGuide/ApplyGuide.js b/src/pages/ApplyPage/components/Guide/ApplyGuide.js similarity index 64% rename from src/pages/apply_page/applyGuide/ApplyGuide.js rename to src/pages/ApplyPage/components/Guide/ApplyGuide.js index da30dc1..6e88632 100644 --- a/src/pages/apply_page/applyGuide/ApplyGuide.js +++ b/src/pages/ApplyPage/components/Guide/ApplyGuide.js @@ -1,7 +1,9 @@ import React from "react"; -import "../../doing_page/Introduce.css"; -import ApplyGuide_1 from "./applyGuide_1/ApplyGuide_1"; -import ApplyGuide_2 from "./applyGuide_2/ApplyGuide_2"; + +import "../../../IntroducePage/components/styles/Introduce.css"; + +import ApplyGuide_1 from "./ApplyGuide_1"; +import ApplyGuide_2 from "./ApplyGuide_2"; const ApplyGuide = () => { return ( diff --git a/src/pages/apply_page/applyGuide/applyGuide_1/ApplyGuide_1.js b/src/pages/ApplyPage/components/Guide/ApplyGuide_1.js similarity index 96% rename from src/pages/apply_page/applyGuide/applyGuide_1/ApplyGuide_1.js rename to src/pages/ApplyPage/components/Guide/ApplyGuide_1.js index 173f009..9411e40 100644 --- a/src/pages/apply_page/applyGuide/applyGuide_1/ApplyGuide_1.js +++ b/src/pages/ApplyPage/components/Guide/ApplyGuide_1.js @@ -1,6 +1,8 @@ import React from "react"; -import "./ApplyGuide_1.css"; -import "../ApplyGuide.css"; + +import "../styles/ApplyGuide_1.css"; +import "../styles/ApplyGuide.css"; + import guide1 from "../../../../assets/images/applyGuide/guide1.png"; import guide2 from "../../../../assets/images/applyGuide/guide2.png"; import guide3 from "../../../../assets/images/applyGuide/guide3.png"; diff --git a/src/pages/apply_page/applyGuide/applyGuide_2/ApplyGuide_2.js b/src/pages/ApplyPage/components/Guide/ApplyGuide_2.js similarity index 96% rename from src/pages/apply_page/applyGuide/applyGuide_2/ApplyGuide_2.js rename to src/pages/ApplyPage/components/Guide/ApplyGuide_2.js index aac6f35..6acf1d5 100644 --- a/src/pages/apply_page/applyGuide/applyGuide_2/ApplyGuide_2.js +++ b/src/pages/ApplyPage/components/Guide/ApplyGuide_2.js @@ -1,6 +1,8 @@ import React from "react"; -import "./ApplyGuide_2.css"; -import "../ApplyGuide.css"; + +import "../styles/ApplyGuide_2.css"; +import "../styles/ApplyGuide.css"; + import { Container, Row, Col } from "react-bootstrap"; import { get_recruit_info } from "../../../../apis/get_recruit"; import { useAsync } from "react-async"; diff --git a/src/pages/apply_page/applyGuide/applyGuide_2/ButtonClick.js b/src/pages/ApplyPage/components/Guide/applyGuide_2/ButtonClick.js similarity index 100% rename from src/pages/apply_page/applyGuide/applyGuide_2/ButtonClick.js rename to src/pages/ApplyPage/components/Guide/applyGuide_2/ButtonClick.js diff --git a/src/pages/apply_page/ApplySecond/ApplySecond.js b/src/pages/ApplyPage/components/Second/ApplySecond.js similarity index 83% rename from src/pages/apply_page/ApplySecond/ApplySecond.js rename to src/pages/ApplyPage/components/Second/ApplySecond.js index 62662fc..ef86b76 100644 --- a/src/pages/apply_page/ApplySecond/ApplySecond.js +++ b/src/pages/ApplyPage/components/Second/ApplySecond.js @@ -1,6 +1,6 @@ import React from "react"; -import WriteApplication from "../Components/WriteApplication"; +import WriteApplication from "../WriteApplication"; import ExistenceApplication from "./ExistenceApplication"; const ApplySecond = ({ setPage, updateTime }) => { diff --git a/src/pages/apply_page/ApplySecond/ExistenceApplication.css b/src/pages/ApplyPage/components/Second/ExistenceApplication.css similarity index 100% rename from src/pages/apply_page/ApplySecond/ExistenceApplication.css rename to src/pages/ApplyPage/components/Second/ExistenceApplication.css diff --git a/src/pages/apply_page/ApplySecond/ExistenceApplication.js b/src/pages/ApplyPage/components/Second/ExistenceApplication.js similarity index 92% rename from src/pages/apply_page/ApplySecond/ExistenceApplication.js rename to src/pages/ApplyPage/components/Second/ExistenceApplication.js index 112f5c9..8877196 100644 --- a/src/pages/apply_page/ApplySecond/ExistenceApplication.js +++ b/src/pages/ApplyPage/components/Second/ExistenceApplication.js @@ -2,7 +2,7 @@ import React from "react"; import { useAsync } from "react-async"; import dateFormat, { masks } from "dateformat"; -import GoWriteApply from "../Components/GoWriteApply"; +import GoWriteApply from "../GoWriteApply"; import "./ExistenceApplication.css"; diff --git a/src/pages/apply_page/Components/StepButton.js b/src/pages/ApplyPage/components/StepButton.js similarity index 100% rename from src/pages/apply_page/Components/StepButton.js rename to src/pages/ApplyPage/components/StepButton.js diff --git a/src/pages/apply_page/Components/Steps.js b/src/pages/ApplyPage/components/Steps.js similarity index 92% rename from src/pages/apply_page/Components/Steps.js rename to src/pages/ApplyPage/components/Steps.js index 0df2394..f6d66c2 100644 --- a/src/pages/apply_page/Components/Steps.js +++ b/src/pages/ApplyPage/components/Steps.js @@ -1,7 +1,7 @@ import React from "react"; import { useState } from "react"; -import "./Components.css"; +import "./styles/Components.css"; import StepButton from "./StepButton"; diff --git a/src/pages/apply_page/Components/WriteApplication.js b/src/pages/ApplyPage/components/WriteApplication.js similarity index 87% rename from src/pages/apply_page/Components/WriteApplication.js rename to src/pages/ApplyPage/components/WriteApplication.js index 4340289..376f584 100644 --- a/src/pages/apply_page/Components/WriteApplication.js +++ b/src/pages/ApplyPage/components/WriteApplication.js @@ -1,6 +1,6 @@ import React from "react"; -import "./Components.css"; +import "./styles/Components.css"; const WriteApplication = () => { return ( diff --git a/src/pages/apply_page/ApplyFirst/AgreeAbove.css b/src/pages/ApplyPage/components/styles/AgreeAbove.css similarity index 81% rename from src/pages/apply_page/ApplyFirst/AgreeAbove.css rename to src/pages/ApplyPage/components/styles/AgreeAbove.css index c9847e6..38401bc 100644 --- a/src/pages/apply_page/ApplyFirst/AgreeAbove.css +++ b/src/pages/ApplyPage/components/styles/AgreeAbove.css @@ -37,14 +37,14 @@ } .checked{ - background: url('../../../assets/images/apply/checkedButton.png'); + background: url('../../../../assets/images/apply/checkedButton.png'); background-position: center; background-repeat: no-repeat; background-size: contain; } .unChecked{ - background: url('../../../assets/images/apply/unCheckedButton.png'); + background: url('../../../../assets/images/apply/unCheckedButton.png'); background-position: center; background-repeat: no-repeat; background-size: contain; diff --git a/src/pages/apply_page/ApplyFirst/AgreePrivacy.css b/src/pages/ApplyPage/components/styles/AgreePrivacy.css similarity index 100% rename from src/pages/apply_page/ApplyFirst/AgreePrivacy.css rename to src/pages/ApplyPage/components/styles/AgreePrivacy.css diff --git a/src/pages/apply_page/Apply.css b/src/pages/ApplyPage/components/styles/Apply.css similarity index 77% rename from src/pages/apply_page/Apply.css rename to src/pages/ApplyPage/components/styles/Apply.css index add9534..4fc21a0 100644 --- a/src/pages/apply_page/Apply.css +++ b/src/pages/ApplyPage/components/styles/Apply.css @@ -1,6 +1,6 @@ @font-face { font-family: 'IBMPlexSans-Regular'; - src: url('../../assets/fonts/IBMPlexSans-Regular.ttf'); + src: url('../../../../assets/fonts/IBMPlexSans-Regular.ttf'); } .ApplyStyle { diff --git a/src/pages/apply_page/applyGuide/ApplyGuide.css b/src/pages/ApplyPage/components/styles/ApplyGuide.css similarity index 77% rename from src/pages/apply_page/applyGuide/ApplyGuide.css rename to src/pages/ApplyPage/components/styles/ApplyGuide.css index b0635da..8b1587a 100644 --- a/src/pages/apply_page/applyGuide/ApplyGuide.css +++ b/src/pages/ApplyPage/components/styles/ApplyGuide.css @@ -9,5 +9,5 @@ @font-face { font-family: 'IBMPlexSans-Regular'; - src: url('../../../assets/fonts/IBMPlexSans-Regular.ttf'); + src: url('../../../../assets/fonts/IBMPlexSans-Regular.ttf'); } \ No newline at end of file diff --git a/src/pages/apply_page/applyGuide/applyGuide_1/ApplyGuide_1.css b/src/pages/ApplyPage/components/styles/ApplyGuide_1.css similarity index 100% rename from src/pages/apply_page/applyGuide/applyGuide_1/ApplyGuide_1.css rename to src/pages/ApplyPage/components/styles/ApplyGuide_1.css diff --git a/src/pages/apply_page/applyGuide/applyGuide_2/ApplyGuide_2.css b/src/pages/ApplyPage/components/styles/ApplyGuide_2.css similarity index 100% rename from src/pages/apply_page/applyGuide/applyGuide_2/ApplyGuide_2.css rename to src/pages/ApplyPage/components/styles/ApplyGuide_2.css diff --git a/src/pages/apply_page/Components/Components.css b/src/pages/ApplyPage/components/styles/Components.css similarity index 100% rename from src/pages/apply_page/Components/Components.css rename to src/pages/ApplyPage/components/styles/Components.css diff --git a/src/pages/IntroducePage/Introduce.js b/src/pages/IntroducePage/Introduce.js new file mode 100644 index 0000000..81ba333 --- /dev/null +++ b/src/pages/IntroducePage/Introduce.js @@ -0,0 +1,28 @@ +import React from "react"; + +import "bootstrap/dist/css/bootstrap.min.css"; +import "./components/styles/Introduce.css"; + +import Info from "./components/Info"; +import Benefit from "./components/Benefit"; +import Elite from "./components/Elite"; +import ImgIntroduce from "./components/ImgIntroduce"; +import ApplyCardIntorduce from "./components/ApplyCardIntorduce"; + +const Introduce = () => { + return ( + <> +
+
소개
+
+ + + + + + + + ); +}; + +export default Introduce; diff --git a/src/pages/IntroducePage/components/ApplyCardIntorduce.js b/src/pages/IntroducePage/components/ApplyCardIntorduce.js new file mode 100644 index 0000000..1ff6080 --- /dev/null +++ b/src/pages/IntroducePage/components/ApplyCardIntorduce.js @@ -0,0 +1,16 @@ +import React from "react"; +import MainApplyCard from "../../MainPage/components/MainApplyCard"; + +import "./styles/Introduce.css"; +import "./styles/ApplyCardIntroduce.css"; + +const ApplyCardIntroduce = () => { + return ( + <> +
+ + + ); +}; + +export default ApplyCardIntroduce; diff --git a/src/pages/doing_page/Introduce_2/Introduce_2.js b/src/pages/IntroducePage/components/Benefit.js similarity index 92% rename from src/pages/doing_page/Introduce_2/Introduce_2.js rename to src/pages/IntroducePage/components/Benefit.js index 20e8204..fa7d020 100644 --- a/src/pages/doing_page/Introduce_2/Introduce_2.js +++ b/src/pages/IntroducePage/components/Benefit.js @@ -1,12 +1,13 @@ import React from "react"; -import "../Introduce.css"; -import "./Introduce_2.css"; + +import "./styles/Introduce.css"; +import "./styles/Benefit.css"; import bookmark from "../../../assets/images/doing/bookmark.png"; import desktop from "../../../assets/images/doing/desktop.png"; import mapPin from "../../../assets/images/doing/map-pin.png"; -const Introduce_2 = () => { +const Benefit = () => { return (
@@ -49,4 +50,4 @@ const Introduce_2 = () => { ); }; -export default Introduce_2; +export default Benefit; diff --git a/src/pages/doing_page/Introduce_3/Introduce_3.js b/src/pages/IntroducePage/components/Elite.js similarity index 81% rename from src/pages/doing_page/Introduce_3/Introduce_3.js rename to src/pages/IntroducePage/components/Elite.js index 717a9a7..2fbd23c 100644 --- a/src/pages/doing_page/Introduce_3/Introduce_3.js +++ b/src/pages/IntroducePage/components/Elite.js @@ -1,9 +1,11 @@ import React from "react"; -import "../Introduce.css"; -import "./Introduce_3.css"; + +import "./styles/Introduce.css"; +import "./styles/Elite.css"; + import { Container, Row } from "react-bootstrap"; -const Introduce_3 = () => { +const Elite = () => { return (
@@ -19,4 +21,4 @@ const Introduce_3 = () => { ); }; -export default Introduce_3; +export default Elite; diff --git a/src/pages/doing_page/Introduce_4/Introduce_4.js b/src/pages/IntroducePage/components/ImgIntroduce.js similarity index 95% rename from src/pages/doing_page/Introduce_4/Introduce_4.js rename to src/pages/IntroducePage/components/ImgIntroduce.js index 794940b..6ee531a 100644 --- a/src/pages/doing_page/Introduce_4/Introduce_4.js +++ b/src/pages/IntroducePage/components/ImgIntroduce.js @@ -1,6 +1,7 @@ import React from "react"; -import "../Introduce.css"; -import "./Introduce_4.css"; + +import "./styles/Introduce.css"; +import "./styles/ImgIntroduce.css"; // images import imgPicnic from "../../../assets/images/doing/picnic.png"; @@ -13,7 +14,7 @@ import imgLogo from "../../../assets/images/doing/cspcLogo.png"; import { Container, Row, Col } from "react-bootstrap"; -const Introduce_4 = () => { +const ImgIntroduce = () => { return (
@@ -67,4 +68,4 @@ const Introduce_4 = () => { ); }; -export default Introduce_4; +export default ImgIntroduce; diff --git a/src/pages/doing_page/Introduce_1/Introduce_1.js b/src/pages/IntroducePage/components/Info.js similarity index 95% rename from src/pages/doing_page/Introduce_1/Introduce_1.js rename to src/pages/IntroducePage/components/Info.js index 96f6abc..c8f6a8a 100644 --- a/src/pages/doing_page/Introduce_1/Introduce_1.js +++ b/src/pages/IntroducePage/components/Info.js @@ -1,8 +1,9 @@ import React from "react"; -import "../Introduce.css"; -import "./Introduce_1.css"; -const Introduce_1 = () => { +import "./styles/Introduce.css"; +import "./styles/Info.css"; + +const Info = () => { return (
@@ -59,4 +60,4 @@ const Introduce_1 = () => { ); }; -export default Introduce_1; +export default Info; diff --git a/src/pages/doing_page/Introduce_5/Introduce_5.css b/src/pages/IntroducePage/components/styles/ApplyCardIntroduce.css similarity index 100% rename from src/pages/doing_page/Introduce_5/Introduce_5.css rename to src/pages/IntroducePage/components/styles/ApplyCardIntroduce.css diff --git a/src/pages/doing_page/Introduce_2/Introduce_2.css b/src/pages/IntroducePage/components/styles/Benefit.css similarity index 100% rename from src/pages/doing_page/Introduce_2/Introduce_2.css rename to src/pages/IntroducePage/components/styles/Benefit.css diff --git a/src/pages/doing_page/Introduce_3/Introduce_3.css b/src/pages/IntroducePage/components/styles/Elite.css similarity index 100% rename from src/pages/doing_page/Introduce_3/Introduce_3.css rename to src/pages/IntroducePage/components/styles/Elite.css diff --git a/src/pages/doing_page/Introduce_4/Introduce_4.css b/src/pages/IntroducePage/components/styles/ImgIntroduce.css similarity index 100% rename from src/pages/doing_page/Introduce_4/Introduce_4.css rename to src/pages/IntroducePage/components/styles/ImgIntroduce.css diff --git a/src/pages/doing_page/Introduce_1/Introduce_1.css b/src/pages/IntroducePage/components/styles/Info.css similarity index 100% rename from src/pages/doing_page/Introduce_1/Introduce_1.css rename to src/pages/IntroducePage/components/styles/Info.css diff --git a/src/pages/doing_page/Introduce.css b/src/pages/IntroducePage/components/styles/Introduce.css similarity index 91% rename from src/pages/doing_page/Introduce.css rename to src/pages/IntroducePage/components/styles/Introduce.css index 54e2b71..d147eb3 100644 --- a/src/pages/doing_page/Introduce.css +++ b/src/pages/IntroducePage/components/styles/Introduce.css @@ -35,5 +35,5 @@ /*Introduce.js에서 사용하는 기본 폰트*/ @font-face { font-family: 'IBMPlexSans-Regular'; - src: url('../../assets/fonts/IBMPlexSans-Regular.ttf'); + src: url('../../../../assets/fonts/IBMPlexSans-Regular.ttf'); } \ No newline at end of file diff --git a/src/pages/login_page/Login.js b/src/pages/LoginPage/Login.js similarity index 75% rename from src/pages/login_page/Login.js rename to src/pages/LoginPage/Login.js index 97fa70c..c2d7796 100644 --- a/src/pages/login_page/Login.js +++ b/src/pages/LoginPage/Login.js @@ -2,7 +2,7 @@ import { LoginForm } from "./components/LoginForm"; import RecruitProcess from "./components/RecruitProcess"; import { useAsync } from "react-async"; import { get_recruit_info } from "../../apis/get_recruit"; -import Not_allow_apply from "pages/Not_allow_page/Not_allow_apply"; +import Not_allow_apply from "pages/NotAllowPage/NotAllowApply"; export const Login = () => { const { data, error, isLoading } = useAsync({ promiseFn: get_recruit_info }); @@ -18,4 +18,11 @@ export const Login = () => { ); } + + // return ( + // <> + // + // + // + // ); }; diff --git a/src/pages/login_page/components/LoginForm.js b/src/pages/LoginPage/components/LoginForm.js similarity index 96% rename from src/pages/login_page/components/LoginForm.js rename to src/pages/LoginPage/components/LoginForm.js index e58c0ca..8b9b563 100644 --- a/src/pages/login_page/components/LoginForm.js +++ b/src/pages/LoginPage/components/LoginForm.js @@ -1,10 +1,12 @@ import { Col, Container, Form, Button } from "react-bootstrap"; -import { styles } from "./LoginForm.css"; import { useRef } from "react"; import { login } from "apis/login"; import { useNavigate } from "react-router-dom"; import { get_resume } from "apis/resume"; import { get_result } from "apis/result"; + +import { styles } from "./styles/LoginForm.css"; + export const LoginForm = ({ state }) => { const id = useRef(null); const password = useRef(null); @@ -91,8 +93,8 @@ export const LoginForm = ({ state }) => { {state === "apply" ? "지원서 작성하기" : state === "middle" - ? "서류 결과 확인하기" - : "최종 결과 확인하기"} + ? "서류 결과 확인하기" + : "최종 결과 확인하기"} diff --git a/src/pages/login_page/components/RecruitProcess.js b/src/pages/LoginPage/components/RecruitProcess.js similarity index 97% rename from src/pages/login_page/components/RecruitProcess.js rename to src/pages/LoginPage/components/RecruitProcess.js index 4f9255f..d702b9f 100644 --- a/src/pages/login_page/components/RecruitProcess.js +++ b/src/pages/LoginPage/components/RecruitProcess.js @@ -2,7 +2,9 @@ import { Container, Row, Col } from "react-bootstrap"; import { useAsync } from "react-async"; import dateFormat, { masks } from "dateformat"; -import styles from "./RecruitProcess.module.css"; + +import styles from "./styles/RecruitProcess.module.css"; + import right_vector from "./../../../assets/images/right_vector.png"; const RecruitProcess = ({ recruit_data }) => { const format = "m/d"; diff --git a/src/pages/login_page/components/LoginForm.css b/src/pages/LoginPage/components/styles/LoginForm.css similarity index 100% rename from src/pages/login_page/components/LoginForm.css rename to src/pages/LoginPage/components/styles/LoginForm.css diff --git a/src/pages/login_page/components/RecruitProcess.module.css b/src/pages/LoginPage/components/styles/RecruitProcess.module.css similarity index 100% rename from src/pages/login_page/components/RecruitProcess.module.css rename to src/pages/LoginPage/components/styles/RecruitProcess.module.css diff --git a/src/pages/main_page/Main.js b/src/pages/MainPage/Main.js similarity index 53% rename from src/pages/main_page/Main.js rename to src/pages/MainPage/Main.js index d9570d1..fdc1ad3 100644 --- a/src/pages/main_page/Main.js +++ b/src/pages/MainPage/Main.js @@ -1,9 +1,9 @@ import React from "react"; // components -import ImgMain from "./ImgMain/ImgMain"; -import IntroduceMain from "./IntroduceMain/IntroduceMain"; -import MainApplyCard from "./ApplyCardMain/MainApplyCard"; +import ImgMain from "./components/ImgMain/ImgMain"; +import IntroduceMain from "./components/IntroduceMain"; +import MainApplyCard from "./components/MainApplyCard"; const Main = () => { return ( diff --git a/src/pages/main_page/components/GoToApply.js b/src/pages/MainPage/components/GoToApply.js similarity index 92% rename from src/pages/main_page/components/GoToApply.js rename to src/pages/MainPage/components/GoToApply.js index b2ba674..cadb046 100644 --- a/src/pages/main_page/components/GoToApply.js +++ b/src/pages/MainPage/components/GoToApply.js @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; // import Apply from "../../apply_page/Apply"; -import "./GoToApply.css"; +import "./styles/GoToApply.css"; const GoToApply = ({ top, left }) => { return ( diff --git a/src/pages/main_page/ImgMain/ImgMain_1.js b/src/pages/MainPage/components/ImgMain/FirstImg.js similarity index 61% rename from src/pages/main_page/ImgMain/ImgMain_1.js rename to src/pages/MainPage/components/ImgMain/FirstImg.js index b5d0f39..e67e669 100644 --- a/src/pages/main_page/ImgMain/ImgMain_1.js +++ b/src/pages/MainPage/components/ImgMain/FirstImg.js @@ -1,12 +1,12 @@ import React from "react"; -import img_1 from "../../../assets/images/main/main_img_1.png"; +import img_1 from "../../../../assets/images/main/main_img_1.png"; -import GoToApply from "../components/GoToApply"; +import GoToApply from "../GoToApply"; -import "./ImgMain.css"; +import "../styles/ImgMain.css"; -const ImgMain_1 = () => { +const FirstImg = () => { return (
@@ -18,4 +18,4 @@ const ImgMain_1 = () => { ); }; -export default ImgMain_1; +export default FirstImg; diff --git a/src/pages/MainPage/components/ImgMain/ImgMain.js b/src/pages/MainPage/components/ImgMain/ImgMain.js new file mode 100644 index 0000000..8b0ff56 --- /dev/null +++ b/src/pages/MainPage/components/ImgMain/ImgMain.js @@ -0,0 +1,19 @@ +import React from "react"; + +import FirstImg from "./FirstImg"; +import SecondImg from "./SecondImg"; +import ThirdImg from "./ThirdImg"; + +import "../styles/ImgMain.css"; + +const ImgMain = () => { + return ( +
+ + + +
+ ); +}; + +export default ImgMain; diff --git a/src/pages/main_page/ImgMain/ImgMain_2.js b/src/pages/MainPage/components/ImgMain/SecondImg.js similarity index 85% rename from src/pages/main_page/ImgMain/ImgMain_2.js rename to src/pages/MainPage/components/ImgMain/SecondImg.js index e880258..607315f 100644 --- a/src/pages/main_page/ImgMain/ImgMain_2.js +++ b/src/pages/MainPage/components/ImgMain/SecondImg.js @@ -1,8 +1,8 @@ import React from "react"; -import "./ImgMain.css"; +import "../styles/ImgMain.css"; -const ImgMain_2 = () => { +const SecondImg = () => { return (
@@ -15,4 +15,4 @@ const ImgMain_2 = () => { ); }; -export default ImgMain_2; +export default SecondImg; diff --git a/src/pages/main_page/ImgMain/ImgMain_3.js b/src/pages/MainPage/components/ImgMain/ThirdImg.js similarity index 84% rename from src/pages/main_page/ImgMain/ImgMain_3.js rename to src/pages/MainPage/components/ImgMain/ThirdImg.js index 64107b7..8b8025a 100644 --- a/src/pages/main_page/ImgMain/ImgMain_3.js +++ b/src/pages/MainPage/components/ImgMain/ThirdImg.js @@ -1,14 +1,14 @@ import React from "react"; -import img_3 from "../../../assets/images/main/main_img_3.png"; +import img_3 from "../../../../assets/images/main/main_img_3.png"; -import "../components/GoToApply"; +import "../GoToApply"; -import "./ImgMain.css"; +import "../styles/ImgMain.css"; -import GoToApply from "../components/GoToApply"; +import GoToApply from "../GoToApply"; -const ImgMain_3 = () => { +const ThirdImg = () => { return (
@@ -39,4 +39,4 @@ const ImgMain_3 = () => { ); }; -export default ImgMain_3; +export default ThirdImg; diff --git a/src/pages/main_page/IntroduceMain/IntroduceMain.js b/src/pages/MainPage/components/IntroduceMain.js similarity index 97% rename from src/pages/main_page/IntroduceMain/IntroduceMain.js rename to src/pages/MainPage/components/IntroduceMain.js index 9b1caf5..0a21fd1 100644 --- a/src/pages/main_page/IntroduceMain/IntroduceMain.js +++ b/src/pages/MainPage/components/IntroduceMain.js @@ -1,5 +1,5 @@ import React from "react"; -import "./IntroduceMain.css"; +import "./styles/IntroduceMain.css"; import MoreStory from "./MoreStory"; diff --git a/src/pages/main_page/ApplyCardMain/MainApplyCard.js b/src/pages/MainPage/components/MainApplyCard.js similarity index 86% rename from src/pages/main_page/ApplyCardMain/MainApplyCard.js rename to src/pages/MainPage/components/MainApplyCard.js index 437b428..d171666 100644 --- a/src/pages/main_page/ApplyCardMain/MainApplyCard.js +++ b/src/pages/MainPage/components/MainApplyCard.js @@ -2,9 +2,9 @@ import React from "react"; import img from "../../../assets/images/main/main_apply_img.png"; -import GoToApply from "../components/GoToApply"; +import GoToApply from "./GoToApply"; -import "./MainApplyCard.css"; +import "./styles//MainApplyCard.css"; const MainApplyCard = () => { return ( diff --git a/src/pages/main_page/IntroduceMain/MoreStory.js b/src/pages/MainPage/components/MoreStory.js similarity index 90% rename from src/pages/main_page/IntroduceMain/MoreStory.js rename to src/pages/MainPage/components/MoreStory.js index 994d537..772dca9 100644 --- a/src/pages/main_page/IntroduceMain/MoreStory.js +++ b/src/pages/MainPage/components/MoreStory.js @@ -1,7 +1,7 @@ import React from "react"; import { Link } from "react-router-dom"; -import "./MoreStory.css"; +import "./styles/MoreStory.css"; const MoreStory = () => { return ( diff --git a/src/pages/main_page/components/GoToApply.css b/src/pages/MainPage/components/styles/GoToApply.css similarity index 100% rename from src/pages/main_page/components/GoToApply.css rename to src/pages/MainPage/components/styles/GoToApply.css diff --git a/src/pages/main_page/ImgMain/ImgMain.css b/src/pages/MainPage/components/styles/ImgMain.css similarity index 100% rename from src/pages/main_page/ImgMain/ImgMain.css rename to src/pages/MainPage/components/styles/ImgMain.css diff --git a/src/pages/main_page/IntroduceMain/IntroduceMain.css b/src/pages/MainPage/components/styles/IntroduceMain.css similarity index 100% rename from src/pages/main_page/IntroduceMain/IntroduceMain.css rename to src/pages/MainPage/components/styles/IntroduceMain.css diff --git a/src/pages/main_page/Main.css b/src/pages/MainPage/components/styles/Main.css similarity index 100% rename from src/pages/main_page/Main.css rename to src/pages/MainPage/components/styles/Main.css diff --git a/src/pages/main_page/ApplyCardMain/MainApplyCard.css b/src/pages/MainPage/components/styles/MainApplyCard.css similarity index 100% rename from src/pages/main_page/ApplyCardMain/MainApplyCard.css rename to src/pages/MainPage/components/styles/MainApplyCard.css diff --git a/src/pages/main_page/IntroduceMain/MoreStory.css b/src/pages/MainPage/components/styles/MoreStory.css similarity index 100% rename from src/pages/main_page/IntroduceMain/MoreStory.css rename to src/pages/MainPage/components/styles/MoreStory.css diff --git a/src/pages/Not_allow_page/Not_allow_apply.js b/src/pages/NotAllowPage/NotAllowApply.js similarity index 96% rename from src/pages/Not_allow_page/Not_allow_apply.js rename to src/pages/NotAllowPage/NotAllowApply.js index c078491..8be66a3 100644 --- a/src/pages/Not_allow_page/Not_allow_apply.js +++ b/src/pages/NotAllowPage/NotAllowApply.js @@ -1,9 +1,11 @@ import React, { useEffect, useState } from "react"; -import "./Not_allow_apply.css"; + import { Link } from "react-router-dom"; import { useAsync } from "react-async"; import { get_master_info } from "apis/master"; +import "./components/styles/NotAllowApply.css"; + const Not_allow_apply = () => { const { data, error, isLoading } = useAsync({ promiseFn: get_master_info }); diff --git a/src/pages/Not_allow_page/Not_allow_apply.css b/src/pages/NotAllowPage/components/styles/NotAllowApply.css similarity index 92% rename from src/pages/Not_allow_page/Not_allow_apply.css rename to src/pages/NotAllowPage/components/styles/NotAllowApply.css index 22adb48..b2e1372 100644 --- a/src/pages/Not_allow_page/Not_allow_apply.css +++ b/src/pages/NotAllowPage/components/styles/NotAllowApply.css @@ -9,7 +9,7 @@ @font-face { font-family: 'IBMPlexSans-Regular'; - src: url('../../assets/fonts/IBMPlexSans-Regular.ttf'); + src: url('../../../../assets/fonts/IBMPlexSans-Regular.ttf'); } .not_allowbox{ diff --git a/src/pages/result_page/FinalResult.js b/src/pages/ResultPage/FinalResult.js similarity index 76% rename from src/pages/result_page/FinalResult.js rename to src/pages/ResultPage/FinalResult.js index 13c899e..d4e4f49 100644 --- a/src/pages/result_page/FinalResult.js +++ b/src/pages/ResultPage/FinalResult.js @@ -1,7 +1,7 @@ import { useLocation } from "react-router-dom"; import NotFound from "pages/NotFound"; -import In_result_pass from "./Interview_result_pass_page/In_result_pass"; -import In_result_fail from "./Interview_result_fail_page/In_result_fail"; +import In_result_pass from "./components/InterviewPass"; +import In_result_fail from "./components/InterviewFail"; export const FinalResult = () => { const location = useLocation(); if (location.state === null) return ; diff --git a/src/pages/result_page/MiddleResult.js b/src/pages/ResultPage/MiddleResult.js similarity index 79% rename from src/pages/result_page/MiddleResult.js rename to src/pages/ResultPage/MiddleResult.js index 491f6d0..77b8082 100644 --- a/src/pages/result_page/MiddleResult.js +++ b/src/pages/ResultPage/MiddleResult.js @@ -1,5 +1,5 @@ -import Doc_result_fail from "./Doc_result_fail_page/Doc_result_fail"; -import Doc_result_pass from "./Doc_result_pass_page/Doc_result_pass"; +import Doc_result_fail from "./components/DocumentFail"; +import Doc_result_pass from "./components/DocumentPass"; import { useLocation } from "react-router-dom"; import NotFound from "pages/NotFound"; diff --git a/src/pages/result_page/Doc_result_fail_page/Doc_result_fail.js b/src/pages/ResultPage/components/DocumentFail.js similarity index 96% rename from src/pages/result_page/Doc_result_fail_page/Doc_result_fail.js rename to src/pages/ResultPage/components/DocumentFail.js index 37733e5..ab473bf 100644 --- a/src/pages/result_page/Doc_result_fail_page/Doc_result_fail.js +++ b/src/pages/ResultPage/components/DocumentFail.js @@ -1,5 +1,6 @@ import React from "react"; -import "./Doc_result_fail.css"; + +import "./styles/DocumentFail.css"; const Doc_result_fail = ({ resume }) => { return ( diff --git a/src/pages/result_page/Doc_result_pass_page/Doc_result_pass.js b/src/pages/ResultPage/components/DocumentPass.js similarity index 97% rename from src/pages/result_page/Doc_result_pass_page/Doc_result_pass.js rename to src/pages/ResultPage/components/DocumentPass.js index b1c6b52..2283450 100644 --- a/src/pages/result_page/Doc_result_pass_page/Doc_result_pass.js +++ b/src/pages/ResultPage/components/DocumentPass.js @@ -1,5 +1,5 @@ import React from "react"; -import "./Doc_result_pass.css"; +import "./styles/DocumentPass.css"; import imgMap from "../../../assets/images/result/map.png"; import imgSpot from "../../../assets/images/result/map-marker-Filled.png"; diff --git a/src/pages/result_page/Interview_result_fail_page/In_result_fail.js b/src/pages/ResultPage/components/InterviewFail.js similarity index 96% rename from src/pages/result_page/Interview_result_fail_page/In_result_fail.js rename to src/pages/ResultPage/components/InterviewFail.js index 893e064..cb4d92f 100644 --- a/src/pages/result_page/Interview_result_fail_page/In_result_fail.js +++ b/src/pages/ResultPage/components/InterviewFail.js @@ -1,5 +1,5 @@ import React from "react"; -import "./In_result_fail.css"; +import "./styles/InterviewFail.css"; const In_result_fail = ({ resume }) => { return ( diff --git a/src/pages/result_page/Interview_result_pass_page/In_result_pass.js b/src/pages/ResultPage/components/InterviewPass.js similarity index 97% rename from src/pages/result_page/Interview_result_pass_page/In_result_pass.js rename to src/pages/ResultPage/components/InterviewPass.js index 2e89d03..dd5a1a7 100644 --- a/src/pages/result_page/Interview_result_pass_page/In_result_pass.js +++ b/src/pages/ResultPage/components/InterviewPass.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import "./In_result_pass.css"; +import "./styles/InterviewPass.css"; import Confetti from "react-confetti"; const In_result_pass = ({ resume }) => { diff --git a/src/pages/result_page/Doc_result_fail_page/Doc_result_fail.css b/src/pages/ResultPage/components/styles/DocumentFail.css similarity index 94% rename from src/pages/result_page/Doc_result_fail_page/Doc_result_fail.css rename to src/pages/ResultPage/components/styles/DocumentFail.css index b247da8..0298b4b 100644 --- a/src/pages/result_page/Doc_result_fail_page/Doc_result_fail.css +++ b/src/pages/ResultPage/components/styles/DocumentFail.css @@ -11,7 +11,7 @@ @font-face { font-family: 'IBMPlexSans-Regular'; - src: url('../../../assets/fonts/IBMPlexSans-Regular.ttf'); + src: url('../../../../assets/fonts/IBMPlexSans-Regular.ttf'); } .fail_resultbox{ diff --git a/src/pages/result_page/Doc_result_pass_page/Doc_result_pass.css b/src/pages/ResultPage/components/styles/DocumentPass.css similarity index 96% rename from src/pages/result_page/Doc_result_pass_page/Doc_result_pass.css rename to src/pages/ResultPage/components/styles/DocumentPass.css index a9685ed..2bf536a 100644 --- a/src/pages/result_page/Doc_result_pass_page/Doc_result_pass.css +++ b/src/pages/ResultPage/components/styles/DocumentPass.css @@ -11,7 +11,7 @@ @font-face { font-family: 'IBMPlexSans-Regular'; - src: url('../../../assets/fonts/IBMPlexSans-Regular.ttf'); + src: url('../../../../assets/fonts/IBMPlexSans-Regular.ttf'); } .pass__resultbox{ diff --git a/src/pages/result_page/Interview_result_fail_page/In_result_fail.css b/src/pages/ResultPage/components/styles/InterviewFail.css similarity index 94% rename from src/pages/result_page/Interview_result_fail_page/In_result_fail.css rename to src/pages/ResultPage/components/styles/InterviewFail.css index b247da8..0298b4b 100644 --- a/src/pages/result_page/Interview_result_fail_page/In_result_fail.css +++ b/src/pages/ResultPage/components/styles/InterviewFail.css @@ -11,7 +11,7 @@ @font-face { font-family: 'IBMPlexSans-Regular'; - src: url('../../../assets/fonts/IBMPlexSans-Regular.ttf'); + src: url('../../../../assets/fonts/IBMPlexSans-Regular.ttf'); } .fail_resultbox{ diff --git a/src/pages/result_page/Interview_result_pass_page/In_result_pass.css b/src/pages/ResultPage/components/styles/InterviewPass.css similarity index 94% rename from src/pages/result_page/Interview_result_pass_page/In_result_pass.css rename to src/pages/ResultPage/components/styles/InterviewPass.css index 3009d58..e68f888 100644 --- a/src/pages/result_page/Interview_result_pass_page/In_result_pass.css +++ b/src/pages/ResultPage/components/styles/InterviewPass.css @@ -11,7 +11,7 @@ @font-face { font-family: 'IBMPlexSans-Regular'; - src: url('../../../assets/fonts/IBMPlexSans-Regular.ttf'); + src: url('../../../../assets/fonts/IBMPlexSans-Regular.ttf'); } .pass_resultbox{ diff --git a/src/pages/doing_page/Introduce.js b/src/pages/doing_page/Introduce.js deleted file mode 100644 index b85b2b7..0000000 --- a/src/pages/doing_page/Introduce.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from "react"; -import "bootstrap/dist/css/bootstrap.min.css"; -import "./Introduce.css"; -import Introduce_1 from "./Introduce_1/Introduce_1"; -import Introduce_2 from "./Introduce_2/Introduce_2"; -import Introduce_3 from "./Introduce_3/Introduce_3"; -import Introduce_4 from "./Introduce_4/Introduce_4"; -import Introduce_5 from "./Introduce_5/Introduce_5"; - -const Introduce = () => { - return ( - <> -
-
소개
-
- - - - - - - - ); -}; - -export default Introduce; diff --git a/src/pages/doing_page/Introduce_5/Introduce_5.js b/src/pages/doing_page/Introduce_5/Introduce_5.js deleted file mode 100644 index 2584454..0000000 --- a/src/pages/doing_page/Introduce_5/Introduce_5.js +++ /dev/null @@ -1,15 +0,0 @@ -import React from "react"; -import MainApplyCard from "../../main_page/ApplyCardMain/MainApplyCard"; -import "../Introduce.css"; -import "./Introduce_5.css"; - -const Introduce_5 = () => { - return ( - <> -
- - - ); -}; - -export default Introduce_5; diff --git a/src/pages/main_page/ImgMain/ImgMain.js b/src/pages/main_page/ImgMain/ImgMain.js deleted file mode 100644 index 3aa3cec..0000000 --- a/src/pages/main_page/ImgMain/ImgMain.js +++ /dev/null @@ -1,19 +0,0 @@ -import React from "react"; - -import ImgMain_1 from "./ImgMain_1"; -import ImgMain_2 from "./ImgMain_2"; -import ImgMain_3 from "./ImgMain_3"; - -import "./ImgMain.css"; - -const ImgMain = () => { - return ( -
- - - -
- ); -}; - -export default ImgMain; From bba5381ff431e55b49da50e818ea79d9ffc50467 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Wed, 14 Feb 2024 21:34:57 +0900 Subject: [PATCH 15/17] rename: layout -> components --- src/App.js | 6 +++--- src/{layouts => components}/Banner.css | 0 src/{layouts => components}/Banner.js | 0 src/{layouts => components}/FlyingButton.css | 0 src/{layouts => components}/FlyingButton.js | 0 src/{layouts => components}/Footer.css | 0 src/{layouts => components}/Footer.js | 0 src/{layouts => components}/MainLayout.js | 0 src/{layouts => components}/MakeCards.js | 0 src/{layouts => components}/ScrollToTop.js | 0 src/{layouts => components}/applyBanner/ApplyBanner.css | 0 src/{layouts => components}/applyBanner/ApplyBanner.js | 0 src/pages/ApplyPage/Apply.js | 2 +- 13 files changed, 4 insertions(+), 4 deletions(-) rename src/{layouts => components}/Banner.css (100%) rename src/{layouts => components}/Banner.js (100%) rename src/{layouts => components}/FlyingButton.css (100%) rename src/{layouts => components}/FlyingButton.js (100%) rename src/{layouts => components}/Footer.css (100%) rename src/{layouts => components}/Footer.js (100%) rename src/{layouts => components}/MainLayout.js (100%) rename src/{layouts => components}/MakeCards.js (100%) rename src/{layouts => components}/ScrollToTop.js (100%) rename src/{layouts => components}/applyBanner/ApplyBanner.css (100%) rename src/{layouts => components}/applyBanner/ApplyBanner.js (100%) diff --git a/src/App.js b/src/App.js index 8702b0f..fa1406d 100644 --- a/src/App.js +++ b/src/App.js @@ -5,9 +5,9 @@ import { useAsync } from "react-async"; import "bootstrap/dist/css/bootstrap.min.css"; // layouts -import MainLayout from "./layouts/MainLayout"; -import ApplyBanner from "./layouts/applyBanner/ApplyBanner"; -import ScrollToTop from "layouts/ScrollToTop"; +import MainLayout from "./components/MainLayout"; +import ApplyBanner from "./components/applyBanner/ApplyBanner"; +import ScrollToTop from "components/ScrollToTop"; // pages import Main from "./pages/MainPage/Main"; diff --git a/src/layouts/Banner.css b/src/components/Banner.css similarity index 100% rename from src/layouts/Banner.css rename to src/components/Banner.css diff --git a/src/layouts/Banner.js b/src/components/Banner.js similarity index 100% rename from src/layouts/Banner.js rename to src/components/Banner.js diff --git a/src/layouts/FlyingButton.css b/src/components/FlyingButton.css similarity index 100% rename from src/layouts/FlyingButton.css rename to src/components/FlyingButton.css diff --git a/src/layouts/FlyingButton.js b/src/components/FlyingButton.js similarity index 100% rename from src/layouts/FlyingButton.js rename to src/components/FlyingButton.js diff --git a/src/layouts/Footer.css b/src/components/Footer.css similarity index 100% rename from src/layouts/Footer.css rename to src/components/Footer.css diff --git a/src/layouts/Footer.js b/src/components/Footer.js similarity index 100% rename from src/layouts/Footer.js rename to src/components/Footer.js diff --git a/src/layouts/MainLayout.js b/src/components/MainLayout.js similarity index 100% rename from src/layouts/MainLayout.js rename to src/components/MainLayout.js diff --git a/src/layouts/MakeCards.js b/src/components/MakeCards.js similarity index 100% rename from src/layouts/MakeCards.js rename to src/components/MakeCards.js diff --git a/src/layouts/ScrollToTop.js b/src/components/ScrollToTop.js similarity index 100% rename from src/layouts/ScrollToTop.js rename to src/components/ScrollToTop.js diff --git a/src/layouts/applyBanner/ApplyBanner.css b/src/components/applyBanner/ApplyBanner.css similarity index 100% rename from src/layouts/applyBanner/ApplyBanner.css rename to src/components/applyBanner/ApplyBanner.css diff --git a/src/layouts/applyBanner/ApplyBanner.js b/src/components/applyBanner/ApplyBanner.js similarity index 100% rename from src/layouts/applyBanner/ApplyBanner.js rename to src/components/applyBanner/ApplyBanner.js diff --git a/src/pages/ApplyPage/Apply.js b/src/pages/ApplyPage/Apply.js index 8e8949c..9d1b381 100644 --- a/src/pages/ApplyPage/Apply.js +++ b/src/pages/ApplyPage/Apply.js @@ -22,7 +22,7 @@ import ApplyComplete from "./components/Complete/ApplyComplete"; import "./components/styles/Apply.css"; // applybanner -import ApplyBanner from "../../layouts/applyBanner/ApplyBanner"; +import ApplyBanner from "../../components/applyBanner/ApplyBanner"; // Login.js에서 firstLogin 여부 확인해서 처리하기 From f36d88d5b07acbf2692724419188b60f1e1958b3 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Wed, 14 Feb 2024 21:36:48 +0900 Subject: [PATCH 16/17] fix: css route --- src/pages/MainPage/components/MainApplyCard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/MainPage/components/MainApplyCard.js b/src/pages/MainPage/components/MainApplyCard.js index d171666..006a3a0 100644 --- a/src/pages/MainPage/components/MainApplyCard.js +++ b/src/pages/MainPage/components/MainApplyCard.js @@ -4,7 +4,7 @@ import img from "../../../assets/images/main/main_apply_img.png"; import GoToApply from "./GoToApply"; -import "./styles//MainApplyCard.css"; +import "./styles/MainApplyCard.css"; const MainApplyCard = () => { return ( From f60c94d372a958792bdd28e518fa6c48357ca143 Mon Sep 17 00:00:00 2001 From: Youngho-kr Date: Wed, 14 Feb 2024 21:54:38 +0900 Subject: [PATCH 17/17] refactor: ApplyCard, GoToApply components move to components directory --- .../MainApplyCard.js => components/ApplyCard.js} | 4 ++-- src/{pages/MainPage => }/components/GoToApply.js | 2 -- .../styles/ApplyCard.css} | 0 .../components/styles/GoToApply.css | 0 src/pages/IntroducePage/Introduce.js | 5 +++-- .../components/ApplyCardIntorduce.js | 16 ---------------- .../components/styles/ApplyCardIntroduce.css | 3 --- .../components/styles/ImgIntroduce.css | 2 ++ src/pages/MainPage/Main.js | 7 +++++-- .../MainPage/components/ImgMain/FirstImg.js | 2 +- .../MainPage/components/ImgMain/ThirdImg.js | 6 ++---- 11 files changed, 15 insertions(+), 32 deletions(-) rename src/{pages/MainPage/components/MainApplyCard.js => components/ApplyCard.js} (81%) rename src/{pages/MainPage => }/components/GoToApply.js (88%) rename src/{pages/MainPage/components/styles/MainApplyCard.css => components/styles/ApplyCard.css} (100%) rename src/{pages/MainPage => }/components/styles/GoToApply.css (100%) delete mode 100644 src/pages/IntroducePage/components/ApplyCardIntorduce.js delete mode 100644 src/pages/IntroducePage/components/styles/ApplyCardIntroduce.css diff --git a/src/pages/MainPage/components/MainApplyCard.js b/src/components/ApplyCard.js similarity index 81% rename from src/pages/MainPage/components/MainApplyCard.js rename to src/components/ApplyCard.js index 006a3a0..226806a 100644 --- a/src/pages/MainPage/components/MainApplyCard.js +++ b/src/components/ApplyCard.js @@ -1,10 +1,10 @@ import React from "react"; -import img from "../../../assets/images/main/main_apply_img.png"; +import img from "../assets/images/main/main_apply_img.png"; import GoToApply from "./GoToApply"; -import "./styles/MainApplyCard.css"; +import "./styles/ApplyCard.css"; const MainApplyCard = () => { return ( diff --git a/src/pages/MainPage/components/GoToApply.js b/src/components/GoToApply.js similarity index 88% rename from src/pages/MainPage/components/GoToApply.js rename to src/components/GoToApply.js index cadb046..ec72852 100644 --- a/src/pages/MainPage/components/GoToApply.js +++ b/src/components/GoToApply.js @@ -1,8 +1,6 @@ import React from "react"; import { Link } from "react-router-dom"; -// import Apply from "../../apply_page/Apply"; - import "./styles/GoToApply.css"; const GoToApply = ({ top, left }) => { diff --git a/src/pages/MainPage/components/styles/MainApplyCard.css b/src/components/styles/ApplyCard.css similarity index 100% rename from src/pages/MainPage/components/styles/MainApplyCard.css rename to src/components/styles/ApplyCard.css diff --git a/src/pages/MainPage/components/styles/GoToApply.css b/src/components/styles/GoToApply.css similarity index 100% rename from src/pages/MainPage/components/styles/GoToApply.css rename to src/components/styles/GoToApply.css diff --git a/src/pages/IntroducePage/Introduce.js b/src/pages/IntroducePage/Introduce.js index 81ba333..05ca294 100644 --- a/src/pages/IntroducePage/Introduce.js +++ b/src/pages/IntroducePage/Introduce.js @@ -7,7 +7,8 @@ import Info from "./components/Info"; import Benefit from "./components/Benefit"; import Elite from "./components/Elite"; import ImgIntroduce from "./components/ImgIntroduce"; -import ApplyCardIntorduce from "./components/ApplyCardIntorduce"; + +import ApplyCard from "../../components/ApplyCard"; const Introduce = () => { return ( @@ -20,7 +21,7 @@ const Introduce = () => { - + ); }; diff --git a/src/pages/IntroducePage/components/ApplyCardIntorduce.js b/src/pages/IntroducePage/components/ApplyCardIntorduce.js deleted file mode 100644 index 1ff6080..0000000 --- a/src/pages/IntroducePage/components/ApplyCardIntorduce.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from "react"; -import MainApplyCard from "../../MainPage/components/MainApplyCard"; - -import "./styles/Introduce.css"; -import "./styles/ApplyCardIntroduce.css"; - -const ApplyCardIntroduce = () => { - return ( - <> -
- - - ); -}; - -export default ApplyCardIntroduce; diff --git a/src/pages/IntroducePage/components/styles/ApplyCardIntroduce.css b/src/pages/IntroducePage/components/styles/ApplyCardIntroduce.css deleted file mode 100644 index e62021a..0000000 --- a/src/pages/IntroducePage/components/styles/ApplyCardIntroduce.css +++ /dev/null @@ -1,3 +0,0 @@ -.blank{ - margin-top: 235px; -} \ No newline at end of file diff --git a/src/pages/IntroducePage/components/styles/ImgIntroduce.css b/src/pages/IntroducePage/components/styles/ImgIntroduce.css index ac7d764..1d2bf9f 100644 --- a/src/pages/IntroducePage/components/styles/ImgIntroduce.css +++ b/src/pages/IntroducePage/components/styles/ImgIntroduce.css @@ -4,6 +4,8 @@ justify-content: space-between; align-items: center; text-align: left; + + height: 2079px; } .frame{ diff --git a/src/pages/MainPage/Main.js b/src/pages/MainPage/Main.js index fdc1ad3..e0b2e6e 100644 --- a/src/pages/MainPage/Main.js +++ b/src/pages/MainPage/Main.js @@ -3,14 +3,17 @@ import React from "react"; // components import ImgMain from "./components/ImgMain/ImgMain"; import IntroduceMain from "./components/IntroduceMain"; -import MainApplyCard from "./components/MainApplyCard"; +// import MainApplyCard from "./components/MainApplyCard"; + +import ApplyCard from "../../components/ApplyCard"; const Main = () => { return ( <> - + {/* */} + ); }; diff --git a/src/pages/MainPage/components/ImgMain/FirstImg.js b/src/pages/MainPage/components/ImgMain/FirstImg.js index e67e669..e4375b6 100644 --- a/src/pages/MainPage/components/ImgMain/FirstImg.js +++ b/src/pages/MainPage/components/ImgMain/FirstImg.js @@ -2,7 +2,7 @@ import React from "react"; import img_1 from "../../../../assets/images/main/main_img_1.png"; -import GoToApply from "../GoToApply"; +import GoToApply from "../../../../components/GoToApply"; import "../styles/ImgMain.css"; diff --git a/src/pages/MainPage/components/ImgMain/ThirdImg.js b/src/pages/MainPage/components/ImgMain/ThirdImg.js index 8b8025a..ba93697 100644 --- a/src/pages/MainPage/components/ImgMain/ThirdImg.js +++ b/src/pages/MainPage/components/ImgMain/ThirdImg.js @@ -1,12 +1,10 @@ import React from "react"; -import img_3 from "../../../../assets/images/main/main_img_3.png"; - -import "../GoToApply"; +import GoToApply from "../../../../components/GoToApply"; import "../styles/ImgMain.css"; -import GoToApply from "../GoToApply"; +import img_3 from "../../../../assets/images/main/main_img_3.png"; const ThirdImg = () => { return (