From f879695b9aac854a814b5c8f71b0b2304c9f36a5 Mon Sep 17 00:00:00 2001 From: AlecDusheck Date: Sat, 2 Mar 2019 20:13:55 -0600 Subject: [PATCH] Update components to conform to new structure --- package-lock.json | 100 +++++++++--------- package.json | 2 +- .../controllers/main/login/login.component.ts | 6 +- .../main/profile/profile.component.html | 2 +- .../panel-controller.serverpage.ts | 5 +- .../panel-file-editor.component.ts | 6 +- .../panel-files/panel-files.component.ts | 10 +- .../panel-frame/panel-frame.component.html | 2 +- .../panel-frame/panel-frame.component.ts | 2 +- .../panel-home/panel-home.component.html | 2 +- .../panel/panel-home/panel-home.component.ts | 28 +++-- .../panel-settings.component.ts | 6 +- .../panel-subowners.component.ts | 6 +- src/styles.scss | 4 + 14 files changed, 97 insertions(+), 84 deletions(-) diff --git a/package-lock.json b/package-lock.json index 543e5ab..c559cfb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.2.tgz", - "integrity": "sha512-wcUdMzcpsxzscEa+wrhV1SE2PsHS6FnHJlRURFOtQmKvQAq3Y8gVw28l008SMt5d0bTrRV4xLL2lgvwJJoc7LA==", + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.4.tgz", + "integrity": "sha512-wJF8oz8MurtpFi0ik42bkI2F5gEnuOe79KHPO1i3SYfdhEp5NY8igVKZ6chB/eq4Ml50aHxas8Hh9ke12K+Pxw==", "dev": true, "requires": { - "@angular-devkit/core": "7.3.2", + "@angular-devkit/core": "7.3.4", "rxjs": "6.3.3" }, "dependencies": { @@ -26,16 +26,16 @@ } }, "@angular-devkit/build-angular": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.2.tgz", - "integrity": "sha512-zRrV/dknx8891XSjXTh5JcTZnX4h+YsCHi6u8GABnIZW9JyiCl9QZpv0mRIyGTEaK2udmfMo2Yp5qZo1sd8jeQ==", + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.4.tgz", + "integrity": "sha512-7yJzgNk3ToiAHd8vnYonqiswvVNYzOUKg2xZfpx+SD5m7mVE+CSUp+P4YzUrI0Vm9WitZOYaCv1I6G1NguJHqA==", "dev": true, "requires": { - "@angular-devkit/architect": "0.13.2", - "@angular-devkit/build-optimizer": "0.13.2", - "@angular-devkit/build-webpack": "0.13.2", - "@angular-devkit/core": "7.3.2", - "@ngtools/webpack": "7.3.2", + "@angular-devkit/architect": "0.13.4", + "@angular-devkit/build-optimizer": "0.13.4", + "@angular-devkit/build-webpack": "0.13.4", + "@angular-devkit/core": "7.3.4", + "@ngtools/webpack": "7.3.4", "ajv": "6.9.1", "autoprefixer": "9.4.6", "circular-dependency-plugin": "5.0.2", @@ -106,9 +106,9 @@ } }, "@angular-devkit/build-optimizer": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.2.tgz", - "integrity": "sha512-pM3t+6VD+gdcesgwuThR41DFdsZ9ZVQ97Hhr0JXHLbLyRt4eXxWi2+B5VL0jjAaX0RIiUIe8wgScwE6m/dxemg==", + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.4.tgz", + "integrity": "sha512-YTpiE4F2GnFc4jbXZkmFUMHOvo3kWcMPAInVbjXNSIWMqW8Ibs7d6MAcualQX4NCvcn45+mVXLfY/8hWZ/b7lw==", "dev": true, "requires": { "loader-utils": "1.2.3", @@ -132,13 +132,13 @@ } }, "@angular-devkit/build-webpack": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.2.tgz", - "integrity": "sha512-Uemur2KhFu7VGU2QQmfRiMwmoSKprZrMZRZXwZdCQPN5srIcMAgGjm1PGbZuCUddhwd2XRP9dKY6zOZpMzm84Q==", + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.4.tgz", + "integrity": "sha512-W5baPrsNUUyeD5K9ZjiTfiDsytBoqDvGDMKRUO9XWV8xF8LYF2ttsBQxlJK7SKkMyJXcjmiHhdkMq5wgRE7n0A==", "dev": true, "requires": { - "@angular-devkit/architect": "0.13.2", - "@angular-devkit/core": "7.3.2", + "@angular-devkit/architect": "0.13.4", + "@angular-devkit/core": "7.3.4", "rxjs": "6.3.3" }, "dependencies": { @@ -154,9 +154,9 @@ } }, "@angular-devkit/core": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.2.tgz", - "integrity": "sha512-W5KjkHRNVBcZRUNJamAn52IAj9Gl1zUjPA2r75JJK7k199xOA8UZqcIukQOgM1N7rwKCWht08i4FsdcTDghMhQ==", + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.4.tgz", + "integrity": "sha512-MBfen51iOBKfK4tlg5KwmPxePsF1QoFNUMGLuvUUwPkteonrGcupX1Q7NWTpf+HA+i08mOnZGuepeuQkD12IQw==", "dev": true, "requires": { "ajv": "6.9.1", @@ -726,12 +726,12 @@ } }, "@ngtools/webpack": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.2.tgz", - "integrity": "sha512-q98nt7HUTcdEtP+aJjsm5HUMDL+BXwLz80TthtFlu/f7JYdKxMSWZRHEv+q8Rs69pWMpwxj8RuHm8XiKD/8Cpg==", + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.4.tgz", + "integrity": "sha512-qTfw/LGZ3kDZAgqb6gMVr36E0W3M+bnS/xAxNTxshxmJOCQr9AcKtX4sP65QweKS60KoBBR1a7nR6SOi1NJkxA==", "dev": true, "requires": { - "@angular-devkit/core": "7.3.2", + "@angular-devkit/core": "7.3.4", "enhanced-resolve": "4.1.0", "rxjs": "6.3.3", "tree-kill": "1.2.1", @@ -1162,9 +1162,9 @@ } }, "acorn": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz", - "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", + "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "dev": true }, "acorn-dynamic-import": { @@ -2000,14 +2000,14 @@ } }, "browserslist": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz", - "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.2.tgz", + "integrity": "sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000929", - "electron-to-chromium": "^1.3.103", - "node-releases": "^1.1.3" + "caniuse-lite": "^1.0.30000939", + "electron-to-chromium": "^1.3.113", + "node-releases": "^1.1.8" } }, "browserstack": { @@ -2174,9 +2174,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000938", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz", - "integrity": "sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==", + "version": "1.0.30000939", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz", + "integrity": "sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==", "dev": true }, "caseless": { @@ -4046,14 +4046,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4073,8 +4071,7 @@ "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", @@ -4222,7 +4219,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6916,7 +6912,7 @@ "dependencies": { "path-browserify": { "version": "0.0.0", - "resolved": "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", "dev": true }, @@ -7324,9 +7320,9 @@ } }, "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", "dev": true }, "once": { @@ -9527,9 +9523,9 @@ "dev": true }, "readable-stream": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz", - "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz", + "integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==", "dev": true, "requires": { "inherits": "^2.0.3", diff --git a/package.json b/package.json index d85b08c..efa8c85 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.13.2", + "@angular-devkit/build-angular": "^0.13.4", "@angular/cli": "^6.2.9", "@angular/compiler-cli": "^6.1.0", "@angular/language-service": "^6.1.0", diff --git a/src/app/controllers/main/login/login.component.ts b/src/app/controllers/main/login/login.component.ts index 1746354..516de99 100644 --- a/src/app/controllers/main/login/login.component.ts +++ b/src/app/controllers/main/login/login.component.ts @@ -58,12 +58,12 @@ export class LoginComponent implements OnInit { this.credentials.email = this.loginForm.controls.email.value; this.credentials.password = this.loginForm.controls.password.value; - console.log("doing login..."); + console.log('doing login...'); try { await this.auth.authorize(this.credentials); - console.log("authed! cache is being updated"); + console.log('authed! cache is being updated'); await this.currentServer.updateCache(); - console.log("redir..."); + console.log('redir...'); await this.router.navigateByUrl(this.returnUrl); } catch (e) { this.error = e; diff --git a/src/app/controllers/main/profile/profile.component.html b/src/app/controllers/main/profile/profile.component.html index 4c94b3d..93727ef 100644 --- a/src/app/controllers/main/profile/profile.component.html +++ b/src/app/controllers/main/profile/profile.component.html @@ -11,7 +11,7 @@

Your Account

Simply Servers ID: {{data._id}}

Email: {{data.account_info.email}}

-

Group ID: {{data._group._id}}

+

Group: {{data._group.displayName}}

Username: {{data.account_info.username}}

Balance: {{data.balance}} shards

Account verified: {{data.account_info.accountVerify.accountVerified}}

diff --git a/src/app/controllers/panel-controller.serverpage.ts b/src/app/controllers/panel-controller.serverpage.ts index a5dbb75..9f0cce2 100644 --- a/src/app/controllers/panel-controller.serverpage.ts +++ b/src/app/controllers/panel-controller.serverpage.ts @@ -6,6 +6,7 @@ import {AuthService} from '../services/auth.service'; import {ServerSocketIOService} from '../services/server-socket-io.service'; import {ActivatedRoute, Router} from '@angular/router'; import {FormBuilder} from '@angular/forms'; +import {ServerActionsService} from '../services/server-actions.service'; @Injectable() export abstract class ResponsiveServerPage { @@ -20,6 +21,7 @@ export abstract class ResponsiveServerPage { public router: Router, public formBuilder: FormBuilder, public activatedRoute: ActivatedRoute, + public serverActions: ServerActionsService ) { }; onFirstInit = async (): Promise => { @@ -42,7 +44,7 @@ export abstract class ResponsiveServerPage { }; async ngInit (): Promise { - console.log("works!"); + console.log('works!'); // First init await this.onFirstInit(); @@ -54,6 +56,7 @@ export abstract class ResponsiveServerPage { // When the server is changed, refire loadData this.selectedServerEmitter = this.currentServer.selectedServer.subscribe(() => { + console.log('reloading server data'); if (!this.currentServer.selectedServer.value) { return; } this.loadData(); }); diff --git a/src/app/controllers/panel/panel-file-editor/panel-file-editor.component.ts b/src/app/controllers/panel/panel-file-editor/panel-file-editor.component.ts index 8467ed7..958efb6 100644 --- a/src/app/controllers/panel/panel-file-editor/panel-file-editor.component.ts +++ b/src/app/controllers/panel/panel-file-editor/panel-file-editor.component.ts @@ -8,7 +8,7 @@ import {ActivatedRoute, Router} from '@angular/router'; templateUrl: './panel-file-editor.component.html', styleUrls: ['./panel-file-editor.component.scss'] }) -export class PanelFileEditorComponent extends ResponsiveServerPage implements OnInit, OnDestroy{ +export class PanelFileEditorComponent extends ResponsiveServerPage implements OnInit, OnDestroy { loading = false; blocked = false; editName: string; @@ -38,7 +38,7 @@ export class PanelFileEditorComponent extends ResponsiveServerPage implements On this.editName = filePath; try { - this.editForm.controls.content.setValue(await this.currentServer.selectedServer.value.getFileContents(filePath)); + this.editForm.controls.content.setValue(await this.serverActions.getFileContents(filePath)); } catch (e) { if (e === 'File not found.') { this.newFile = true; @@ -62,7 +62,7 @@ export class PanelFileEditorComponent extends ResponsiveServerPage implements On this.editLoading = true; try { - await this.currentServer.selectedServer.value.writeContents(this.editName, this.editForm.controls.content.value); + await this.serverActions.writeContents(this.editName, this.editForm.controls.content.value); this.router.navigateByUrl('/panel/files'); } catch (e) { this.error = e; diff --git a/src/app/controllers/panel/panel-files/panel-files.component.ts b/src/app/controllers/panel/panel-files/panel-files.component.ts index 761db75..794cda4 100644 --- a/src/app/controllers/panel/panel-files/panel-files.component.ts +++ b/src/app/controllers/panel/panel-files/panel-files.component.ts @@ -11,7 +11,7 @@ import {ActivatedRoute, Router} from '@angular/router'; templateUrl: './panel-files.component.html', styleUrls: ['./panel-files.component.scss'] }) -export class PanelFilesComponent extends ResponsiveServerPage implements OnInit, OnDestroy{ +export class PanelFilesComponent extends ResponsiveServerPage implements OnInit, OnDestroy { @ViewChild('addModal', {read: ElementRef}) addModal: ElementRef; filesList: any; currentPath: string; @@ -44,7 +44,7 @@ export class PanelFilesComponent extends ResponsiveServerPage implements OnInit, this.loading = true; try { - this.filesList = await this.currentServer.selectedServer.value.listDir(this.currentPath); + this.filesList = await this.serverActions.listDir(this.currentPath); } catch (e) { this.notify.notify('error', 'Failed to get server files; ' + e); } @@ -78,14 +78,14 @@ export class PanelFilesComponent extends ResponsiveServerPage implements OnInit, private remove = async (file: FileDetails): Promise => { if (file.isDir) { try { - await this.currentServer.selectedServer.value.removeFolder(path.join(this.currentPath, file.name)); + await this.serverActions.removeFolder(path.join(this.currentPath, file.name)); await this.updateListing(); } catch (e) { this.notify.notify('error', 'Failed to remove folder. (is it not empty?)'); } } else if (file.isFile) { try { - await this.currentServer.selectedServer.value.removeFile(path.join(this.currentPath, file.name)); + await this.serverActions.removeFile(path.join(this.currentPath, file.name)); await this.updateListing(); } catch (e) { this.notify.notify('error', 'Failed to remove file.'); @@ -116,7 +116,7 @@ export class PanelFilesComponent extends ResponsiveServerPage implements OnInit, const targetPath = path.join(this.currentPath, this.addForm.controls.path.value); try { - const checkOk = await this.currentServer.selectedServer.value.checkAllowed(targetPath); + const checkOk = await this.serverActions.checkAllowed(targetPath); if (checkOk) { this.addModal.nativeElement.click(); this.router.navigateByUrl('/panel/files/edit?f=' + targetPath); diff --git a/src/app/controllers/panel/panel-frame/panel-frame.component.html b/src/app/controllers/panel/panel-frame/panel-frame.component.html index 1db5854..2d39fa6 100644 --- a/src/app/controllers/panel/panel-frame/panel-frame.component.html +++ b/src/app/controllers/panel/panel-frame/panel-frame.component.html @@ -62,7 +62,7 @@ class="material-icons switch-arrow">arrow_left
Status: {{serverSocket.statusSource.value}} + [ngClass]="{'Starting': 'dot-working', 'Running': 'dot-running', 'Stopping': 'dot-working', 'Stopped':'dot-stopped', 'Crashed':'dot-stopped', 'Loading':'dot-working' }[serverSocket.statusSource.value]">
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 fa10839..8e30588 100644 --- a/src/app/controllers/panel/panel-frame/panel-frame.component.ts +++ b/src/app/controllers/panel/panel-frame/panel-frame.component.ts @@ -8,7 +8,7 @@ import {Subscription} from 'rxjs'; templateUrl: './panel-frame.component.html', styleUrls: ['./panel-frame.component.scss'] }) -export class PanelFrameComponent extends ResponsiveServerPage implements OnInit, OnDestroy{ +export class PanelFrameComponent extends ResponsiveServerPage implements OnInit, OnDestroy { loaded = false; sidebarDisplayed = true; currentUrl: string; diff --git a/src/app/controllers/panel/panel-home/panel-home.component.html b/src/app/controllers/panel/panel-home/panel-home.component.html index 9f405bb..eed02e5 100644 --- a/src/app/controllers/panel/panel-home/panel-home.component.html +++ b/src/app/controllers/panel/panel-home/panel-home.component.html @@ -31,7 +31,7 @@