Merge pull request #13 from eunhye-ahn/revert-11-frontend/group-vote-page

Revert "[FE] 댓글 : 작성, 조회, 삭제 기능 구현"

Author: eunhye-ahn

polling-app-client/.idea/.gitignore

@@ -2,14 +2,12 @@
   "name": "polling-app-client",
   "version": "0.1.0",
   "private": true,
-  "proxy": "http://localhost:8080",
   "dependencies": {
     "antd": "^3.2.2",
     "react": "^16.5.2",
     "react-dom": "^16.5.2",
     "react-router-dom": "^4.3.1",
-    "react-scripts": "1.1.5",
-    "slick-carousel": "^1.8.1"
+    "react-scripts": "1.1.5"
   },
   "scripts": {
     "start": "react-app-rewired start",

polling-app-client/.idea/misc.xml

@@ -1,7 +1,3 @@
-import HomeDashboard from '../components/Dashboard/HomeDashboard';
-import GroupPollList from '../components/Dashboard/GroupPollList';
-import MyComments from '../components/Dashboard/MyComments';
-
 import React, { Component } from 'react';
 import './App.css';
 import {
@@ -13,6 +9,7 @@ import {
 import { getCurrentUser } from '../util/APIUtils';
 import { ACCESS_TOKEN } from '../constants';
 
+import PollList from '../poll/PollList';
 import NewPoll from '../poll/NewPoll';
 import Login from '../user/login/Login';
 import Signup from '../user/signup/Signup';
@@ -22,7 +19,6 @@ import NotFound from '../common/NotFound';
 import LoadingIndicator from '../common/LoadingIndicator';
 import PrivateRoute from '../common/PrivateRoute';
 
-
 import { Layout, notification } from 'antd';
 const { Content } = Layout;
 
@@ -103,41 +99,19 @@ class App extends Component {
           <Content className="app-content">
             <div className="container">
               <Switch>      
-                <Route exact path="/"
-                  render={(props) => (
-                    <HomeDashboard
-                      currentUser={this.state.currentUser}
-                      isAuthenticated={this.state.isAuthenticated}
-                      handleLogout={this.handleLogout}
-                      {...props}
-                    />
-                  )}
-                />
-
-
-
-                <Route path="/login"
+                <Route exact path="/" 
+                  render={(props) => <PollList isAuthenticated={this.state.isAuthenticated} 
+                      currentUser={this.state.currentUser} handleLogout={this.handleLogout} {...props} />}>
+                </Route>
+                <Route path="/login" 
                   render={(props) => <Login onLogin={this.handleLogin} {...props} />}></Route>
                 <Route path="/signup" component={Signup}></Route>
-
                 <Route path="/users/:username" 
                   render={(props) => <Profile isAuthenticated={this.state.isAuthenticated} currentUser={this.state.currentUser} {...props}  />}>
                 </Route>
                 <PrivateRoute authenticated={this.state.isAuthenticated} path="/poll/new" component={NewPoll} handleLogout={this.handleLogout}></PrivateRoute>
-<PrivateRoute
-    path="/groups/:groupId/polls"
-    component={GroupPollList}
-    authenticated={this.state.isAuthenticated}
-  />
-
-  <PrivateRoute
-    path="/polls/:pollId/comments"
-    component={MyComments}
-    authenticated={this.state.isAuthenticated}
-  />
-
-  <Route component={NotFound} />
-</Switch>
+                <Route component={NotFound}></Route>
+              </Switch>
             </div>
           </Content>
         </Layout>

polling-app-client/.idea/modules.xml

@@ -34,7 +34,6 @@ class AppHeader extends Component {
               <img src={pollIcon} alt="poll" className="poll-icon" />
             </Link>
           </Menu.Item>,
-
           <Menu.Item key="/profile" className="profile-menu">
                 <ProfileDropdownMenu 
                   currentUser={this.props.currentUser} 

polling-app-client/.idea/polling-app-client.iml

@@ -1,22 +1,26 @@
 import React from 'react';
-import { Route, Redirect } from "react-router-dom";
-
-const PrivateRoute = ({ component: Component, render, authenticated, ...rest }) => (
-  <Route
-    {...rest}
-    render={props =>
-      authenticated ? (
-        render ? render(props) : <Component {...props} />
-      ) : (
-        <Redirect
-          to={{
-            pathname: '/login',
-            state: { from: props.location }
-          }}
-        />
-      )
-    }
-  />
+import {
+    Route,
+    Redirect
+  } from "react-router-dom";
+  
+  
+const PrivateRoute = ({ component: Component, authenticated, ...rest }) => (
+    <Route
+      {...rest}
+      render={props =>
+        authenticated ? (
+          <Component {...rest} {...props} />
+        ) : (
+          <Redirect
+            to={{
+              pathname: '/login',
+              state: { from: props.location }
+            }}
+          />
+        )
+      }
+    />
 );
-
-export default PrivateRoute;
+  
+export default PrivateRoute