From 371a15227de93d44c75b14bccf522ac02f4c69ec Mon Sep 17 00:00:00 2001 From: Alec Dusheck Date: Mon, 24 Dec 2018 11:56:09 -0600 Subject: [PATCH] (potentially buggy) Change your server plan via settings --- .../panel-frame/panel-frame.component.scss | 3 +- .../panel-frame/panel-frame.component.ts | 6 ++- .../panel/panel-home/panel-home.component.ts | 8 +-- .../panel-settings.component.html | 28 ++++++---- .../panel-settings.component.scss | 6 +++ .../panel-settings.component.ts | 49 +++++++++++++++++- .../core/services/authentication.service.ts | 7 +++ src/app/core/services/ssanalytics.service.ts | 2 +- src/favicon.ico | Bin 5430 -> 34494 bytes src/styles.scss | 1 + 10 files changed, 91 insertions(+), 19 deletions(-) diff --git a/src/app/controllers/panel/panel-frame/panel-frame.component.scss b/src/app/controllers/panel/panel-frame/panel-frame.component.scss index f192067..2f1ba11 100644 --- a/src/app/controllers/panel/panel-frame/panel-frame.component.scss +++ b/src/app/controllers/panel/panel-frame/panel-frame.component.scss @@ -52,13 +52,14 @@ body{ padding-top: 1rem; } + color: #fff; + #server{ float: right; width: 10rem; margin-right: .5rem; margin-top: .7rem; - color: #fff; #status { .bold{ font-weight: bold; diff --git a/src/app/controllers/panel/panel-frame/panel-frame.component.ts b/src/app/controllers/panel/panel-frame/panel-frame.component.ts index aab8e4f..f31868d 100644 --- a/src/app/controllers/panel/panel-frame/panel-frame.component.ts +++ b/src/app/controllers/panel/panel-frame/panel-frame.component.ts @@ -4,6 +4,7 @@ import {SelectedServerService} from '../../../core/services/selected-server.serv import {ServerDetails} from '../../../core/models/server-details'; import {NavigationEnd, Router} from '@angular/router'; import {Subject} from 'rxjs'; +import {SSAnalyticsService} from '../../../core/services/ssanalytics.service'; @Component({ selector: 'app-panel-frame', @@ -26,7 +27,9 @@ export class PanelFrameComponent implements OnInit, OnDestroy { selectedServerEmitter: Subject; statusEmitter: Subject; - constructor(private serverSocket: ServerSocketManagerService, public selectedServer: SelectedServerService, private router: Router) { + motd = ''; + + constructor(private serverSocket: ServerSocketManagerService, public selectedServer: SelectedServerService, private router: Router, private analytics: SSAnalyticsService) { this.router.events.subscribe((e) => { if (e instanceof NavigationEnd) { this.currentUrl = e.url; @@ -52,6 +55,7 @@ export class PanelFrameComponent implements OnInit, OnDestroy { } ngOnInit() { + this.motd = this.analytics.loadData.motd; this.updateStatus(); this.statusEmitter = this.serverSocket.statusEmitter.subscribe(data => { diff --git a/src/app/controllers/panel/panel-home/panel-home.component.ts b/src/app/controllers/panel/panel-home/panel-home.component.ts index 8a451a0..62c6e7a 100644 --- a/src/app/controllers/panel/panel-home/panel-home.component.ts +++ b/src/app/controllers/panel/panel-home/panel-home.component.ts @@ -98,6 +98,10 @@ export class PanelHomeComponent implements OnInit, OnDestroy, AfterViewInit { } updateServer() { + this.commandForm = this.formBuilder.group({ + command: ['', Validators.compose([Validators.required, Validators.maxLength(50)])], + }); + this.loading = true; this.currentServer = this.selectedServer.getCurrentServer(); this.serverSocket.getSocket(this.currentServer._id, () => { @@ -105,10 +109,6 @@ export class PanelHomeComponent implements OnInit, OnDestroy, AfterViewInit { }); this.consoleHistory = this.serverSocket.getConsole(); - - this.commandForm = this.formBuilder.group({ - command: ['', Validators.compose([Validators.required, Validators.maxLength(50)])], - }); } serverOn() { diff --git a/src/app/controllers/panel/panel-settings/panel-settings.component.html b/src/app/controllers/panel/panel-settings/panel-settings.component.html index fc108a9..304ad26 100644 --- a/src/app/controllers/panel/panel-settings/panel-settings.component.html +++ b/src/app/controllers/panel/panel-settings/panel-settings.component.html @@ -10,10 +10,14 @@ General Settings
-
+
+

There seems to be nothing here...

+
+

Please note: Changing your server plan may have unintended side-effects such as plugin removal. This change may be irreversible, due to certain technical limitations of certain games.

-
@@ -60,10 +64,11 @@
-