From 583fbe23a4bb22c7b505e2a5cb7c1832fc2d7cf4 Mon Sep 17 00:00:00 2001 From: jliddev Date: Mon, 26 Oct 2020 20:16:42 -0700 Subject: [PATCH] Linux improvements --- .../src/app/pages/about/about.component.html | 2 +- .../src/app/pages/about/about.component.scss | 6 ++++++ .../app/pages/get-addons/get-addons.component.html | 2 +- .../app/pages/get-addons/get-addons.component.scss | 6 ++++++ .../src/app/pages/home/home.component.html | 2 +- wowup-electron/src/app/pages/home/home.component.ts | 2 +- .../src/app/pages/my-addons/my-addons.component.html | 8 ++++++-- .../src/app/pages/my-addons/my-addons.component.scss | 12 ++++++++++++ .../src/app/pages/my-addons/my-addons.component.ts | 3 +-- .../src/app/pages/options/options.component.html | 2 +- .../src/app/pages/options/options.component.scss | 6 ++++++ .../src/app/services/electron/electron.service.ts | 2 ++ .../src/app/services/warcraft/warcraft.service.ts | 4 ++++ 13 files changed, 48 insertions(+), 9 deletions(-) diff --git a/wowup-electron/src/app/pages/about/about.component.html b/wowup-electron/src/app/pages/about/about.component.html index 0c884b7b..b61100cb 100644 --- a/wowup-electron/src/app/pages/about/about.component.html +++ b/wowup-electron/src/app/pages/about/about.component.html @@ -1,5 +1,5 @@
+ [ngClass]="{'mac': electronService.isMac, 'windows': electronService.isWin, 'linux': electronService.isLinux }">
diff --git a/wowup-electron/src/app/pages/about/about.component.scss b/wowup-electron/src/app/pages/about/about.component.scss index 9a90fb94..28b0978d 100644 --- a/wowup-electron/src/app/pages/about/about.component.scss +++ b/wowup-electron/src/app/pages/about/about.component.scss @@ -60,3 +60,9 @@ } } } + +.linux { + .about { + height: calc(100vh - 80px); + } +} diff --git a/wowup-electron/src/app/pages/get-addons/get-addons.component.html b/wowup-electron/src/app/pages/get-addons/get-addons.component.html index 63eeec60..5ab8c310 100644 --- a/wowup-electron/src/app/pages/get-addons/get-addons.component.html +++ b/wowup-electron/src/app/pages/get-addons/get-addons.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/wowup-electron/src/app/pages/get-addons/get-addons.component.scss b/wowup-electron/src/app/pages/get-addons/get-addons.component.scss index a08f5999..76cc4333 100644 --- a/wowup-electron/src/app/pages/get-addons/get-addons.component.scss +++ b/wowup-electron/src/app/pages/get-addons/get-addons.component.scss @@ -86,4 +86,10 @@ } .provider-column { min-width: 60px; +} + +.linux { + .table-container { + height: calc(100vh - 150px); + } } \ No newline at end of file diff --git a/wowup-electron/src/app/pages/home/home.component.html b/wowup-electron/src/app/pages/home/home.component.html index a2f5badf..5570b8e7 100644 --- a/wowup-electron/src/app/pages/home/home.component.html +++ b/wowup-electron/src/app/pages/home/home.component.html @@ -1,4 +1,4 @@ -
+
+ [ngClass]="{'mac': electronService.isMac, 'windows': electronService.isWin, 'linux': electronService.isLinux }">
@@ -50,7 +50,11 @@
-
+
+

No Addons found

+
+ +
diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.scss b/wowup-electron/src/app/pages/my-addons/my-addons.component.scss index cd9f5583..f092872c 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.scss +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.scss @@ -1,5 +1,7 @@ @import "../../../variables.scss"; + + .control-container { display: flex; flex-direction: row; @@ -33,6 +35,10 @@ } } +.no-addons-container { + text-align: center; + color: $white-1; +} .spinner-container { display: flex; align-items: center; @@ -144,3 +150,9 @@ margin-bottom: 0.5em; } } + +.linux { + .table-container { + height: calc(100vh - 150px); + } +} diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts index 4fd971e5..ec1e699c 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts @@ -650,10 +650,9 @@ export class MyAddonsComponent implements OnInit, OnDestroy { next: (addons) => { this.isBusy = false; this.enableControls = true; - this._ngZone.run(() => { this._displayAddonsSrc.next(this.formatAddons(addons)); this.setPageContextText(); - }); + this._cdRef.detectChanges(); }, error: (err) => { console.error(err); diff --git a/wowup-electron/src/app/pages/options/options.component.html b/wowup-electron/src/app/pages/options/options.component.html index a8fc40d3..c19f90ab 100644 --- a/wowup-electron/src/app/pages/options/options.component.html +++ b/wowup-electron/src/app/pages/options/options.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/wowup-electron/src/app/pages/options/options.component.scss b/wowup-electron/src/app/pages/options/options.component.scss index 4d3f34bf..a947a913 100644 --- a/wowup-electron/src/app/pages/options/options.component.scss +++ b/wowup-electron/src/app/pages/options/options.component.scss @@ -87,3 +87,9 @@ section { color: $white-2; } } + +.linux { + .options { + height: calc(100vh - 80px); + } + } \ No newline at end of file diff --git a/wowup-electron/src/app/services/electron/electron.service.ts b/wowup-electron/src/app/services/electron/electron.service.ts index d443aa30..e90691e2 100644 --- a/wowup-electron/src/app/services/electron/electron.service.ts +++ b/wowup-electron/src/app/services/electron/electron.service.ts @@ -46,6 +46,8 @@ export class ElectronService { return; } + console.log('Platform', process.platform, this.isLinux) + this.ipcRenderer = window.require("electron").ipcRenderer; this.webFrame = window.require("electron").webFrame; this.remote = window.require("electron").remote; diff --git a/wowup-electron/src/app/services/warcraft/warcraft.service.ts b/wowup-electron/src/app/services/warcraft/warcraft.service.ts index d960e522..2d4e64cd 100644 --- a/wowup-electron/src/app/services/warcraft/warcraft.service.ts +++ b/wowup-electron/src/app/services/warcraft/warcraft.service.ts @@ -341,6 +341,10 @@ export class WarcraftService { } private decodeProducts(productDbPath: string) { + if(this._electronService.isLinux){ + return []; + } + const productDbData = FileUtils.readFileSync(productDbPath); try {