정의왕

Remove error from master

1 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. 1 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2 2
3 # dependencies 3 # dependencies
4 -/node_modules 4 +tunnel_BE/server/node_modules
5 /.pnp 5 /.pnp
6 .pnp.js 6 .pnp.js
7 7
......
1 +# Default ignored files
2 +/shelf/
3 +/workspace.xml
4 +# Editor-based HTTP Client requests
5 +/httpRequests/
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<module type="WEB_MODULE" version="4">
3 + <component name="NewModuleRootManager">
4 + <content url="file://$MODULE_DIR$">
5 + <excludeFolder url="file://$MODULE_DIR$/temp" />
6 + <excludeFolder url="file://$MODULE_DIR$/.tmp" />
7 + <excludeFolder url="file://$MODULE_DIR$/tmp" />
8 + </content>
9 + <orderEntry type="inheritedJdk" />
10 + <orderEntry type="sourceFolder" forTests="false" />
11 + </component>
12 +</module>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="InspectionProjectProfileManager">
2 + <profile version="1.0">
3 + <option name="myName" value="Project Default" />
4 + <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
5 + </profile>
6 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project version="4">
3 + <component name="ProjectModuleManager">
4 + <modules>
5 + <module fileurl="file://$PROJECT_DIR$/.idea/OSSW.iml" filepath="$PROJECT_DIR$/.idea/OSSW.iml" />
6 + </modules>
7 + </component>
8 +</project>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project version="4">
3 + <component name="VcsDirectoryMappings">
4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
5 + </component>
6 +</project>
...\ No newline at end of file ...\ No newline at end of file
...@@ -6,6 +6,10 @@ router.get('/',(req,res)=>{ ...@@ -6,6 +6,10 @@ router.get('/',(req,res)=>{
6 res.send('회원가입 페이지'); 6 res.send('회원가입 페이지');
7 }); 7 });
8 8
9 +router.post('/',(req,res)=>{
10 + return res.status(201).json({success: true})
11 +});
12 +
9 //라우트 매개변수사용 13 //라우트 매개변수사용
10 //뒤에 위치 요구 14 //뒤에 위치 요구
11 router.get("/:id",(req,res)=>{ 15 router.get("/:id",(req,res)=>{
......
...@@ -9,7 +9,7 @@ const bodyParser = require("body-parser"); ...@@ -9,7 +9,7 @@ const bodyParser = require("body-parser");
9 dotenv.config(); 9 dotenv.config();
10 const indexRouter = require('./routes/index.js'); 10 const indexRouter = require('./routes/index.js');
11 const loginRouter = require('./routes/login.js'); 11 const loginRouter = require('./routes/login.js');
12 -const registerRouter = require('./routes/regiser.js'); 12 +const registerRouter = require('./routes/register.js');
13 13
14 const app = express(); 14 const app = express();
15 app.set('port', process.env.PORT || 3001); 15 app.set('port', process.env.PORT || 3001);
...@@ -19,7 +19,7 @@ const port = app.get('port'); ...@@ -19,7 +19,7 @@ const port = app.get('port');
19 app.use(morgan('dev')); 19 app.use(morgan('dev'));
20 app.use(express.json()); //json형식으로 데이터 전달 20 app.use(express.json()); //json형식으로 데이터 전달
21 app.use(express.urlencoded({extende: false})); // url형식으로 형식으로 데이터 전달 21 app.use(express.urlencoded({extende: false})); // url형식으로 형식으로 데이터 전달
22 -app.use(bodyParser().json); 22 +//app.use(bodyParser().json);
23 app.use(cookieParser(process.env.COOKIE_SECRET)); 23 app.use(cookieParser(process.env.COOKIE_SECRET));
24 app.use(session({ 24 app.use(session({
25 resave: false, 25 resave: false,
...@@ -37,8 +37,8 @@ app.use(session({ ...@@ -37,8 +37,8 @@ app.use(session({
37 //app.use('/',indexRouter); 37 //app.use('/',indexRouter);
38 //app.use('/login',loginRouter); 38 //app.use('/login',loginRouter);
39 39
40 -app.use('/',loginRouter); //로그인 페이지 40 +//app.use('/',loginRouter); //로그인 페이지
41 -app.use('/register',registerRouter); // 회원가입 페이지 41 +app.use('/api/register',registerRouter); // 회원가입 페이지
42 42
43 43
44 //에러처리 미들웨어 44 //에러처리 미들웨어
...@@ -46,7 +46,6 @@ app.use('/register',registerRouter); // 회원가입 페이지 ...@@ -46,7 +46,6 @@ app.use('/register',registerRouter); // 회원가입 페이지
46 app.use((req,res,next)=>{ 46 app.use((req,res,next)=>{
47 console.log("유저가 존재하지 않은 경로 접근"); 47 console.log("유저가 존재하지 않은 경로 접근");
48 res.status(404).send("NOT FOUND"); 48 res.status(404).send("NOT FOUND");
49 -
50 }); 49 });
51 50
52 //포트를 연다. 51 //포트를 연다.
......
...@@ -49,5 +49,6 @@ ...@@ -49,5 +49,6 @@
49 "last 1 firefox version", 49 "last 1 firefox version",
50 "last 1 safari version" 50 "last 1 safari version"
51 ] 51 ]
52 - } 52 + },
53 + "proxy": "http://localhost:3001"
53 } 54 }
......
1 -export const LOGIN_USER = "login_user";
2 -export const REGISTER_USER = "register_user";
...\ No newline at end of file ...\ No newline at end of file
1 -import Axios from 'axios';
2 -import { LOGIN_USER, REGISTER_USER } from './types';
3 -
4 -export function loginUser(dataToSubmit) {
5 -
6 - const request = Axios.post('/api/users/login', dataToSubmit)
7 - .then( response => response.data )
8 - return {
9 - type: LOGIN_USER,
10 - payload: request
11 - }
12 -}
13 -
14 -export function registerUser(dataToSubmit) {
15 -
16 - const request = Axios.post('/api/users/register', dataToSubmit)
17 - .then( response => response.data )
18 - return {
19 - type: REGISTER_USER,
20 - payload: request
21 - }
22 -}
...\ No newline at end of file ...\ No newline at end of file
1 -import { combineReducers } from 'redux';
2 -import user from './user_reducer';
3 -
4 -const rootReducer = combineReducers({
5 - user
6 -})
7 -
8 -export default rootReducer;
1 -import {
2 - LOGIN_USER, REGISTER_USER
3 -} from '../_actions/types';
4 -
5 -export default function (state = {}, action) {
6 - switch (action.type) {
7 - case LOGIN_USER:
8 - return { ...state, loginSuccess: action.payload }
9 - break;
10 - case REGISTER_USER:
11 - return {...state, registerSuccess: action.payload}
12 - break;
13 - default:
14 - return state;
15 - }
16 -}
...\ No newline at end of file ...\ No newline at end of file
...@@ -23,7 +23,7 @@ function LoginPage(props) { ...@@ -23,7 +23,7 @@ function LoginPage(props) {
23 console.log("ID", Id); 23 console.log("ID", Id);
24 console.log("Password", Password); 24 console.log("Password", Password);
25 let body = { 25 let body = {
26 - email: Id, 26 + id: Id,
27 password: Password 27 password: Password
28 } 28 }
29 dispatch(loginUser(body)) 29 dispatch(loginUser(body))
...@@ -35,9 +35,7 @@ function LoginPage(props) { ...@@ -35,9 +35,7 @@ function LoginPage(props) {
35 alert('Error') 35 alert('Error')
36 } 36 }
37 }) 37 })
38 -
39 }; 38 };
40 -
41 const goToRegister = () => { 39 const goToRegister = () => {
42 navigate('/register'); 40 navigate('/register');
43 } 41 }
......
...@@ -39,7 +39,7 @@ function RegisterPage(props) { ...@@ -39,7 +39,7 @@ function RegisterPage(props) {
39 } 39 }
40 dispatch(registerUser(body)) 40 dispatch(registerUser(body))
41 .then(response => { 41 .then(response => {
42 - if (response.payload.registerSuccess) { 42 + if (response.payload.success) {
43 props.history.push('/login') 43 props.history.push('/login')
44 } else { 44 } else {
45 alert('Failed to sign up') 45 alert('Failed to sign up')
......
1 const { createProxyMiddleware } = require('http-proxy-middleware'); 1 const { createProxyMiddleware } = require('http-proxy-middleware');
2 module.exports = function(app) { 2 module.exports = function(app) {
3 app.use( 3 app.use(
4 - '/api', 4 + createProxyMiddleware('/api',{
5 - createProxyMiddleware({ 5 + target: 'http://localhost:3001',
6 - target: 'http://localhost:3000',
7 changeOrigin: true, 6 changeOrigin: true,
8 }) 7 })
9 ); 8 );
......