A fwe tweaks. Better about page

nwmac · nwmac · commit 02506892bf7a · 2020-07-16T20:34:12.000+01:00
diff --git a/electron/about.html b/electron/about.html
@@ -1,9 +1,65 @@
 <html>
 <body>
   <head>
+    <style>
+      body {
+        font-family: "Lato", "Helvetica", "Arial";
+        margin: 0;
+      }
+      .about {
+        padding: 10px;
+        text-align: right;
+      }
+      .panel {
+        align-items: center;
+        color: white;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        margin: 10px;
+      }
+      .title {
+        align-items: center;
+        display: flex;
+        font-family: "Lato", "Helvetica", "Arial";
+      }
+      img {
+        height: 64px;
+        width: 64px;
+      }
+      h1 {
+        margin: 0;
+        padding-left: 10px;
+      }
+      h2 {
+        font-size: 16px;
+        margin-top: 20px;
+        text-align: center;
+      }
+      P {
+        margin-top: 40px;
+      }
+      button {
+        position: absolute;
+        right: 10px;
+        bottom: 10px;
+      }
+    </style>
   </head>
 </body>
-<button id="cancel-btn">Cancel</button>
+<div class="about">
+  <div class="panel">
+    <div class="title">
+      <img src="logo.png" />
+      <h1>STRATOS</h1>
+    </div>
+    <div>
+      <h2>Version: 4.0.0</h2>
+      <p>Lovingly designed & created in Bristol</p>
+    </div>
+  </div>
+  <button id="cancel-btn">Close</button>
+</div>
 <script>
  const remote = require('electron').remote;
  document.getElementById("cancel-btn").addEventListener("click", function (e) {
diff --git a/electron/icon.icns b/electron/icon.icns
diff --git a/electron/index.js b/electron/index.js
@@ -135,6 +135,10 @@ function doCreateWindow(url) {
 
   // Open the DevTools.
   //mainWindow.webContents.openDevTools({mode:'undocked'});
+
+  // setTimeout(() => {
+  //   mainWindow.webContents.send('endpointsChanged', 'HELLO!!!!');
+  // }, 5000);
 }
 
 app.on('ready', createWindow)
diff --git a/electron/logo.png b/electron/logo.png
diff --git a/electron/menu.js b/electron/menu.js
@@ -19,7 +19,7 @@ function about() {
   let child = new BrowserWindow({
     parent: appMainWindow,
     modal: true,
-    width: 300,
+    width: 360,
     height: 300,
     webPreferences: {
       enableRemoteModule: true,
@@ -37,7 +37,6 @@ const template = [
         label: 'About Stratos',
         click: function () {
           about();
-          console.log('about');
         }
       },
       {
diff --git a/src/frontend/packages/desktop-extensions/sass/styles.scss b/src/frontend/packages/desktop-extensions/sass/styles.scss
@@ -1,4 +1,4 @@
-.stratos {
+.stratos.stratos-desktop {
 
   // Remove some of the padding on the list header
   .list-component__header {
@@ -19,4 +19,20 @@
     line-height: 20px;
     width: 20px;
   }
+
+  .page-header__notifications-button .mat-badge-active {
+    font-size: 10px;
+    height: 16px;
+    line-height: 16px;
+    right: -8px;
+    top: -98px;
+    width: 16px;
+  }
+
+  .page-header__left {
+    h1 {
+      font-size: 18px;
+    }
+  }
+
 }
diff --git a/src/frontend/packages/desktop-extensions/src/desktop.module.ts b/src/frontend/packages/desktop-extensions/src/desktop.module.ts
@@ -1,5 +1,7 @@
 import { NgModule } from '@angular/core';
 import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { ElectronService } from 'ngx-electron';
 
 import { DesktopLoginComponent } from './desktop-login/desktop-login.component';
 
@@ -15,7 +17,11 @@ export class DesktopModule {
 
   static init = false;
 
-  constructor(router: Router) {
+  constructor(
+    router: Router,
+    private _electronService: ElectronService,
+    private store: Store)
+  {
     // Only update the routes once
     if (!DesktopModule.init) {
       // Override the component used for the login route
@@ -24,6 +30,17 @@ export class DesktopModule {
       loginRoute.component = DesktopLoginComponent;
       router.resetConfig(routeConfig);
       DesktopModule.init = true;
+      this.init();
     }
   }
-}
+
+  // Listen for events from the Electron host
+  private init() {
+    this._electronService.ipcRenderer.addListener('endpointsChanged', (sender, args) => {
+      console.log('Got an event - endpoints changed');
+      console.log(sender);
+      console.log(args);
+      //this.store.dispatch()
+    });
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,10 @@ function doCreateWindow(url) {`
`135`	`135`
`136`	`136`	`// Open the DevTools.`
`137`	`137`	`//mainWindow.webContents.openDevTools({mode:'undocked'});`
	`138`	`+`
	`139`	`+ // setTimeout(() => {`
	`140`	`+ // mainWindow.webContents.send('endpointsChanged', 'HELLO!!!!');`
	`141`	`+ // }, 5000);`
`138`	`142`	`}`
`139`	`143`
`140`	`144`	`app.on('ready', createWindow)`