diff --git a/server/client/src/Components/Menu.js b/server/client/src/Components/Menu.js
index 166f9dd567c645f7395cba6a7e81a920edf4dc29..16e77642bae16b3ccdadc38715249ec4d5867139 100644
--- a/server/client/src/Components/Menu.js
+++ b/server/client/src/Components/Menu.js
@@ -9,6 +9,10 @@ const Nav = styled.nav`
a {
color: #ffffff;
}
+
+ & .logoutBtn:hover {
+ text-decoration: underline;
+ }
`
function Menu() {
@@ -49,9 +53,13 @@ function Menu() {
대관 확인/취소
-
-
{name}님 안녕하세요.
-
+
+
{name}님 안녕하세요
+
+ 비밀번호 변경 / 로그아웃
diff --git a/server/client/src/Pages/HomePage.js b/server/client/src/Pages/HomePage.js
index 489c8dd1970e549027345fa5a4df11177963d03b..fcfe233e010278bd227bc205b9179d22c508e734 100644
--- a/server/client/src/Pages/HomePage.js
+++ b/server/client/src/Pages/HomePage.js
@@ -10,10 +10,6 @@ function Home() {
home
-
)
diff --git a/server/client/src/Pages/LoginPage.js b/server/client/src/Pages/LoginPage.js
index 6d82cc06dcc82aa23c8377f8e4acfe3de1de7b35..b2dfccf5aefd2617edda4b30915ba8bbf2268f6d 100644
--- a/server/client/src/Pages/LoginPage.js
+++ b/server/client/src/Pages/LoginPage.js
@@ -109,7 +109,7 @@ function Login() {
-
고려대학교
대관 서비스
+ 고려대학교
대관 서비스
@@ -132,7 +132,7 @@ function Login() {
if (res.status === 404) return alert(res.data.error)
localStorage.setItem('token', res.data.token);
- localStorage.setItem('id', res.data.users._id);
+ localStorage.setItem('_id', res.data.users._id);
localStorage.setItem('name', res.data.users.name);
setState(true);
})
diff --git a/server/client/src/Pages/NoticePage.js b/server/client/src/Pages/NoticePage.js
index 14b4cb120505d0bb2d2b309e3d9fdfae389d802a..a23c2c3a5b64287d200e9b28f7fa38da5fb2d406 100644
--- a/server/client/src/Pages/NoticePage.js
+++ b/server/client/src/Pages/NoticePage.js
@@ -1,6 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
import Menu from '../Components/Menu';
import axios from 'axios';
+import styled from 'styled-components';
function Notice() {
const [notices, setNotices] = useState([]);
@@ -9,6 +10,19 @@ function Notice() {
getNotice();
}, []);
+ function dateForm(day) {
+ const post_day = new Date(day);
+ let year = post_day.getFullYear();
+ let month = post_day.getMonth() + 1;
+ let date = post_day.getDate();
+
+ month = month < 10 ? '0' + month : month;
+ date = date < 10 ? '0' + date : date;
+
+ const new_date = year + "-" + month + "-" + date;
+ return new_date
+ }
+
function getNotice() {
axios.get(`/notices`)
.then(res => {
@@ -25,13 +39,32 @@ function Notice() {
return (
-
-
-
- {notices.map((notice) =>
{notice.notice_title}
)}
+
+
+
+
+
공지사항
+
+
+ {notices.map((notice, index) =>
+
+
+
+
{notice.notice_title}
+
{notice.notice_author}
+
{dateForm(notice.post_date)}
+
+
+
+
{notice.notice_content}
+
+
+ )}
+
+
-
-
+
+
)
}
diff --git a/server/client/src/index.js b/server/client/src/index.js
index 72a7ab9a6e3cff8b1c4a5cb5979aa701bdaa898d..95f5b339c106f4f2d81abeba692268d0b31336be 100644
--- a/server/client/src/index.js
+++ b/server/client/src/index.js
@@ -2,8 +2,8 @@ import React from 'react';
import ReactDOM from 'react-dom';
import * as serviceWorker from './serviceWorker';
import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom';
-// import 'bootstrap';
-// import 'bootstrap/dist/css/bootstrap.css';
+import 'bootstrap';
+import 'bootstrap/dist/css/bootstrap.css';
import axios from 'axios';
import { PrivateRoute } from './Components/PrivateRoute';