Skip to content

Commit 989afea

Browse files
committed
Handle emails case-insensitively, and use direct attributes for static string values
1 parent b807ed0 commit 989afea

File tree

16 files changed

+75
-74
lines changed

16 files changed

+75
-74
lines changed

src/@seed/components/alert/alert.component.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717
<div class="seed-alert-default-icon">
1818
@switch (type) {
1919
@case ('primary') {
20-
<mat-icon [svgIcon]="'heroicons-solid:check-circle'"></mat-icon>
20+
<mat-icon svgIcon="heroicons-solid:check-circle"></mat-icon>
2121
}
2222
@case ('accent') {
23-
<mat-icon [svgIcon]="'heroicons-solid:check-circle'"></mat-icon>
23+
<mat-icon svgIcon="heroicons-solid:check-circle"></mat-icon>
2424
}
2525
@case ('warn') {
26-
<mat-icon [svgIcon]="'heroicons-solid:x-circle'"></mat-icon>
26+
<mat-icon svgIcon="heroicons-solid:x-circle"></mat-icon>
2727
}
2828
@case ('basic') {
29-
<mat-icon [svgIcon]="'heroicons-solid:check-circle'"></mat-icon>
29+
<mat-icon svgIcon="heroicons-solid:check-circle"></mat-icon>
3030
}
3131
@case ('info') {
32-
<mat-icon [svgIcon]="'heroicons-solid:information-circle'"></mat-icon>
32+
<mat-icon svgIcon="heroicons-solid:information-circle"></mat-icon>
3333
}
3434
@case ('success') {
35-
<mat-icon [svgIcon]="'heroicons-solid:check-circle'"></mat-icon>
35+
<mat-icon svgIcon="heroicons-solid:check-circle"></mat-icon>
3636
}
3737
@case ('warning') {
38-
<mat-icon [svgIcon]="'heroicons-solid:exclamation-triangle'"></mat-icon>
38+
<mat-icon svgIcon="heroicons-solid:exclamation-triangle"></mat-icon>
3939
}
4040
@case ('error') {
41-
<mat-icon [svgIcon]="'heroicons-solid:x-circle'"></mat-icon>
41+
<mat-icon svgIcon="heroicons-solid:x-circle"></mat-icon>
4242
}
4343
}
4444
</div>
@@ -58,7 +58,7 @@
5858

5959
<!-- Dismiss button -->
6060
<button class="seed-alert-dismiss-button" mat-icon-button (click)="dismiss()">
61-
<mat-icon [svgIcon]="'heroicons-solid:x-mark'"></mat-icon>
61+
<mat-icon svgIcon="heroicons-solid:x-mark"></mat-icon>
6262
</button>
6363
</div>
6464
}

src/@seed/components/navigation/vertical/components/basic/basic.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
[preserveFragment]="item.preserveFragment ?? false"
3232
[queryParams]="item.queryParams ?? null"
3333
[queryParamsHandling]="item.queryParamsHandling ?? null"
34-
[routerLinkActive]="'seed-vertical-navigation-item-active'"
34+
routerLinkActive="seed-vertical-navigation-item-active"
3535
[routerLinkActiveOptions]="isActiveMatchOptions"
3636
[matTooltip]="item.tooltip || ''"
3737
>
@@ -87,7 +87,7 @@
8787
[preserveFragment]="item.preserveFragment ?? false"
8888
[queryParams]="item.queryParams ?? null"
8989
[queryParamsHandling]="item.queryParamsHandling ?? null"
90-
[routerLinkActive]="'seed-vertical-navigation-item-active'"
90+
routerLinkActive="seed-vertical-navigation-item-active"
9191
[routerLinkActiveOptions]="isActiveMatchOptions"
9292
[matTooltip]="item.tooltip || ''"
9393
(click)="item.fn(item)"

src/@seed/components/navigation/vertical/components/collapsable/collapsable.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
}
4141

4242
<!-- Arrow -->
43-
<mat-icon class="seed-vertical-navigation-item-arrow icon-size-4" [svgIcon]="'heroicons-solid:chevron-right'"></mat-icon>
43+
<mat-icon class="seed-vertical-navigation-item-arrow icon-size-4" svgIcon="heroicons-solid:chevron-right"></mat-icon>
4444
</div>
4545
</div>
4646

src/@seed/services/confirmation/dialog/dialog.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@if (data.dismissible) {
44
<div class="absolute right-0 top-0 pr-4 pt-4">
55
<button mat-icon-button [matDialogClose]="undefined">
6-
<mat-icon class="text-secondary" [svgIcon]="'heroicons-outline:x-mark'"></mat-icon>
6+
<mat-icon class="text-secondary" svgIcon="heroicons-outline:x-mark"></mat-icon>
77
</button>
88
</div>
99
}
@@ -49,14 +49,14 @@
4949
<div class="flex items-center justify-center space-x-3 bg-gray-50 px-6 py-4 sm:justify-end dark:bg-black dark:bg-opacity-10">
5050
<!-- Cancel -->
5151
@if (data.actions.cancel.show) {
52-
<button mat-stroked-button [matDialogClose]="'cancelled'">
52+
<button mat-stroked-button matDialogClose="canceled">
5353
{{ data.actions.cancel.label }}
5454
</button>
5555
}
5656

5757
<!-- Confirm -->
5858
@if (data.actions.confirm.show) {
59-
<button mat-flat-button [color]="data.actions.confirm.color" [matDialogClose]="'confirmed'">
59+
<button mat-flat-button [color]="data.actions.confirm.color" matDialogClose="confirmed">
6060
{{ data.actions.confirm.label }}
6161
</button>
6262
}

src/app/core/auth/auth.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class AuthService {
4141
return this._httpClient.post('api/auth/reset-password', password)
4242
}
4343

44-
signIn(credentials: { email: string; password: string }): Observable<TokenResponse> {
44+
signIn(credentials: { username: string; password: string }): Observable<TokenResponse> {
4545
// Throw error if the user is already logged in
4646
if (this._authenticated) {
4747
return throwError(() => new Error('User is already logged in.'))

src/app/layout/common/dev-settings/dev-settings.component.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
style="top: 275px"
55
(click)="settingsDrawer.toggle()"
66
>
7-
<mat-icon class="animate-spin-slow text-white icon-size-5" [svgIcon]="'heroicons-solid:cog-8-tooth'"></mat-icon>
7+
<mat-icon class="animate-spin-slow text-white icon-size-5" svgIcon="heroicons-solid:cog-8-tooth"></mat-icon>
88
</div>
99

1010
<seed-drawer
1111
class="z-999 w-screen min-w-screen sm:w-100 sm:min-w-100"
1212
fixed
13-
[mode]="'over'"
14-
[name]="'settingsDrawer'"
15-
[position]="'right'"
13+
mode="over"
14+
name="settingsDrawer"
15+
position="right"
1616
#settingsDrawer
1717
>
1818
<div class="bg-card flex w-full flex-col overflow-auto">
1919
<div class="flex h-20 min-h-20 flex-row items-center bg-primary px-6 text-white">
20-
<mat-icon class="text-current icon-size-7" [svgIcon]="'heroicons-solid:cog-8-tooth'"></mat-icon>
20+
<mat-icon class="text-current icon-size-7" svgIcon="heroicons-solid:cog-8-tooth"></mat-icon>
2121
<div class="ml-3 text-2xl font-semibold tracking-tight">Dev Settings</div>
2222
<button class="ml-auto" mat-icon-button (click)="settingsDrawer.close()">
23-
<mat-icon class="text-current" [svgIcon]="'heroicons-outline:x-mark'"></mat-icon>
23+
<mat-icon class="text-current" svgIcon="heroicons-outline:x-mark"></mat-icon>
2424
</button>
2525
</div>
2626

@@ -36,7 +36,7 @@
3636
(click)="setActiveLang('en_US')"
3737
>
3838
<div class="flex items-center overflow-hidden rounded-md">
39-
<mat-icon class="icon-size-7" [svgIcon]="'flag:us'"></mat-icon>
39+
<mat-icon class="icon-size-7" svgIcon="flag:us"></mat-icon>
4040
</div>
4141
</div>
4242

@@ -48,7 +48,7 @@
4848
(click)="setActiveLang('fr_CA')"
4949
>
5050
<div class="flex items-center overflow-hidden rounded-md">
51-
<mat-icon class="icon-size-7" [svgIcon]="'flag:ca'"></mat-icon>
51+
<mat-icon class="icon-size-7" svgIcon="flag:ca"></mat-icon>
5252
</div>
5353
</div>
5454

@@ -60,7 +60,7 @@
6060
(click)="setActiveLang('es')"
6161
>
6262
<div class="flex items-center overflow-hidden rounded-md">
63-
<mat-icon class="icon-size-7" [svgIcon]="'flag:mx'"></mat-icon>
63+
<mat-icon class="icon-size-7" svgIcon="flag:mx"></mat-icon>
6464
</div>
6565
</div>
6666
</div>
@@ -80,7 +80,7 @@
8080
(click)="setScheme('auto')"
8181
>
8282
<div class="flex items-center overflow-hidden rounded-full">
83-
<mat-icon class="icon-size-5" [svgIcon]="'heroicons-solid:bolt'"></mat-icon>
83+
<mat-icon class="icon-size-5" svgIcon="heroicons-solid:bolt"></mat-icon>
8484
</div>
8585
<div class="ml-2 flex items-center font-medium leading-5" [class.text-secondary]="config.scheme !== 'auto'">Auto</div>
8686
</div>
@@ -91,7 +91,7 @@
9191
(click)="setScheme('dark')"
9292
>
9393
<div class="flex items-center overflow-hidden rounded-full">
94-
<mat-icon class="icon-size-5" [svgIcon]="'heroicons-solid:moon'"></mat-icon>
94+
<mat-icon class="icon-size-5" svgIcon="heroicons-solid:moon"></mat-icon>
9595
</div>
9696
<div class="ml-2 flex items-center font-medium leading-5" [class.text-secondary]="config.scheme !== 'dark'">Dark</div>
9797
</div>
@@ -102,7 +102,7 @@
102102
(click)="setScheme('light')"
103103
>
104104
<div class="flex items-center overflow-hidden rounded-full">
105-
<mat-icon class="icon-size-5" [svgIcon]="'heroicons-solid:sun'"></mat-icon>
105+
<mat-icon class="icon-size-5" svgIcon="heroicons-solid:sun"></mat-icon>
106106
</div>
107107
<div class="ml-2 flex items-center font-medium leading-5" [class.text-secondary]="config.scheme !== 'light'">Light</div>
108108
</div>

src/app/layout/common/languages/languages.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</button>
55

66
<!-- Language menu -->
7-
<mat-menu [xPosition]="'before'" #languages="matMenu">
7+
<mat-menu xPosition="before" #languages="matMenu">
88
@for (lang of availableLangs; track lang.id || $index) {
99
<button mat-menu-item (click)="setActiveLang(lang.id)">
1010
<span class="flex items-center">

src/app/layout/common/user/user.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
@if (showAvatar && avatarUrl) {
44
<img class="h-7 w-7 rounded-full" [src]="avatarUrl" alt="User avatar" />
55
} @else {
6-
<mat-icon [svgIcon]="'fa-regular:circle-user'"></mat-icon>
6+
<mat-icon svgIcon="fa-regular:circle-user"></mat-icon>
77
}
88
</span>
99
</button>
1010

11-
<mat-menu [xPosition]="'before'" #userActions="matMenu">
11+
<mat-menu xPosition="before" #userActions="matMenu">
1212
<div class="flex h-12 cursor-default items-center px-4">
1313
<span class="flex flex-col leading-none">
1414
<span>Signed in as</span>
@@ -17,16 +17,16 @@
1717
</div>
1818
<mat-divider class="my-2"></mat-divider>
1919
<button mat-menu-item>
20-
<mat-icon [svgIcon]="'fa-solid:circle-user'"></mat-icon>
20+
<mat-icon svgIcon="fa-solid:circle-user"></mat-icon>
2121
<span>Profile</span>
2222
</button>
2323
<button mat-menu-item>
24-
<mat-icon [svgIcon]="'fa-solid:gear'"></mat-icon>
24+
<mat-icon svgIcon="fa-solid:gear"></mat-icon>
2525
<span>Settings</span>
2626
</button>
2727
<mat-divider class="my-2"></mat-divider>
2828
<button mat-menu-item (click)="signOut()">
29-
<mat-icon [svgIcon]="'fa-solid:right-from-bracket'"></mat-icon>
29+
<mat-icon svgIcon="fa-solid:right-from-bracket"></mat-icon>
3030
<span>Sign out</span>
3131
</button>
3232
</mat-menu>

src/app/layout/layouts/main/main.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
class="dark bg-gray-900 print:hidden"
55
[appearance]="navigationAppearance"
66
[mode]="isScreenSmall ? 'over' : 'side'"
7-
[name]="'mainNavigation'"
7+
name="mainNavigation"
88
[navigation]="navigation.default"
99
[opened]="!isScreenSmall"
1010
>
@@ -21,7 +21,7 @@
2121
<ng-container verticalNavigationFooter>
2222
<div class="hidden p-5 md:flex">
2323
<button mat-icon-button (click)="toggleNavigationAppearance()">
24-
<mat-icon [svgIcon]="'heroicons-outline:arrows-right-left'"></mat-icon>
24+
<mat-icon svgIcon="heroicons-outline:arrows-right-left"></mat-icon>
2525
</button>
2626
</div>
2727
</ng-container>
@@ -36,7 +36,7 @@
3636
<div class="flex items-center space-x-2 pr-2">
3737
<!-- Navigation toggle button -->
3838
<button class="inline-flex md:hidden" mat-icon-button (click)="toggleNavigation('mainNavigation')">
39-
<mat-icon [svgIcon]="'heroicons-outline:bars-3'"></mat-icon>
39+
<mat-icon svgIcon="heroicons-outline:bars-3"></mat-icon>
4040
</button>
4141

4242
<div class="hidden text-3xl font-bold uppercase leading-none tracking-tighter md:inline-flex">

src/app/mock-api/common/user/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import type { User } from '../../../core/user/user.types'
33
export const user: User = {
44
id: 1,
55
name: 'Alex Swindler',
6-
email: 'alex.swindler@nrel.gov',
6+
email: 'Alex.Swindler@nrel.gov',
77
username: 'alex.swindler@nrel.gov',
88
}

0 commit comments

Comments
 (0)