thor/MinecraftChat
1
0
Fork 0
mirror of https://github.com/Threnklyn/MinecraftChat.git synced 2026-05-18 20:33:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added new Minecraft Versions and fixed CSS

Browse Source
This commit is contained in:
Thorben Klyn
2021-05-20 14:55:15 +02:00
parent 7232f8bcb0
commit f81b4fa92e
7 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/client/controllers/bufferController.js
-2
View File
@@ -8,8 +8,6 @@ module.exports = function($scope, socket, buffer) {
buffer.append('<br>'); buffer.append('<br>');
buffer.append('Welcome to AlexKvazos\'s Minecraft Chat App'); buffer.append('Welcome to AlexKvazos\'s Minecraft Chat App');
buffer.append('&gt; Press connect to connect to a Minecraft server and start chatting!'); buffer.append('&gt; Press connect to connect to a Minecraft server and start chatting!');
buffer.append('<br>');
buffer.append('<i>Note: This application only works with 1.8,1.9,1.10,1.11 Minecraft servers.</i>');
buffer.append('---'); buffer.append('---');
buffer.append('<br>'); buffer.append('<br>');
app/client/controllers/connectController.js
+2 -2
View File
@@ -5,7 +5,7 @@
module.exports = function($scope, socket, servers) { module.exports = function($scope, socket, servers) {
$scope.servers = servers.get(); $scope.servers = servers.get();
$scope.version = "1.10" $scope.version = "1.16.5"
$scope.select = function(id) { $scope.select = function(id) {
$scope.ip = servers.select(id).ip; $scope.ip = servers.select(id).ip;
@@ -29,7 +29,7 @@ module.exports = function($scope, socket, servers) {
password: $scope.password, password: $scope.password,
hostname: $scope.ip, hostname: $scope.ip,
port: $scope.port || 25565, port: $scope.port || 25565,
version: $scope.version || "1.10" version: $scope.version || "1.16.5"
}); });
} else { } else {
app/client/controllers/serversController.js
+2 -2
View File
@@ -4,7 +4,7 @@ module.exports = function($scope, servers) {
$scope.name = ''; $scope.name = '';
$scope.ip = ''; $scope.ip = '';
$scope.port = ''; $scope.port = '';
$scope.version = "1.10"; $scope.version = "1.16.5";
} }
$scope.servers = servers.get(); $scope.servers = servers.get();
@@ -14,7 +14,7 @@ module.exports = function($scope, servers) {
name: $scope.name, name: $scope.name,
ip: $scope.ip, ip: $scope.ip,
port: $scope.port || 25565, port: $scope.port || 25565,
version: $scope.version || "1.10", version: $scope.version || "1.16.5",
}; };
servers.add(server); servers.add(server);
$scope.servers = servers.get(); $scope.servers = servers.get();
app/server/index.js
+1 -1
View File
@@ -14,7 +14,7 @@ import redis from 'socket.io-redis';
import dotenv from 'dotenv'; import dotenv from 'dotenv';
// load environment files from .env file // load environment files from .env file
dotenv.load(); dotenv.config({silent: true});
// create express application, server and socketio instance // create express application, server and socketio instance
public/templates/index.html
+1 -1
View File
@@ -12,7 +12,7 @@
<link rel="shortcut icon" href="/favicon.png"> <link rel="shortcut icon" href="/favicon.png">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link href='//fonts.googleapis.com/css?family=Source+Code+Pro' rel='stylesheet' type='text/css'> <link href='//fonts.googleapis.com/css?family=Source+Code+Pro' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//bootswatch.com/cyborg/bootstrap.min.css"> <link rel="stylesheet" href="//bootswatch.com/3/cyborg/bootstrap.min.css">
<link rel="stylesheet" href="/css/style.css"> <link rel="stylesheet" href="/css/style.css">
</head> </head>
public/templates/modals/connect.html
+9 -4
View File
@@ -4,7 +4,6 @@
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Connect to Minecraft server</h4> <h4 class="modal-title" id="myModalLabel">Connect to Minecraft server</h4>
<p>This application only works with 1.8,1.9,1.10,1.11.2 Minecraft servers.</p>
</div> </div>
<form ng-submit="connect()"> <form ng-submit="connect()">
<div class="modal-body"> <div class="modal-body">
@@ -44,10 +43,16 @@
<div class="input-group-btn"> <div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span>{{version}} </span><span class="caret"></span></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span>{{version}} </span><span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#" ng-click="selectversion('1.8')">1.8</a></li> <li><a href="#" ng-click="selectversion('1.7.10')">1.7.10</a></li>
<li><a href="#" ng-click="selectversion('1.9')">1.9</a></li> <li><a href="#" ng-click="selectversion('1.8.9')">1.8.9</a></li>
<li><a href="#" ng-click="selectversion('1.10')">1.10</a></li> <li><a href="#" ng-click="selectversion('1.9.4')">1.9.4</a></li>
<li><a href="#" ng-click="selectversion('1.10.2')">1.10.2</a></li>
<li><a href="#" ng-click="selectversion('1.11.2')">1.11.2</a></li> <li><a href="#" ng-click="selectversion('1.11.2')">1.11.2</a></li>
<li><a href="#" ng-click="selectversion('1.12.2')">1.12.2</a></li>
<li><a href="#" ng-click="selectversion('1.13.2')">1.13.2</a></li>
<li><a href="#" ng-click="selectversion('1.14.4')">1.14.4</a></li>
<li><a href="#" ng-click="selectversion('1.15.2')">1.15.2</a></li>
<li><a href="#" ng-click="selectversion('1.16.5')">1.16.5</a></li>
</ul> </ul>
</div> </div>
<input type="text" ng-model="ip" class="form-control" placeholder="mc.server.com" required> <input type="text" ng-model="ip" class="form-control" placeholder="mc.server.com" required>
public/templates/modals/servers.html
+10 -4
View File
@@ -34,10 +34,16 @@
<div class="input-group-btn"> <div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span>{{version}}</span><span class="caret"></span></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span>{{version}}</span><span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#" ng-click="selectversion('1.8')">1.8</a></li> <li><a href="#" ng-click="selectversion('1.7.10')">1.7.10</a></li>
<li><a href="#" ng-click="selectversion('1.9')">1.9</a></li> <li><a href="#" ng-click="selectversion('1.8.9')">1.8.9</a></li>
<li><a href="#" ng-click="selectversion('1.10')">1.10</a></li> <li><a href="#" ng-click="selectversion('1.9.4')">1.9.4</a></li>
<li><a href="#" ng-click="selectversion('1.10.2')">1.10.2</a></li>
<li><a href="#" ng-click="selectversion('1.11.2')">1.11.2</a></li> <li><a href="#" ng-click="selectversion('1.11.2')">1.11.2</a></li>
<li><a href="#" ng-click="selectversion('1.12.2')">1.12.2</a></li>
<li><a href="#" ng-click="selectversion('1.13.2')">1.13.2</a></li>
<li><a href="#" ng-click="selectversion('1.14.4')">1.14.4</a></li>
<li><a href="#" ng-click="selectversion('1.15.2')">1.15.2</a></li>
<li><a href="#" ng-click="selectversion('1.16.5')">1.16.5</a></li>
</ul> </ul>
</div> </div>
<input type="text" class="form-control" ng-model="ip" placeholder="mc.server.com" required> <input type="text" class="form-control" ng-model="ip" placeholder="mc.server.com" required>
@@ -63,4 +69,4 @@
</form> </form>
</div> </div>
</div> </div>
</div> </div>