Skip to content

Commit cd468ad

Browse files
committed
work in progress
1 parent 2084560 commit cd468ad

22 files changed

Lines changed: 182 additions & 214 deletions

ui/package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"@angular/pwa": "^0.803.8",
2626
"@angular/router": "~8.2.9",
2727
"@angular/service-worker": "~8.2.9",
28+
"@iconfu/svg-inject": "^1.2.3",
2829
"core-js": "^3.2.1",
2930
"ng-click-outside": "^5.1.1",
3031
"rxjs": "~6.5.3",

ui/src/app/app.component.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div #container class="container">
1+
<!-- <div #container class="container">
22
<eqm-loading class="loader" *ngIf="!loaded"></eqm-loading>
33
<eqm-header class="header"
44
(settingsToggled)="toggleDropdownSection('settings')"
@@ -29,4 +29,9 @@
2929
<eqm-outputs></eqm-outputs>
3030
<eqm-tooltip-container></eqm-tooltip-container>
3131
</div>
32-
32+
-->
33+
<div style="background-color: #313134; padding: 20px;">
34+
<eqm-knob size="large"></eqm-knob>
35+
<!-- <eqm-knob size="medium"></eqm-knob>
36+
<eqm-knob size="small"></eqm-knob> -->
37+
</div>

ui/src/app/app.component.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import '@iconfu/svg-inject'
12
import {
23
Component,
34
OnInit,
@@ -9,7 +10,6 @@ import { UIService, UIDimensions } from './services/ui.service'
910
import { FadeInOutAnimation, FromTopAnimation } from 'src/app/modules/animations'
1011
import { MatDialog } from '@angular/material'
1112
import { TransitionService } from './services/transitions.service'
12-
import { AssetsService } from './modules/eqmac-components/services/assets.service'
1313
import { AnalyticsService } from './services/analytics.service'
1414

1515
@Component({
@@ -35,7 +35,6 @@ export class AppComponent implements OnInit, AfterContentInit {
3535
private ui: UIService,
3636
public matDialog: MatDialog,
3737
private transitions: TransitionService,
38-
private assets: AssetsService,
3938
private analytics: AnalyticsService
4039
) { }
4140

@@ -45,9 +44,6 @@ export class AppComponent implements OnInit, AfterContentInit {
4544
}
4645

4746
async ngAfterContentInit () {
48-
await Promise.all([
49-
this.assets.load()
50-
])
5147
await this.utils.delay(this.animationDuration)
5248
this.syncDimensions()
5349
this.startDimensionsSync()
-746 KB
Binary file not shown.
-285 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-180 KB
Binary file not shown.

0 commit comments

Comments
 (0)