Merge branch 'who' into premaster

client/src/App.js

@@ -4,7 +4,7 @@ import './App.css';
 import Home from './pages/Home';
 import SignupPage from './pages/SignupPage';
 import LoginPage from './pages/LoginPage';
-import LocalCodePage from './pages/LocalCodePage';
+import EditPage from './pages/EditPage';
 import PrivateRoute from './utils/PrivateRoutes';
 import PageNotFound from './components/PageNotFound';
 import Footer from './components/Footer';
@@ -18,14 +18,14 @@ function App() {
         <Route exact path='/' component={Home} />
         <Route path='/signup' component={SignupPage} />
         <Route path='/login' component={LoginPage} />
-        <Route path='/loc' component={LocalCodePage} />
 
-        <PrivateRoute path='/local_code'>
-          <LocalCodePage />
+        <PrivateRoute path='/edit'>
+          <EditPage />
         </PrivateRoute>
 
         <Route component={PageNotFound} />
       </Switch>
+
       <Footer />
     </Router>
 

client/src/components/UserInfo.js

@@ -78,7 +78,7 @@ function UserInfo() {
                         </Card.Subtitle>
                         {nickname &&
                             <Button variant='light' className='m-auto d-flex' style={btnstyled2}>
-                                <Link to='/local_code' className='w-100' style={{ textDecoration: 'none', color: 'rgb(110, 189, 142)' }}>
+                                <Link to='/edit' className='w-100' style={{ textDecoration: 'none', color: 'rgb(110, 189, 142)' }}>
                                     변경
                                 </Link>
                             </Button>

client/src/pages/LocalCodePage.js → client/src/pages/EditPage.js

@@ -5,7 +5,7 @@ import '../App.css'
 import LocCodeChange from '../components/LocCodeChange';
 import NicknameChange from '../components/NicknameChange';
 
-function SignupPage() {
+function EditPage() {
     const constyled = {
         display: 'flex',
         justifyContent: 'space-evenly',
@@ -49,4 +49,4 @@ function SignupPage() {
     );
 }
 
-export default SignupPage;
+export default EditPage;
\ No newline at end of file

client/src/routes.js

@@ -2,7 +2,7 @@ export const routes = {
   home: '/',
   signup: '/signup',
   login: 'login',
-  localcode: '/local_code',
+  edit: '/edit',
 }