Feature/#5 to dev 머지 (#6)

* 랜딩페이지 리펙토링

* 랜딩페이지 리펙토링

* 랜딩 페이지 리펙토링

* 랜딩페이지 수정

* 랜딩페이지 수정

* 랜딩페이지 popup 창 추가

* 랜딩페이지 기능 수정

* 랜딩페이지 api 연동

* 랜딩페이지 리펙토링

* cors 문제 해결

* 랜딩페이지 최종 프로토타입1

* 랜딩 페이지 수정

* 랜딩 페이지 수정

.gitignore

@@ -21,3 +21,8 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# env
+.env
+.env.development
+.env.production

package.json

@@ -1,19 +1,26 @@
 {
-  "name": "landing-page-test",
+  "name": "landing-page",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@emotion/react": "^11.11.0",
+    "@emotion/styled": "^11.11.0",
     "@fullcalendar/core": "^6.1.7",
     "@fullcalendar/daygrid": "^6.1.7",
     "@fullcalendar/interaction": "^6.1.7",
     "@fullcalendar/react": "^6.1.7",
     "@fullcalendar/timegrid": "^6.1.7",
+    "@material-ui/core": "^4.12.4",
+    "@mui/material": "^5.13.3",
+    "@mui/styled-engine-sc": "^5.12.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "@toast-ui/react-calendar": "^2.1.3",
+    "axios": "^1.4.0",
     "bootstrap": "^5.2.3",
     "framer-motion": "^10.12.10",
+    "http-proxy-middleware": "^2.0.6",
     "react": "^18.2.0",
     "react-bootstrap": "^2.7.4",
     "react-cookie": "^4.1.1",
@@ -24,6 +31,7 @@
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
     "reselect": "^4.1.8",
+    "styled-components": "^5.3.11",
     "tui-calendar": "^1.15.3",
     "tui-date-picker": "^4.3.3",
     "tui-time-picker": "^2.1.6",
@@ -52,5 +60,6 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  }
+  },
+  "proxy": "http://www.silindar.com"
 }

public/index.html

@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Web site created using create-react-app"
+      content="스타트업 멘토멘티 플랫폼, 실린더"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--

public/manifest.json

@@ -2,11 +2,7 @@
   "short_name": "React App",
   "name": "Create React App Sample",
   "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
+
     {
       "src": "logo192.png",
       "type": "image/png",

src/App.css

@@ -1,5 +1,106 @@
 #root{
     --fc-border-color:none;
     font-family: 'Spoqa Han Sans Neo', 'sans-serif';
-    background-color: #000000;
+    background-color: #171717;
+    font-family: 'Pretendard';
+}
+
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 100;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.ttf') format("truetype");
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 200;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.ttf') format("truetype");
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 300;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.ttf') format("truetype");
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 400;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.ttf') format("truetype");
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 500;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.ttf') format("truetype");
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 600;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.ttf') format("truetype");
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 700;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.ttf') format("truetype");
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 800;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.ttf') format("truetype");
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Pretendard';
+    font-weight: 900;
+    font-style: normal;
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.eot');
+    src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.eot?#iefix') format('embedded-opentype'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.woff2') format('woff2'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.woff') format('woff'),
+        url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.ttf') format("truetype");
+    font-display: swap;
 }

src/App.js

@@ -7,7 +7,8 @@ import MainPage from './pages/MainPage';
 import BootstrapFrame from './pages/BootstrapFrame';
 import DemoApp from './components/DemoApp';
 // import "bootstrap/dist/css/bootstrap.min.css";
-
+import Dropdown from './components/Dropdown'
+import React from 'react';
 
 function App() {
   return (

src/components/Calendar.css

@@ -1,4 +1,4 @@
-.fc-theme-standard .fc-scrollgrid {
+.fc-theme-standard .fc-scrollgrid{
     border: none;
 }
 
@@ -19,8 +19,16 @@
     background-color: #3D3D3D;
 }
 
-.fc-day-sun{
-    color: red;
+
+.fc .fc-daygrid-day-number{
+    color: rgba(255, 255, 255, 0.5);;
+}
+
+.fc-day-sun {
+    color:#FF8E8E;
+}
+.fc-day-sat {
+    color: #8B8B8B;
 }
 
 .fc-day-today>div{
@@ -37,9 +45,9 @@
 }
 
 .fc .fc-daygrid-day-frame{
-    border-right: 2px solid black;
-    border-left: 2px solid black;
-    border-bottom: 4px solid black;
+    border-right: 2px solid #171717;
+    border-left: 2px solid #171717;
+    border-bottom: 4px solid #171717;
 }
 .fc-day-sat div{
     border-right: 0px;

src/components/CalendarNote.css

@@ -0,0 +1,26 @@
+#calendar_note{
+    margin-top: 78px;
+    margin-bottom: 11px;
+    font-weight: 700;
+    text-align: center;
+}
+#calendar_note .t1{
+    font-size: 24px;
+    margin-bottom: 15px;
+    font-weight: 700;
+    color: #FFFFFF;
+}
+
+#calendar_note .t2{
+    margin-bottom: 5px;
+    font-size: 16px;
+    color: #F7F7F7;
+    font-weight: 500;
+}
+
+#calendar_note .t3{
+    font-size: 16px;
+    color: #F7F7F7;
+    font-weight: 500;
+    padding-top: 4px;
+}

src/components/CalendarNote.js

@@ -0,0 +1,12 @@
+import './CalendarNote.css'
+
+export default function CalendarNote(){
+    return (
+        <div id='calendar_note'>
+            <h1 className='t1'>유의사항</h1>
+            <h1 className='t2'>매주 스타트업 일정이 업데이트 됩니다.</h1>
+            <h1 className='t3'>한 칸 일정은 마감일 기준입니다.</h1>
+            {/* <h1 className='t3'>모든 일정은 마감일 기준입니다.</h1> */}
+        </div>
+    );
+}