Skip to content

Commit

Permalink
commit to merge
Browse files Browse the repository at this point in the history
  • Loading branch information
leejin-yeong committed Nov 23, 2020
1 parent faaefdf commit 83e46db
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 319 deletions.
62 changes: 0 additions & 62 deletions server/Server.js

This file was deleted.

5 changes: 1 addition & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import Login from './routes/Board/login';
import Product from './routes/Product';
import NotFoundPage from './routes/NotFoundPage';
import Chatting from './chat/chatting';
import Join from './routes/Board/login_test';
//import Join from './routes/Board/test';
//import Join from './routes/Board/join';
import Test from './test';
import Join from './chat/login_test';

function App() {
return (
Expand Down
39 changes: 39 additions & 0 deletions src/chat/Server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
const express = require('express');
const socket = require('socket.io');
const http = require('http');
//const cors = require('cors');

const port = process.env.PORT || 3002;
const app = express();
//app.use(cors());
//const router = require('./router');

const options ={
cors:true,
origins:['http://localhost:3000'],
}

const server = http.createServer(app);
const io = socket(server, options); // socket.io 를 사용하기 위한 io 객체 생성

server.listen(port, () => {
console.log(`server open *:3002`);
});

io.on('connection', function(socket) {
console.log('connected in server');

socket.on('server',(userid)=>{
console.log('get server');
console.log(userid);
});

socket.on('login', (data, cb) => {
console.log('hi server')
socket.emit('login',data,cb)
})
socket.on('disconnect', function () {
console.log('user disconnected: ', socket.id);
});
});

File renamed without changes.
94 changes: 0 additions & 94 deletions src/routes/Board/join.tsx

This file was deleted.

72 changes: 0 additions & 72 deletions src/routes/Board/test.css

This file was deleted.

57 changes: 0 additions & 57 deletions src/routes/Board/test.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions src/test.js

This file was deleted.

2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"jsx": "react"
},
"include": [
"src", "server/Server.js", "server/router.js", "src/setProxy.js"
"src", "src/chat/Server.js", "server/router.js", "src/setProxy.js"
]
}

0 comments on commit 83e46db

Please sign in to comment.