diff --git a/ui/angular.json b/ui/angular.json index aa339a9e5..61b5b002f 100644 --- a/ui/angular.json +++ b/ui/angular.json @@ -14,7 +14,8 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "allowedCommonJsDependencies": ["json-pointer"], + "preserveSymlinks": true, + "allowedCommonJsDependencies": ["json-pointer", "ng-qrcode"], "outputPath": "www", "index": "src/index.html", "main": "src/main.ts", diff --git a/ui/src/app/pages/login/login.module.ts b/ui/src/app/pages/login/login.module.ts index 96afca1d5..5074a668a 100644 --- a/ui/src/app/pages/login/login.module.ts +++ b/ui/src/app/pages/login/login.module.ts @@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms' import { IonicModule } from '@ionic/angular' import { LoginPage } from './login.page' import { SharingModule } from 'src/app/modules/sharing.module' -// import { MarketplaceLibModule } from 'marketplace-lib' const routes: Routes = [ { @@ -21,7 +20,6 @@ const routes: Routes = [ IonicModule, RouterModule.forChild(routes), SharingModule, - // MarketplaceLibModule, ], declarations: [LoginPage], }) diff --git a/ui/src/app/pages/login/login.page.html b/ui/src/app/pages/login/login.page.html index 11406c16c..aa907c2ad 100644 --- a/ui/src/app/pages/login/login.page.html +++ b/ui/src/app/pages/login/login.page.html @@ -1,5 +1,4 @@ - diff --git a/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts b/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts index ba4fd0f20..f7d59d8b4 100644 --- a/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts +++ b/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts @@ -17,7 +17,7 @@ import { PatchDbService } from 'src/app/services/patch-db/patch-db.service' }) export class MarketplaceListPage { @ViewChild(IonContent) content: IonContent - localPkgs: { [id: string]: PackageDataEntry } + localPkgs: { [id: string]: PackageDataEntry } = { } pageLoading = true pkgsLoading = true diff --git a/ui/src/app/services/config.service.ts b/ui/src/app/services/config.service.ts index c461878b6..8d1bdefa1 100644 --- a/ui/src/app/services/config.service.ts +++ b/ui/src/app/services/config.service.ts @@ -27,6 +27,7 @@ type UiConfig = { skipStartupAlerts: boolean } } + @Injectable({ providedIn: 'root', }) diff --git a/ui/test/assets/bitcoind.png b/ui/test/assets/bitcoind.png deleted file mode 100644 index 26ab11e1d..000000000 Binary files a/ui/test/assets/bitcoind.png and /dev/null differ diff --git a/ui/test/assets/bitwarden.png b/ui/test/assets/bitwarden.png deleted file mode 100644 index 04d8a9052..000000000 Binary files a/ui/test/assets/bitwarden.png and /dev/null differ diff --git a/ui/test/assets/btc-rpc-proxy.png b/ui/test/assets/btc-rpc-proxy.png deleted file mode 100644 index 78e57d65e..000000000 Binary files a/ui/test/assets/btc-rpc-proxy.png and /dev/null differ diff --git a/ui/test/assets/c-lightning.png b/ui/test/assets/c-lightning.png deleted file mode 100644 index 9b53c1a5c..000000000 Binary files a/ui/test/assets/c-lightning.png and /dev/null differ diff --git a/ui/test/assets/cups.png b/ui/test/assets/cups.png deleted file mode 100644 index 3b1f72bb0..000000000 Binary files a/ui/test/assets/cups.png and /dev/null differ diff --git a/ui/test/assets/filebrowser.png b/ui/test/assets/filebrowser.png deleted file mode 100644 index 6728fb3c6..000000000 Binary files a/ui/test/assets/filebrowser.png and /dev/null differ diff --git a/ui/test/assets/lightning-terminal.png b/ui/test/assets/lightning-terminal.png deleted file mode 100644 index 8187bb96a..000000000 Binary files a/ui/test/assets/lightning-terminal.png and /dev/null differ diff --git a/ui/test/assets/lnd.png b/ui/test/assets/lnd.png deleted file mode 100644 index 37a0ffceb..000000000 Binary files a/ui/test/assets/lnd.png and /dev/null differ diff --git a/ui/test/assets/pastebin.png b/ui/test/assets/pastebin.png deleted file mode 100644 index 876352955..000000000 Binary files a/ui/test/assets/pastebin.png and /dev/null differ diff --git a/ui/test/assets/ride-the-lightning.png b/ui/test/assets/ride-the-lightning.png deleted file mode 100644 index f77e30852..000000000 Binary files a/ui/test/assets/ride-the-lightning.png and /dev/null differ diff --git a/ui/test/config.test.ts b/ui/test/config.test.ts deleted file mode 100644 index ed65cdda7..000000000 --- a/ui/test/config.test.ts +++ /dev/null @@ -1,263 +0,0 @@ -import { displayUniqueBy } from '../src/app/app-config/config-cursor' - -function assert (predicate: boolean, message: string) { - if (!predicate) { - throw new Error('Assertion Failed: ' + message) - } -} - -function assertEq (a: any, b: any, message: string) { - assert(a === b, message) -} - -function test () { - assertEq( - displayUniqueBy( - 'foo', - { - type: 'object', - name: 'Object', - spec: { - 'foo': { - type: 'string', - name: 'Foo', - nullable: true, - copyable: false, - masked: false, - }, - }, - nullByDefault: false, - nullable: false, - uniqueBy: 'foo', - }, - { - foo: 'foo-val', - }, - ), - 'Foo', - 'base string uses name mapping', - ) - assertEq( - displayUniqueBy( - { - any: [ - 'foo', - 'bar', - ], - }, - { - type: 'object', - name: 'Object', - spec: { - 'foo': { - type: 'string', - name: 'Foo', - nullable: true, - copyable: false, - masked: false, - }, - 'bar': { - type: 'string', - name: 'Bar', - nullable: true, - copyable: false, - masked: false, - }, - }, - nullByDefault: false, - nullable: false, - uniqueBy: { - any: [ - 'foo', - 'bar', - ], - }, - }, - { - foo: 'foo-val', - bar: 'bar-val', - }, - ), - 'Foo and Bar', - '`any` must be joined with `and`', - ) - assertEq( - displayUniqueBy( - { - all: [ - 'foo', - 'bar', - ], - }, - { - type: 'object', - name: 'Object', - spec: { - 'foo': { - type: 'string', - name: 'Foo', - nullable: true, - copyable: false, - masked: false, - }, - 'bar': { - type: 'string', - name: 'Bar', - nullable: true, - copyable: false, - masked: false, - }, - }, - nullByDefault: false, - nullable: false, - uniqueBy: { - all: [ - 'foo', - 'bar', - ], - }, - }, - { - foo: 'foo-val', - bar: 'bar-val', - }, - ), - 'Foo or Bar', - '`all` must be joined with `or`', - ) - assertEq( - displayUniqueBy( - { - any: [ - 'foo', - { - all: [ - 'bar', - 'baz', - ], - }, - ], - }, - { - type: 'object', - name: 'Object', - spec: { - 'foo': { - type: 'string', - name: 'Foo', - nullable: true, - copyable: false, - masked: false, - }, - 'bar': { - type: 'string', - name: 'Bar', - nullable: true, - copyable: false, - masked: false, - }, - 'baz': { - type: 'string', - name: 'Baz', - nullable: true, - copyable: false, - masked: false, - }, - }, - nullByDefault: false, - nullable: false, - uniqueBy: { - any: [ - 'foo', - { - all: [ - 'bar', - 'baz', - ], - }, - ], - }, - }, - { - foo: 'foo-val', - bar: 'bar-val', - baz: 'baz-val', - }, - ), - 'Foo and (Bar or Baz)', - '`any` of `all` is correct', - ) - assertEq( - displayUniqueBy( - { - any: [ - 'foo', - { - all: [ - 'bar', - 'baz', - ], - }, - ], - }, - { - type: 'union', - name: 'Union', - tag: { - id: 'variant', - name: 'Variant', - 'variant-names': { - 'variant-a': 'Variant A', - 'variant-b': 'Variant B', - }, - }, - variants: { - 'variant-a': { - 'foo': { - type: 'string', - name: 'Foo', - nullable: true, - copyable: false, - masked: false, - }, - 'bar': { - type: 'string', - name: 'Bar', - nullable: true, - copyable: false, - masked: false, - }, - 'baz': { - type: 'string', - name: 'Baz', - nullable: true, - copyable: false, - masked: false, - }, - }, - 'variant-b': { }, - }, - uniqueBy: { - any: [ - 'foo', - { - all: [ - 'bar', - 'baz', - ], - }, - ], - }, - default: 'variant-a', - }, - { - variant: 'variant-a', - foo: 'foo-val', - bar: 'bar-val', - baz: 'baz-val', - }, - ), - 'Foo and (Bar or Baz)', - 'union is correct', - ) -}