diff --git a/backend/src/auth.js b/backend/src/auth.js index fdac48089d6ab2c6cbf1640458562323b3de65a7..534ab743351c7631794c8b4f008a4d68b5a29f2c 100644 --- a/backend/src/auth.js +++ b/backend/src/auth.js @@ -31,7 +31,7 @@ router.post('/login', async (req, res) => { console.log('login done') req.session.sessionid = req.body; //�꾨줎�몄뿉�� 嫄대꽕諛쏆� JWT濡� �몄뀡 �앹꽦 - res.cookie('name', req.body.name, {expires}); //�ъ슜�� �대쫫 荑좏궎 + res.cookie('name', JSON.stringify({name:req.body.name, id:req.body.email}), {expires}); //�ъ슜�� �대쫫 荑좏궎 res.send(req.body.name); // �대쫫 蹂대궡�� 萸먰븯寃�? diff --git a/backend/src/index.js b/backend/src/index.js index 0e7f8b724572e3ecea8abbdcc05978a75c49110c..255e987a7d4de4009670aa34fc47178a07da3e36 100644 --- a/backend/src/index.js +++ b/backend/src/index.js @@ -38,7 +38,7 @@ app.use( ); //cors �ㅼ젙�� �쒕떎.. // app.use(express.static(path.join(process.cwd(), '../public'))); -app.use(express.static('public')) +app.use(express.static('files')) app.use(cookieParser()); app.use(express.json()); diff --git a/backend/src/post.js b/backend/src/post.js index ef00d01f3bc5cd3f11c0ace69d4b1c7292a68dbe..7d9c62e1610997ae912c01d559ba485d212d5992 100644 --- a/backend/src/post.js +++ b/backend/src/post.js @@ -15,7 +15,7 @@ export const router = express.Router(); const upload = multer({ storage: multer.diskStorage({ // ���ν븳怨듦컙 �뺣낫 : �섎뱶�붿뒪�ъ뿉 ���� destination(req, file, done) { // ���� �꾩튂 - done(null, 'public/uploads/'); // uploads�쇰뒗 �대뜑 �덉뿉 ���� + done(null, 'files'); // uploads�쇰뒗 �대뜑 �덉뿉 ���� }, filename(req, file, done) { // �뚯씪紐낆쓣 �대뼡 �대쫫�쇰줈 �щ┫吏� const ext = path.extname(file.originalname); // �뚯씪�� �뺤옣�� diff --git a/frontend/src/components/Article.js b/frontend/src/components/Article.js index 1c778fd22bc888b6443e9c3ccf5f283e6d11dbc7..bdefbd816a702012514ae0fbec5edaf6feab2ff6 100644 --- a/frontend/src/components/Article.js +++ b/frontend/src/components/Article.js @@ -20,8 +20,8 @@ function Article({ data }) { // http://localhost:8080/uploads/21701487062905.png return ( <img - src={`http://localhost:8080/${el.replaceAll("\\", "/").substring(7)}`} - alt={`http://localhost:8080/${el.replaceAll("\\", "/").substring(7)}`} + src={`http://localhost:8080/${el.replaceAll("\\", "/").substring(5)}`} + alt={`http://localhost:8080/${el.replaceAll("\\", "/").substring(5)}`} style={{ width: "100px", height: "100px" }} /> ) }); diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js index 05b61784ef93c4fd7efc492d7d20ee28857b1434..0592ecb25f174d3979787db4dc1e9280ac782ca8 100644 --- a/frontend/src/components/Header.js +++ b/frontend/src/components/Header.js @@ -8,17 +8,6 @@ import { Link, useNavigate, Navigate } from "react-router-dom"; import cookie from 'react-cookies'; import {useCookies} from 'react-cookie' - - - -function Welcome(props){ - return ( - <p> - {props.name?`${props.name}��, �섏쁺�⑸땲��`:'濡쒓렇�명븯�몄슂.'}<br/> - </p> - ) -} - function ButtonLink({link, status, children}){ const userContext = useContext(UserContext); @@ -45,14 +34,14 @@ function ButtonLink({link, status, children}){ } function Header({islogged, username}){ - const name = cookie.load('name') + const userinfo = cookie.load('name') return( <div className="header"> <ButtonLink link='/'> <img className="logo_image" alt="logo" src={logo}/> </ButtonLink> <ul> - <p>{name?`${name}��, �섏쁺�⑸땲��`:'濡쒓렇�명븯�몄슂.'}</p> + <p>{userinfo?`${userinfo.name}��, �섏쁺�⑸땲��`:'濡쒓렇�명븯�몄슂.'}</p> <ul className="menu_list"> <li><ButtonLink link='/'>Home</ButtonLink></li> <li><ButtonLink link='/search'>寃���</ButtonLink></li>