Merge commit '72d1e011' into develop

@@ -5,6 +5,7 @@ import LoginPage from './pages/LoginPage';
 import RegisterPage from './pages/RegisterPage';
 import RegisterPage from './pages/RegisterPage';
 import HomePage from './pages/HomePage';
 import HomePage from './pages/HomePage';
 import SettingPage from './pages/SettingPage';
 import SettingPage from './pages/SettingPage';
+import ChallengePage from './pages/ChallengePage';
 
 
 function App() {
 function App() {
   return (
   return (
@@ -13,6 +14,7 @@ function App() {
       <Route component={LoginPage} path="/login" />
       <Route component={LoginPage} path="/login" />
       <Route component={RegisterPage} path="/register" />
       <Route component={RegisterPage} path="/register" />
       <Route component={SettingPage} path="/setting" />
       <Route component={SettingPage} path="/setting" />
+      <Route component={ChallengePage} path="/challenge" />
     </>
     </>
   );
   );
 }
 }

+import React from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import Paper from '@material-ui/core/Paper';
+import Grid from '@material-ui/core/Grid';
+import palette from '../../lib/styles/palette';
+const ChallengeForm = () => {
+  return <div></div>;
+};
+
+/*
+Todo
+챌린지 이름
+챌린지 기간 (Start - End)
+챌린지 세션 정보 (일 간격과 목표 문제)
+그룹 원 정보.
+*/
+export default ChallengeForm;

@@ -8,6 +8,10 @@ const categories = [
     text: '홈',
     text: '홈',
   },
   },
   {
   {
+    name: 'challenge',
+    text: '챌린지',
+  },
+  {
     name: 'setting',
     name: 'setting',
     text: '설정',
     text: '설정',
   },
   },

+import React from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { withRouter } from 'react-router-dom';
+import ChallengeForm from '../../components/challenge/ChallengeForm';
+
+const ChallengeContainer = () => {
+  return <div></div>;
+};
+
+export default ChallengeContainer;

+import React from 'react';
+import HeaderContainer from '../containers/common/HeaderContainer';
+import ChallengeContainer from '../containers/challenge/ChallengeContainer';
+const ChallengePage = () => {
+  return (
+    <div>
+      <HeaderContainer />
+      <ChallengeContainer />
+    </div>
+  );
+};
+
+export default ChallengePage;