Skip to content

Feature/UI/version update #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sofyakurilova merged 3 commits into from
Nov 28, 2024
Merged

Feature/UI/version update #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a32a12
Update version
sofyakurilova Nov 27, 2024
9a1a26c
Update version
sofyakurilova Nov 27, 2024
a00d096
Fix tests
sofyakurilova Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions modules/ui/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,23 @@
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"buildTarget": "test-run-ui:build"
},
"configurations": {
"production": {
"browserTarget": "test-run-ui:build:production"
"buildTarget": "test-run-ui:build:production"
},
"development": {
"browserTarget": "test-run-ui:build:development"
"buildTarget": "test-run-ui:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "test-run-ui:build"
"buildTarget": "test-run-ui:build"
}
},
"test": {
Expand Down
4,622 changes: 2,674 additions & 1,948 deletions modules/ui/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions modules/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,34 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^18.2.4",
"@angular/cdk": "^18.2.0",
"@angular/common": "^18.2.4",
"@angular/compiler": "^18.2.4",
"@angular/core": "^18.2.4",
"@angular/forms": "^18.2.4",
"@angular/material": "^18.2.0",
"@angular/platform-browser": "^18.2.4",
"@angular/platform-browser-dynamic": "^18.2.4",
"@angular/router": "^18.2.4",
"@ngrx/component-store": "^18.0.2",
"@ngrx/effects": "^18.0.2",
"@ngrx/store": "^18.0.2",
"@angular/animations": "^19.0.1",
"@angular/cdk": "^19.0.1",
"@angular/common": "^19.0.1",
"@angular/compiler": "^19.0.1",
"@angular/core": "^19.0.1",
"@angular/forms": "^19.0.1",
"@angular/material": "^19.0.1",
"@angular/platform-browser": "^19.0.1",
"@angular/platform-browser-dynamic": "^19.0.1",
"@angular/router": "^19.0.1",
"@ngrx/component-store": "19.0.0-beta.0",
"@ngrx/effects": "19.0.0-beta.0",
"@ngrx/store": "19.0.0-beta.0",
"ngx-mask": "^16.4.2",
"ngx-mqtt": "^17.0.0",
"rxjs": "~7.8.0",
"tslib": "^2.6.2",
"zone.js": "^0.14.10"
"zone.js": "^0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.1.4",
"@angular-eslint/builder": "18.3.0",
"@angular-eslint/eslint-plugin": "^18.3.0",
"@angular-eslint/eslint-plugin-template": "^18.3.0",
"@angular-eslint/schematics": "^18.3.0",
"@angular-eslint/template-parser": "18.3.0",
"@angular/cli": "~18.2.4",
"@angular/compiler-cli": "^18.2.4",
"@angular-devkit/build-angular": "^19.0.2",
"@angular-eslint/builder": "19.0.0-alpha.4",
"@angular-eslint/eslint-plugin": "19.0.0-alpha.4",
"@angular-eslint/eslint-plugin-template": "19.0.0-alpha.4",
"@angular-eslint/schematics": "19.0.0-alpha.4",
"@angular-eslint/template-parser": "19.0.0-alpha.4",
"@angular/cli": "~19.0.2",
"@angular/compiler-cli": "^19.0.1",
"@types/jasmine": "~4.3.6",
"@typescript-eslint/eslint-plugin": "^8.2.0",
"@typescript-eslint/parser": "^8.2.0",
Expand Down
38 changes: 19 additions & 19 deletions modules/ui/src/app/app.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
@use '@angular/material' as mat;
@use 'm3-theme' as *;
@import 'colors';
@import 'variables';
@use 'colors';
@use 'variables';

$toolbar-height: 64px;
$content-padding-top: 18px;
Expand All @@ -25,7 +25,7 @@ $nav-width: 96px;

.app-container {
height: 100%;
background-color: $surface-container-low;
background-color: colors.$surface-container-low;
}

.spacer {
Expand All @@ -35,15 +35,15 @@ $nav-width: 96px;
.app-sidebar {
display: flex;
flex-direction: column;
background-color: $surface-container-low;
background-color: colors.$surface-container-low;
height: 100%;
gap: 8px;
width: $nav-width;
align-items: center;
}

.nav-items-container {
height: calc(100% - $nav-button-height);
height: calc(100% - #{variables.$nav-button-height});
width: 100%;
display: flex;
flex-direction: column;
Expand All @@ -55,7 +55,7 @@ $nav-width: 96px;
.app-sidebar-button {
display: flex;
flex-direction: column;
border-radius: $corner-large;
border-radius: variables.$corner-large;
border: 1px solid transparent;
min-width: 48px;
box-sizing: border-box;
Expand All @@ -76,9 +76,9 @@ $nav-width: 96px;
}

.sidebar-button-label {
color: $on-surface-variant;
color: colors.$on-surface-variant;
text-align: center;
font-family: $font-text;
font-family: variables.$font-text;
font-size: 12px;
font-weight: 500;
line-height: 16px;
Expand All @@ -94,7 +94,7 @@ $nav-width: 96px;
margin-right: 0;
width: 24px;
font-size: 24px;
color: $on-surface-variant;
color: colors.$on-surface-variant;
height: 24px;
}

Expand All @@ -113,20 +113,20 @@ $nav-width: 96px;
}

& > .mat-icon {
color: $on-secondary-fixed-variant;
color: colors.$on-secondary-fixed-variant;
}
.sidebar-button-label {
color: $secondary;
color: colors.$secondary;
}

.mat-mdc-button-persistent-ripple::before {
opacity: 1;
background: $secondary-fixed;
background: colors.$secondary-fixed;
}
}

.logo-link {
color: $on-surface;
color: colors.$on-surface;
text-decoration: none;
font-size: 22px;
display: flex;
Expand All @@ -139,7 +139,7 @@ $nav-width: 96px;

&:focus-visible {
outline: none;
border: 1px solid $black;
border: 1px solid colors.$black;
border-radius: 4px;
}

Expand Down Expand Up @@ -169,8 +169,8 @@ $nav-width: 96px;
z-index: 3;
height: $toolbar-height;
padding: 0 16px;
background-color: $surface-container-low;
color: $grey-800;
background-color: colors.$surface-container-low;
color: colors.$grey-800;
width: 100%;
}

Expand All @@ -190,8 +190,8 @@ $nav-width: 96px;
height: calc(
100% - $toolbar-height - $content-padding-top - $content-padding-bottom
);
border-radius: $corner-large;
background: $white;
border-radius: variables.$corner-large;
background: colors.$white;
}

.app-content-main {
Expand All @@ -204,7 +204,7 @@ $nav-width: 96px;
.settings-drawer {
width: 320px;
box-shadow: none;
border-left: 1px solid $light-grey;
border-left: 1px solid colors.$light-grey;
}

app-version {
Expand Down
5 changes: 5 additions & 0 deletions modules/ui/src/app/app.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ describe('AppComponent', () => {
@Component({
selector: 'app-settings',
template: '<div></div>',
standalone: false,
})
class FakeGeneralSettingsComponent {
@Input() settingsDisable = false;
Expand All @@ -816,12 +817,14 @@ class FakeGeneralSettingsComponent {
@Component({
selector: 'app-spinner',
template: '<div></div>',
standalone: false,
})
class FakeSpinnerComponent {}

@Component({
selector: 'app-shutdown-app',
template: '<div></div>',
standalone: false,
})
class FakeShutdownAppComponent {
@Input() disable!: boolean;
Expand All @@ -830,6 +833,7 @@ class FakeShutdownAppComponent {
@Component({
selector: 'app-version',
template: '<div></div>',
standalone: false,
})
class FakeVersionComponent {
@Input() consentShown!: boolean;
Expand All @@ -839,6 +843,7 @@ class FakeVersionComponent {
@Component({
selector: 'app-testing-complete',
template: '<div></div>',
standalone: false,
})
class FakeTestingCompleteComponent {
@Input() profiles: Profile[] = [];
Expand Down
1 change: 1 addition & 0 deletions modules/ui/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const QUALIFICATION_URL = '/assets/icons/qualification.svg';
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'],
providers: [AppStore],
standalone: false,
})
export class AppComponent implements AfterViewInit {
public readonly CalloutType = CalloutType;
Expand Down
1 change: 1 addition & 0 deletions modules/ui/src/app/components/bypass/bypass.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import SpyObj = jasmine.SpyObj;
template:
'<app-bypass></app-bypass>' +
'<div id="main"><button id="test-button"></button></div>',
standalone: false,
})
class TestBypassComponent {}

Expand Down
26 changes: 13 additions & 13 deletions modules/ui/src/app/components/callout/callout.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
@use '@angular/material' as mat;
@use 'm3-theme' as *;
@import 'colors';
@import 'variables';
@use 'colors';
@use 'variables';

:host {
width: 100%;
Expand Down Expand Up @@ -64,38 +64,38 @@
}

.callout-container.warning_amber {
background-color: $yellow-50;
background-color: colors.$yellow-50;

.callout-icon {
color: $orange-700;
color: colors.$orange-700;
}
}

.callout-container.error {
margin: 24px 32px;
background-color: $red-50;
background-color: colors.$red-50;

.callout-icon {
color: $red-700;
color: colors.$red-700;
}
}

.callout-container.check_circle {
margin: 24px 32px;
background-color: $green-50;
background-color: colors.$green-50;

.callout-icon {
color: $green-800;
color: colors.$green-800;
}
}

.callout-container.error_outline {
display: flex;
align-items: flex-start;
background: $color-background-grey;
background: colors.$color-background-grey;

.callout-icon {
color: $grey-700;
color: colors.$grey-700;
}

.callout-context {
Expand All @@ -106,8 +106,8 @@
.callout-context {
margin: 0;
padding: 6px 0;
color: $grey-800;
font-family: $font-secondary;
color: colors.$grey-800;
font-family: variables.$font-secondary;
font-size: 14px;
line-height: 20px;
letter-spacing: 0.2px;
Expand All @@ -116,5 +116,5 @@
.callout-close-button {
margin-left: auto;
margin-right: -20px;
color: $warn;
color: colors.$warn;
}
Loading