DHBW/Projektmanagement-Game
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Some small fixes

Browse Source
This commit is contained in:
Administrator 2021-05-26 22:58:00 +02:00
parent 50327dfffc
commit 5aa0b95034
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Webservice/server.js
View File

@ -4,9 +4,9 @@ let server = require('http').createServer(app);
let {Server} = require("socket.io"); let {Server} = require("socket.io");
let io = new Server(server); let io = new Server(server);
let port = parseInt(process.env.PORT) || 5000; let port = 5000;
server.listen(port, function () { server.listen(port, function () {
generate_log_message("", "", 'RUNNING', "PORT " + port); generate_log_message("MAIN", "Server", 'RUNNING', "PORT " + port);
}); });
@ -22,9 +22,8 @@ io.on('connection', socket => {
addedUser = true; addedUser = true;
socket.join(socket.room);
socket.emit('login'); socket.emit('login');
socket.join(socket.room);
socket.broadcast.to(socket.room).emit('user joined', socket.username); socket.broadcast.to(socket.room).emit('user joined', socket.username);
@ -71,8 +70,8 @@ function generate_log_message(room, user, type, message) {
user = pad(10, user, ' ').substr(0, 10); user = pad(10, user, ' ').substr(0, 10);
type = pad(10, type, ' ').substr(0, 10); type = pad(10, type, ' ').substr(0, 10);
// Reset color: \x1b[0m let reset_color = '\x1b[0m';
console.info("%s[%s] [%s] [%s]\x1b[0m %s", color, room, user, type, message); console.info("%s[%s] [%s] [%s]\x1b[0m %s", color, room, user, type, reset_color, message);
} }
function pad(width, string, padding) { function pad(width, string, padding) {

9
public/index.html
View File

@ -8,7 +8,9 @@
<link href="css/components.css" rel="stylesheet"> <link href="css/components.css" rel="stylesheet">
<link href="css/header.css" rel="stylesheet"> <link href="css/header.css" rel="stylesheet">
<link href="css/chat.css" rel="stylesheet"> <link href="css/chat.css" rel="stylesheet">
<link href="css/game.css" rel="stylesheet">
<link href="css/index.css" rel="stylesheet"> <link href="css/index.css" rel="stylesheet">
</head> </head>
@ -34,11 +36,10 @@
</footer> </footer>
<script crossorigin="anonymous" <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
integrity="sha384-cPwlPLvBTa3sKAgddT6krw0cJat7egBga3DJepJyrLl4Q9/5WLra3rrnMcyTyOnh"
src="https://cdn.socket.io/3.1.3/socket.io.min.js"></script>
<script src="js/chat.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/5.1.3/pixi.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/5.1.3/pixi.min.js"></script>
<script src="js/chat.js"></script>
<script src="js/game.js"></script>
<script src="js/index.js"></script> <script src="js/index.js"></script>
</body> </body>
</html> </html>

4
public/js/chat.js
View File

@ -1,12 +1,12 @@
let socket; let socket;
let username = prompt("Please enter your name"); let username = prompt("Please enter your name");
//let room_name = prompt("Please enter room name", "1234"); let room_name = prompt("Please enter room name");
let connected = false; let connected = false;
window.addEventListener('load', function () { window.addEventListener('load', function () {
socket = io(); socket = io();
socket.on('login', function (data) { socket.on('login', function () {
connected = true; connected = true;
addLogMessage("Welcome " + username + "!"); addLogMessage("Welcome " + username + "!");
}); });