Updated theme switch without reloading css files.

████ ███ To request new features or in case this commit breaks something for you, ████ ███ please, create a new github issue with all possible information for me, ▓███▀█▄ but never share your API Keys! ▒▓██ ███ ░▒▓█ ███ Signed-off-by: Carles Tubio <[email protected]> _________________________________________ / Hello, WORLD! \ | | \ pssst.. 1.00000000 BTC = 63062.39 EUR. / ----------------------------------------- \ ^__^ \ (oo)\_______ (__)\ )\/\ ||----w | || ||
ctubio · Oct 19, 2024 · 5f166ae · 5f166ae
1 parent 271f887
commit 5f166ae
Show file tree

Hide file tree

Showing 13 changed files with 469 additions and 506 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ K         ?= K.sh
 MAJOR      = 0
 MINOR      = 7
 PATCH      = 0
-BUILD      = 43
+BUILD      = 44
 
 OBLIGATORY = DISCLAIMER: This is strict non-violent software: \n$\
              if you hurt other living creatures, please stop; \n$\

diff --git a/src/bin/+portfolios/+portfolios.client/Client.ts b/src/bin/+portfolios/+portfolios.client/Client.ts
@@ -12,7 +12,7 @@ import {Socket, Models} from 'lib/K';
     <div class="col-md-12 col-xs-12">
       <div class="col-md-6">
         <button type="button"
-          class="btn btn-default" style="position: absolute; top: 10px;"
+          class="btn btn-default" style="position: absolute; top: 10px;left: 10px;"
           (click)="showSubmitOrder = !showSubmitOrder">New Order</button>
         <settings
           [product]="product"

diff --git a/src/bin/+portfolios/+portfolios.client/Markets.ts b/src/bin/+portfolios/+portfolios.client/Markets.ts
@@ -8,7 +8,7 @@ import {Shared, Models} from 'lib/K';
   selector: 'markets',
   template: `<ag-grid-angular id="markets"
     [hidden]="!(api ? api.getDisplayedRowCount() : 0)"
-    class="ag-theme-alpine ag-theme-big"
+    class="ag-theme-alpine{{ onGridTheme() }} ag-theme-big"
     style="width: 760px;margin: 6px 0px;"
     (window:resize)="onGridReady($event)"
     (gridReady)="onGridReady($event)"
@@ -109,6 +109,11 @@ export class MarketsComponent {
     if ($event.api) this.api = $event.api;
   };
 
+  private onGridTheme() {
+    return document.body.classList.contains('theme-dark')
+      ? '-dark' : '';
+  };
+
   private addRowData = () => {
     if (!this.api) return;
     if (!this._market || !this._markets)

diff --git a/src/bin/+portfolios/+portfolios.client/Wallets.ts b/src/bin/+portfolios/+portfolios.client/Wallets.ts
@@ -80,9 +80,6 @@ export class WalletsComponent {
       if (!node) return this.api.onRowHeightChanged();
       var detail = document.getElementById('markets');
       if (detail) {
-        var theme = document.getElementById("daynight") as HTMLLinkElement;
-        detail.classList.add('ag-theme-alpine' + (theme.href.indexOf('-dark')?'-dark':''));
-        detail.classList.remove('ag-theme-alpine' + (theme.href.indexOf('-dark')?'':'-dark'));
         var row = document.querySelector("#portfolios ag-grid-angular div[row-id='" + node.data.currency + "'] div[aria-colindex='3']");
         if (row) row.appendChild(detail);
       }

diff --git a/src/bin/+portfolios/+portfolios.disk.S b/src/bin/+portfolios/+portfolios.disk.S
@@ -14,6 +14,5 @@
   file( 03 , www/js/client.min.js            , /js/client.min.js            )  \
   file( 04 , www/css/bootstrap.min.css       , /css/bootstrap.min.css       )  \
   file( 05 , www/css/bootstrap-dark.min.css  , /css/bootstrap-dark.min.css  )  \
-  file( 06 , www/css/bootstrap-light.min.css , /css/bootstrap-light.min.css )  \
-  file( 07 , www/font/beacons.woff2          , /font/beacons.woff2          )  \
+  file( 06 , www/font/beacons.woff2          , /font/beacons.woff2          )  \
   file( 00 , www/.bomb.gzip                  ,                              )
diff --git a/src/bin/trading-bot/trading-bot.client/Settings.ts b/src/bin/trading-bot/trading-bot.client/Settings.ts
@@ -443,21 +443,20 @@ import {Socket, Models} from 'lib/K';
                          [(ngModel)]="params.audio">
                   </td>
                   <td style="text-align: center;border-bottom: 3px solid #A0A0A0;">
-                      <input class="btn btn-default btn"
-                          style="width:61px;margin-right: 6px;"
+                      <button class="btn btn-default btn"
+                          style="margin-right: 6px;"
                           type="button"
                           (click)="backup()"
-                          value="Backup" />
-                      <input class="btn btn-default btn"
-                          style="width:55px;margin-right: 20px;"
+                      >Backup</button>
+                      <button class="btn btn-default btn"
+                          style="margin-right: 20px;"
                           type="button"
                           (click)="resetSettings()"
-                          value="Reset" />
-                      <input class="btn btn-default btn"
-                          style="width:50px"
+                      >Reset</button>
+                      <button class="btn btn-default btn"
                           type="submit"
                           (click)="submitSettings()"
-                          value="Save" />
+                      >Save</button>
                   </td>
               </tr>
           </tbody>

diff --git a/src/bin/trading-bot/trading-bot.client/Takers.ts b/src/bin/trading-bot/trading-bot.client/Takers.ts
@@ -7,7 +7,7 @@ import {Shared, Models} from 'lib/K';
 @Component({
   selector: 'takers',
   template: `<ag-grid-angular
-    class="{{ onGridTheme() }} marketTrades"
+    class="ag-theme-alpine{{ onGridTheme() }} marketTrades"
     style="height: 616px;width: 100%;"
     (window:resize)="onGridReady($event)"
     (gridReady)="onGridReady($event)"
@@ -80,7 +80,8 @@ export class TakersComponent {
   };
 
   private onGridTheme() {
-    return "ag-theme-alpine"+((document.getElementById('daynight').getAttribute('href').indexOf('dark') != -1)?'-dark':'');
+    return document.body.classList.contains('theme-dark')
+      ? '-dark' : '';
   };
 
   private addRowData = (o: Models.MarketTrade) => {

diff --git a/src/bin/trading-bot/trading-bot.disk.S b/src/bin/trading-bot/trading-bot.disk.S
@@ -14,8 +14,7 @@
   file( 03 , www/js/client.min.js            , /js/client.min.js            )  \
   file( 04 , www/css/bootstrap.min.css       , /css/bootstrap.min.css       )  \
   file( 05 , www/css/bootstrap-dark.min.css  , /css/bootstrap-dark.min.css  )  \
-  file( 06 , www/css/bootstrap-light.min.css , /css/bootstrap-light.min.css )  \
-  file( 07 , www/font/beacons.woff2          , /font/beacons.woff2          )  \
-  file( 08 , www/audio/0.mp3                 , /audio/0.mp3                 )  \
-  file( 09 , www/audio/1.mp3                 , /audio/1.mp3                 )  \
+  file( 06 , www/font/beacons.woff2          , /font/beacons.woff2          )  \
+  file( 07 , www/audio/0.mp3                 , /audio/0.mp3                 )  \
+  file( 08 , www/audio/1.mp3                 , /audio/1.mp3                 )  \
   file( 00 , www/.bomb.gzip                  ,                              )