Skip to content

Commit 7de5a97

Browse files
sowlesowle
authored
Merge pull request #153 from NazarUsov/feature/accessibility
Feature Accessibility
2 parents 1b080e0 + a8c91e4 commit 7de5a97

175 files changed

Lines changed: 7737 additions & 2205 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/compiler.xml‎

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

‎.idea/easy-i18n.xml‎

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

‎html_source/.eslintrc.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959

6060
"prettier/prettier": ["error", { "endOfLine": "auto" }],
6161

62-
"@angular-eslint/component-selector": "off",
63-
"@angular-eslint/directive-selector": "off",
62+
"@angular-eslint/no-host-metadata-property": "off",
6463
"@typescript-eslint/restrict-template-expressions": [
6564
"error",
6665
{

‎html_source/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"build": "ng build",
88
"build --watch": "ng build --output-path \"/Applications/Zano.app/Contents/MacOS/html\" --watch",
99
"build --watch2": "ng build --output-path \"/Applications/Zano 2.app/Contents/MacOS/html\" --watch",
10+
"build --watch3": "ng build --output-path \"/work/nazar/Zano/html/\" --watch",
1011
"build --html": "node update-build-time.js && ng build --output-path \"../html/\"",
1112
"test": "ng test",
1213
"lint": "ng lint",

‎html_source/src/app/api/models/wallet.model.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ import {
1212
import { BehaviorSubject, combineLatest } from 'rxjs';
1313
import { AliasInfo, AliasInfoList } from '@api/models/alias.model';
1414
import { TransferFormValue } from '@api/models/transfer.model';
15-
import { DEFAULT_ASSET_LOGO_SRC, ZANO_ASSET_INFO } from '@parts/data/assets';
15+
import { ZANO_ASSET_INFO } from '@parts/data/zano-assets-info';
1616
import { map } from 'rxjs/operators';
17+
import { DEFAULT_ASSET_LOGO_SRC } from '@parts/data/constants';
1718

1819
export const defaultAssetsInfoWhitelist = { global_whitelist: [], local_whitelist: [], own_assets: [] };
1920

‎html_source/src/app/app.component.html‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<router-outlet
2+
*ngIf="[0, 1, 2, 6].includes(variablesService.daemon_state) && !(zanoLoadersService.getState('fullScreen') | async)"
3+
></router-outlet>
4+
5+
<!-- Synch / Error / Complete States -->
6+
<section *ngIf="[3, 4, 5].includes(variablesService.daemon_state)" aria-busy="true" aria-live="polite" class="preloader" role="status">
7+
<p *ngIf="variablesService.daemon_state === 3" class="mb-2">
8+
{{ 'SIDEBAR.SYNCHRONIZATION.LOADING' | translate }}
9+
</p>
10+
<p *ngIf="variablesService.daemon_state === 4" class="mb-2">
11+
{{ 'SIDEBAR.SYNCHRONIZATION.ERROR' | translate }}
12+
</p>
13+
<p *ngIf="variablesService.daemon_state === 5" class="mb-2">
14+
{{ 'SIDEBAR.SYNCHRONIZATION.COMPLETE' | translate }}
15+
</p>
16+
<div aria-hidden="true" class="loading-bar"></div>
17+
</section>
18+
19+
<!-- Full Screen Loader -->
20+
<section *ngIf="zanoLoadersService.getState('fullScreen') | async" aria-busy="true" aria-live="polite" class="preloader" role="status">
21+
<p class="mb-2">
22+
{{ zanoLoadersService.getMessage('fullScreen') | async | translate }}
23+
</p>
24+
<div aria-hidden="true" class="loading-bar"></div>
25+
</section>
26+
27+
<app-register-context-templates></app-register-context-templates>
28+
29+
<app-open-wallet-modal *ngIf="needOpenWallets.length" [wallets]="needOpenWallets"></app-open-wallet-modal>

‎html_source/src/app/app.component.ts‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Component, NgZone, OnDestroy, OnInit, Renderer2 } from '@angular/core';
2-
import { HttpClient } from '@angular/common/http';
32
import { TranslateService } from '@ngx-translate/core';
43
import { BackendService, Commands } from '@api/services/backend.service';
54
import { Router } from '@angular/router';
@@ -24,35 +23,7 @@ import { AliasInfo } from '@api/models/alias.model';
2423

2524
@Component({
2625
selector: 'app-root',
27-
template: `
28-
<router-outlet
29-
*ngIf="[0, 1, 2, 6].indexOf(variablesService.daemon_state) !== -1 && !(zanoLoadersService.getState('fullScreen') | async)"
30-
></router-outlet>
31-
32-
<div *ngIf="[3, 4, 5].indexOf(variablesService.daemon_state) !== -1" class="preloader">
33-
<p *ngIf="variablesService.daemon_state === 3" class="mb-2">
34-
{{ 'SIDEBAR.SYNCHRONIZATION.LOADING' | translate }}
35-
</p>
36-
<p *ngIf="variablesService.daemon_state === 4" class="mb-2">
37-
{{ 'SIDEBAR.SYNCHRONIZATION.ERROR' | translate }}
38-
</p>
39-
<p *ngIf="variablesService.daemon_state === 5" class="mb-2">
40-
{{ 'SIDEBAR.SYNCHRONIZATION.COMPLETE' | translate }}
41-
</p>
42-
<div class="loading-bar"></div>
43-
</div>
44-
45-
<div class="preloader" *ngIf="zanoLoadersService.getState('fullScreen') | async">
46-
<p class="mb-2">
47-
{{ zanoLoadersService.getMessage('fullScreen') | async | translate }}
48-
</p>
49-
<div class="loading-bar"></div>
50-
</div>
51-
52-
<app-register-context-templates></app-register-context-templates>
53-
54-
<app-open-wallet-modal *ngIf="needOpenWallets.length" [wallets]="needOpenWallets"></app-open-wallet-modal>
55-
`,
26+
templateUrl: './app.component.html',
5627
})
5728
export class AppComponent implements OnInit, OnDestroy {
5829
intervalUpdateContractsState;
@@ -82,7 +53,6 @@ export class AppComponent implements OnInit, OnDestroy {
8253
constructor(
8354
public variablesService: VariablesService,
8455
public translate: TranslateService,
85-
private http: HttpClient,
8656
private renderer: Renderer2,
8757
private backendService: BackendService,
8858
private router: Router,
@@ -118,7 +88,7 @@ export class AppComponent implements OnInit, OnDestroy {
11888
];
11989
this.backendService.setBackendLocalization(stringsArray, this.variablesService.settings.language);
12090
} else {
121-
console.warn('wait translate use');
91+
console.warn('Wait Translate Use');
12292
setTimeout(() => {
12393
this.setBackendLocalization();
12494
}, 10000);

‎html_source/src/app/app.module.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ const providerMatDialog: Provider = {
8787
FormsModule,
8888
MatDialogModule,
8989
RegisterContextTemplatesComponent,
90+
TranslateModule,
9091
],
9192
providers: [provideHighchartsFactory, provideDialog, providerMatDialog],
9293
bootstrap: [AppComponent],

‎html_source/src/app/layouts/full-layout/full-layout.component.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="overflow-auto p-2" fxFlex="100" fxFlexFill>
2+
<router-outlet></router-outlet>
3+
</div>

‎html_source/src/app/layouts/full-layout/full-layout.component.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import { Component } from '@angular/core';
22

33
@Component({
44
selector: 'app-full-layout',
5-
template: `
6-
<div class="overflow-auto p-2" fxFlex="100" fxFlexFill>
7-
<router-outlet></router-outlet>
8-
</div>
9-
`,
5+
templateUrl: './full-layout.component.html',
106
styles: [
117
`
128
:host {

0 commit comments

Comments
 (0)