diff --git a/ui-ngx/src/app/modules/home/home.component.ts b/ui-ngx/src/app/modules/home/home.component.ts index aa2dc5257f..a636217eaa 100644 --- a/ui-ngx/src/app/modules/home/home.component.ts +++ b/ui-ngx/src/app/modules/home/home.component.ts @@ -30,7 +30,6 @@ import { MatSidenav } from '@angular/material/sidenav'; import { AuthState } from '@core/auth/auth.models'; import { WINDOW } from '@core/services/window.service'; import { instanceOfSearchableComponent, ISearchableComponent } from '@home/models/searchable-component.models'; -import logo from '../../../assets/logo_title_white.svg'; const screenfull = _screenfull as _screenfull.Screenfull; @@ -51,7 +50,7 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni sidenavMode: 'over' | 'push' | 'side' = 'side'; sidenavOpened = true; - logo = logo; + logo = require('../../../assets/logo_title_white.svg').default; @ViewChild('sidenav') sidenav: MatSidenav; diff --git a/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html index ef76229afe..80c502e2f8 100644 --- a/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html +++ b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html @@ -17,7 +17,7 @@ -->

Coming soon!

- +

COMING SOON!

diff --git a/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts index 95a5efe345..ff8fbd5d0c 100644 --- a/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts +++ b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts @@ -16,7 +16,6 @@ import { Component } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import comingSoon from '@assets/coming-soon.jpg'; @Component({ selector: 'tb-todo-dialog', @@ -24,9 +23,6 @@ import comingSoon from '@assets/coming-soon.jpg'; styleUrls: ['./todo-dialog.component.scss'] }) export class TodoDialogComponent { - - comingSoon = comingSoon; - constructor(public dialogRef: MatDialogRef) { } } diff --git a/ui-ngx/src/app/shared/decorators/enumerable.ts b/ui-ngx/src/app/shared/decorators/enumerable.ts index 300339e18e..c1a37ed7d0 100644 --- a/ui-ngx/src/app/shared/decorators/enumerable.ts +++ b/ui-ngx/src/app/shared/decorators/enumerable.ts @@ -1,3 +1,19 @@ +/// +/// Copyright © 2016-2020 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + export function enumerable(value: boolean) { return ( target: any, diff --git a/ui-ngx/src/assets/coming-soon.jpg b/ui-ngx/src/assets/coming-soon.jpg deleted file mode 100644 index 3fc8e85352..0000000000 Binary files a/ui-ngx/src/assets/coming-soon.jpg and /dev/null differ diff --git a/ui-ngx/src/typings/imageloader.typings.d.ts b/ui-ngx/src/typings/imageloader.typings.d.ts deleted file mode 100644 index 9d139c50a9..0000000000 --- a/ui-ngx/src/typings/imageloader.typings.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -declare module '*.png' { - const value: any; - export = value; -} - -declare module '*.jpg' { - const value: any; - export = value; -} - -declare module '*.svg' { - const value: any; - export = value; -} diff --git a/ui-ngx/tsconfig.base.json b/ui-ngx/tsconfig.base.json index d8b4e76506..b814f9ff19 100644 --- a/ui-ngx/tsconfig.base.json +++ b/ui-ngx/tsconfig.base.json @@ -21,8 +21,7 @@ "src/typings/jquery.jstree.typings.d.ts", "src/typings/split.js.typings.d.ts", "src/typings/add-marker.d.ts", - "src/typings/leaflet-editable.d.ts", - "src/typings/imageloader.typings.d.ts" + "src/typings/leaflet-editable.d.ts" ], "paths": { "@app/*": ["src/app/*"], @@ -33,7 +32,6 @@ "@modules/*": ["src/app/modules/*"], "@shared/*": ["src/app/shared/*"], "@home/*": ["src/app/modules/home/*"], - "@assets/*": ["src/assets/*"], "jszip": [ "node_modules/jszip/dist/jszip.min.js" ]