disabled service worker

Author: nodeful

…/app/Source/Settings/SettingsRoute.swift …pp/Source/Settings/SettingsDataBus.swiftnative/app/Source/Settings/SettingsRoute.swift renamed to native/app/Source/Settings/SettingsDataBus.swift native/app/Source/Settings/SettingsRoute.swift renamed to native/app/Source/Settings/SettingsDataBus.swift

@@ -63,7 +63,7 @@
                   "maximumError": "5mb"
                 }
               ],
-              "serviceWorker": true
+              "serviceWorker": false
             }
           }
         },

ui/angular.json

@@ -1,10 +1,9 @@
 {
   "name": "eqmac",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "scripts": {
     "start": "ng serve",
-    "build": "rm -rf dist/ && ng build --prod",
-    "package": "npm run build && cd dist/ && zip -r -D ../ui.zip * -x '*.DS_Store'",
+    "build": "rm -rf dist/ && ng build --prod && cd dist/ && zip -r -D ui.zip * -x '*.DS_Store'",
     "deploy": "export $(egrep -v '^#' .env | xargs) && ./scripts/deploy.sh",
     "purge-cache": "./node_modules/.bin/ts-node -O '{\"module\":\"commonjs\"}' ./scripts/purge-cache.ts"
   },

ui/package.json

@@ -1,8 +1,12 @@
 #!/bin/sh
 set -e
 
-VERSION=$(node -e "const [ major, minor ] = require('./package.json').version.split('.');console.log([major, minor, 0].join(''))")
-DOMAIN=ui-v$VERSION.eqmac.app
+UI_VERSION=$(node -e "console.log(require('./package.json').version)")
+SUBDOMAIN_VERSION=$(node -e "const [ major, minor ] = require('./package.json').version.split('.');console.log([major, minor, 0].join(''))")
+DOMAIN=ui-v$SUBDOMAIN_VERSION.eqmac.app
+
+echo $UI_VERSION
+echo $SUBDOMAIN_VERSION
 
 npm run build
 
@@ -11,6 +15,7 @@ gcloud config set project $GCLOUD_PROJECT_ID
 
 gsutil -m cp -z js,css,html -r dist/* gs://$DOMAIN
 gsutil -m setmeta -h "Content-Type:text/html;charset=utf-8" gs://$DOMAIN/**/*.html
+
 gsutil iam ch allUsers:objectViewer gs://$DOMAIN
 
 ./node_modules/.bin/ts-node -O '{"module":"commonjs"}' ./scripts/purge-cache.ts || echo "❌ Failed to purge Cloudflare cache"

ui/scripts/deploy.sh

@@ -22,7 +22,6 @@ import {
 } from './modules/eqmac-components/eqmac-components.module'
 
 import { PipesModule } from './modules/pipes/pipes.module'
-import { ServiceWorkerModule } from '@angular/service-worker'
 
 import {
   CommonModule
@@ -98,8 +97,7 @@ import { OptionsDialogComponent } from './components/options-dialog/options-dial
     EqmacComponentsModule,
     MatDialogModule,
     BrowserModule,
-    ClickOutsideModule,
-    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })
+    ClickOutsideModule
   ],
   entryComponents: [
     ConfirmDialogComponent,

ui/src/app/app.module.ts

@@ -1 +1,4 @@
-<ng-content></ng-content>
+<!-- <ng-content></ng-content> -->
+<div class="container" [ngStyle]="style">
+  <img #icon [src]="'assets/icons/' + name + '.svg'" onload="SVGInject(this)"/>
+</div>

ui/src/app/modules/eqmac-components/components/icon/icon.component.html

@@ -1,8 +1,12 @@
-.icon {
-  margin: 0 auto;
-  display: block;
-}
 
-.hidden {
-  display: none;
+.container {
+  position: relative;
+  svg {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
 }

ui/src/app/modules/eqmac-components/components/icon/icon.component.scss

@@ -3,9 +3,8 @@ import {
   OnInit,
   Input,
   ElementRef,
-  Renderer
+  ViewChild
 } from '@angular/core'
-import { HttpClient } from '@angular/common/http'
 
 @Component({
   selector: 'eqm-icon',
@@ -16,10 +15,11 @@ export class IconComponent implements OnInit {
   @Input() width = 20
   @Input() height = 20
 
+  @ViewChild('icon', { static: true }) iconRef: ElementRef
+
   @Input() set size (newSize) {
     this.width = newSize
     this.height = newSize
-    this.loadSVG()
   }
   _color = '#979aa0'
   @Input()
@@ -29,7 +29,6 @@ export class IconComponent implements OnInit {
     } else {
       this._color = '#979aa0'
     }
-    this.loadSVG()
   }
 
   _strokeColor = this._color
@@ -40,7 +39,6 @@ export class IconComponent implements OnInit {
     } else {
       this._strokeColor = this._color
     }
-    this.loadSVG()
   }
 
   private _rotate = 0
@@ -50,59 +48,39 @@ export class IconComponent implements OnInit {
   }
   set rotate (angle: number) {
     this._rotate = angle
-    this.loadSVG()
   }
 
   _name = null
   @Input()
   set name (iconName: string) {
     this._name = iconName
-    this.loadSVG()
   }
   get name () { return this._name }
 
   @Input() stroke: number = 0
-  constructor (
-    private elementRef: ElementRef,
-    private renderer: Renderer,
-    private http: HttpClient
-  ) {}
 
   ngOnInit () {
-    this.loadSVG()
   }
 
-  loadSVG () {
-    if (!this.name) return
-    const responseType: any = 'text'
-    this.http.get <any>(`/assets/icons/${this.name}.svg`, {
-      responseType
-    }).subscribe(response => {
+  get style () {
+    const style: any = {}
 
-      const element = this.elementRef.nativeElement
-      element.innerHTML = ''
+    style.fill = `${this._color}`
+    style.display = 'block'
+    style.margin = '0 auto'
+    if (this.height >= 0) {
+      style.height = `${this.height}px`
+    }
+    if (this.height >= 0) {
+      style.width = `${this.width}px`
+    }
+    style.transform = `rotate(${this.rotate}deg)`
 
-      const parser = new DOMParser()
-      const svg = parser.parseFromString(response, 'image/svg+xml').documentElement
-      svg.style.fill = `${this._color}`
-      svg.style.display = 'block'
-      svg.style.margin = '0 auto'
-      if (this.height >= 0) {
-        svg.style.height = `${this.height}px`
-      }
-      if (this.height >= 0) {
-        svg.style.width = `${this.width}px`
-      }
-      svg.style.transform = `rotate(${this.rotate}deg)`
+    if (this.stroke) {
+      style['stroke-width'] = `${this.stroke}px`
+      style.stroke = `${this._strokeColor}`
+    }
 
-      if (this.stroke) {
-        svg.style['stroke-width'] = `${this.stroke}px`
-        svg.style.stroke = `${this._strokeColor}`
-      }
-      this.renderer.projectNodes(element, [svg])
-      if (this.height >= 0) {
-        svg.parentElement.style.height = `${this.height}px`
-      }
-    })
+    return style
   }
 }

ui/src/app/modules/eqmac-components/components/icon/icon.component.ts

@@ -1,5 +1,5 @@
 @font-face {
   font-family: 'eqMacFont';
-  src: url('/assets/SF-Pro-Text-Regular.otf');
+  src: url(/assets/SF-Pro-Text-Regular.otf);
 }
 

ui/src/app/modules/eqmac-components/styles/font.scss

@@ -1,16 +1,16 @@
 <eqm-label>Balance</eqm-label>
 
 <!-- Knob controls -->
-<div *ngIf="!uiSettings.replaceKnobsWithSliders" fxLayout="row" fxLayoutAlign="space-around start"
+<div *ngIf="!uiSettings.replaceKnobsWithSliders" fxLayout="row" fxLayoutAlign="center start"
   [class]="'controls' + (hide ? ' hide' : '')">
-  <div fxLayout="column" fxLayoutAlign="center center">
+  <div fxLayout="column" fxLayoutAlign="center center" fxFlex="52px">
     <eqm-label>Left</eqm-label>
     <eqm-value-screen>{{(balance | mapValue:0:1:100:0 | clipValue:0:100 | fixFloat:0:false)}}%</eqm-value-screen>
   </div>
   <eqm-knob size="small" [min]="-1" [max]="1" [(value)]="balance" (userChangedValue)="setBalance($event)"
     [stickToMiddle]="true" (stickedToMiddle)="performHapticFeedback($event)" [animationDuration]="animationDuration"
     [animationFps]="animationFps"></eqm-knob>
-  <div fxLayout="column" fxLayoutAlign="center center">
+  <div fxLayout="column" fxLayoutAlign="center center" fxFlex="52px">
     <eqm-label>Right</eqm-label>
     <eqm-value-screen>{{(balance | mapValue:0:-1:100:0 | clipValue:0:100 | fixFloat:0:false)}}%</eqm-value-screen>
   </div>