diff --git a/src/api/GlobalApi.js b/src/api/GlobalApi.js
index 51a3c8c..401d56a 100644
--- a/src/api/GlobalApi.js
+++ b/src/api/GlobalApi.js
@@ -46,14 +46,21 @@ export default class GlobalApi {
servers_ws_first_payload = true;
constructor() {
- this.servers_ws = new WebSocket("wss://tf2.pblr-nyk.pro/ws/servers")
- this.servers_ws.onopen = () => {console.log("[WS] Websocket servers connected")};
- this.servers_ws.onmessage = (e) => {
- this.update_server(JSON.parse(e.data)["servers"], false);
- };
document.title = "Факты 13";
}
+ create_server_websocket() {
+ if (this.servers_ws === null) {
+ this.servers_ws = new WebSocket("wss://tf2.pblr-nyk.pro/ws/servers")
+ this.servers_ws.onopen = () => {
+ console.log("[WS] Websocket servers connected")
+ };
+ this.servers_ws.onmessage = (e) => {
+ this.update_server(JSON.parse(e.data)["servers"], false);
+ };
+ }
+ }
+
human_name_impl(player_count, naming){
let number = Math.abs(player_count) % 100;
let number_post = number % 10;
diff --git a/src/components/TabsMenu.vue b/src/components/TabsMenu.vue
index cbe28a9..2023c58 100644
--- a/src/components/TabsMenu.vue
+++ b/src/components/TabsMenu.vue
@@ -34,7 +34,12 @@ export default {
components: {MainView, EmptyTab, RulesView, ServersView, ProfileView, VipView, AboutView, BackgroundImage},
data: () => ({
current_tab: ""
- })
+ }),
+ methods: {
+ changeTab(current) {
+ console.log(current);
+ }
+ }
}
diff --git a/src/components/TabsMenuElements/MainView/Components/SubComponents/ConnectButton.vue b/src/components/TabsMenuElements/MainView/Components/SubComponents/ConnectButton.vue
index 82472b4..1f56a68 100644
--- a/src/components/TabsMenuElements/MainView/Components/SubComponents/ConnectButton.vue
+++ b/src/components/TabsMenuElements/MainView/Components/SubComponents/ConnectButton.vue
@@ -22,6 +22,7 @@ export default {
name: 'ConnectButton',
methods: {
moveToServer() {
+ this.$API.create_server_websocket();
this.$API.current_window = "serversView";
}
}
diff --git a/src/components/TabsMenuElements/ServersView/Components/PlayersTable.vue b/src/components/TabsMenuElements/ServersView/Components/PlayersTable.vue
new file mode 100644
index 0000000..237bf88
--- /dev/null
+++ b/src/components/TabsMenuElements/ServersView/Components/PlayersTable.vue
@@ -0,0 +1,29 @@
+
+
Обновлен: {{(new Date(serverData['last_update']*1000)).toLocaleString()}}
@@ -83,13 +83,16 @@ export default { name: "ServerFullInfo", components: {ServerStatsDialog, KillDeadTop, MessagesDialog, PlayerExtendedInfo, TerminalSvg, SteamSvg}, props: { - serverData: Object, + serverData: { + type: Object, + default: Object.create({"players":[]}) + }, }, data: () => ({ showServerDialog: false, expandPlayers: false, players: [{score:0, name:"", duration:"", sec:0}], - selected_player: null, + selected_player: -1, serverInfo: null }), methods: { @@ -110,6 +113,7 @@ export default { } }, openPlayer(item) { + //console.log("Open Player Extended Info", item); this.selected_player = item; this.$refs.pei.showPlayerDialog = true; } @@ -124,7 +128,7 @@ export default { 'address':'', 'workshop':'', 'player_count':'', - 'players':0, + 'players':[], 'max_player':0 } } diff --git a/src/components/TabsMenuElements/ServersView/ServersView.vue b/src/components/TabsMenuElements/ServersView/ServersView.vue index cba63f2..93ef2aa 100644 --- a/src/components/TabsMenuElements/ServersView/ServersView.vue +++ b/src/components/TabsMenuElements/ServersView/ServersView.vue @@ -1,5 +1,5 @@ -