Commit 367bae32bbcbfc7b403fc78c0acfbb09be8acf1c

Authored by Igor Kulikov
1 parent 36155978

Fix image import

... ... @@ -30,7 +30,6 @@ import { MatSidenav } from '@angular/material/sidenav';
30 30 import { AuthState } from '@core/auth/auth.models';
31 31 import { WINDOW } from '@core/services/window.service';
32 32 import { instanceOfSearchableComponent, ISearchableComponent } from '@home/models/searchable-component.models';
33   -import logo from '../../../assets/logo_title_white.svg';
34 33
35 34 const screenfull = _screenfull as _screenfull.Screenfull;
36 35
... ... @@ -51,7 +50,7 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni
51 50 sidenavMode: 'over' | 'push' | 'side' = 'side';
52 51 sidenavOpened = true;
53 52
54   - logo = logo;
  53 + logo = require('../../../assets/logo_title_white.svg').default;
55 54
56 55 @ViewChild('sidenav')
57 56 sidenav: MatSidenav;
... ...
... ... @@ -17,7 +17,7 @@
17 17 -->
18 18 <h2 mat-dialog-title>Coming soon!</h2>
19 19 <div mat-dialog-content>
20   - <img [src]="comingSoon"/>
  20 + <h1>COMING SOON!</h1>
21 21 </div>
22 22 <div mat-dialog-actions fxLayout="row" fxLayoutAlign="end center">
23 23 <button mat-button color="primary" [mat-dialog-close]="true" cdkFocusInitial>Ok</button>
... ...
... ... @@ -16,7 +16,6 @@
16 16
17 17 import { Component } from '@angular/core';
18 18 import { MatDialogRef } from '@angular/material/dialog';
19   -import comingSoon from '@assets/coming-soon.jpg';
20 19
21 20 @Component({
22 21 selector: 'tb-todo-dialog',
... ... @@ -24,9 +23,6 @@ import comingSoon from '@assets/coming-soon.jpg';
24 23 styleUrls: ['./todo-dialog.component.scss']
25 24 })
26 25 export class TodoDialogComponent {
27   -
28   - comingSoon = comingSoon;
29   -
30 26 constructor(public dialogRef: MatDialogRef<TodoDialogComponent>) {
31 27 }
32 28 }
... ...
  1 +///
  2 +/// Copyright © 2016-2020 The Thingsboard Authors
  3 +///
  4 +/// Licensed under the Apache License, Version 2.0 (the "License");
  5 +/// you may not use this file except in compliance with the License.
  6 +/// You may obtain a copy of the License at
  7 +///
  8 +/// http://www.apache.org/licenses/LICENSE-2.0
  9 +///
  10 +/// Unless required by applicable law or agreed to in writing, software
  11 +/// distributed under the License is distributed on an "AS IS" BASIS,
  12 +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 +/// See the License for the specific language governing permissions and
  14 +/// limitations under the License.
  15 +///
  16 +
1 17 export function enumerable(value: boolean) {
2 18 return (
3 19 target: any,
... ...
1   -declare module '*.png' {
2   - const value: any;
3   - export = value;
4   -}
5   -
6   -declare module '*.jpg' {
7   - const value: any;
8   - export = value;
9   -}
10   -
11   -declare module '*.svg' {
12   - const value: any;
13   - export = value;
14   -}
... ... @@ -21,8 +21,7 @@
21 21 "src/typings/jquery.jstree.typings.d.ts",
22 22 "src/typings/split.js.typings.d.ts",
23 23 "src/typings/add-marker.d.ts",
24   - "src/typings/leaflet-editable.d.ts",
25   - "src/typings/imageloader.typings.d.ts"
  24 + "src/typings/leaflet-editable.d.ts"
26 25 ],
27 26 "paths": {
28 27 "@app/*": ["src/app/*"],
... ... @@ -33,7 +32,6 @@
33 32 "@modules/*": ["src/app/modules/*"],
34 33 "@shared/*": ["src/app/shared/*"],
35 34 "@home/*": ["src/app/modules/home/*"],
36   - "@assets/*": ["src/assets/*"],
37 35 "jszip": [
38 36 "node_modules/jszip/dist/jszip.min.js"
39 37 ]
... ...