@tech4good/angular-schematics 21.5.0 → 21.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/package.json +1 -1
- package/src/entity/files/__name@dasherize__/__name@dasherize__.mock.ts.template +2 -1
- package/src/entity/files/__name@dasherize__/__name@dasherize__.model.ts.template +2 -1
- package/src/entity/index.js +57 -0
- package/src/entity/index.js.map +1 -1
- package/src/entity/schema.json +4 -0
- package/src/ng-add/files/.gitignore.template +2 -0
- package/src/ng-add/files/docs-infra/authentication-architecture.md.template +270 -0
- package/src/ng-add/files/docs-infra/infrastructure-guide.md.template +16 -10
- package/src/ng-add/files/firebase.json.template +6 -0
- package/src/ng-add/files/firestore.indexes.json.template +23 -0
- package/src/ng-add/files/firestore.rules.spec.ts.template +84 -15
- package/src/ng-add/files/firestore.rules.template +29 -17
- package/src/ng-add/files/functions/.gitignore.template +3 -0
- package/src/ng-add/files/functions/package.json.template +12 -0
- package/src/ng-add/files/functions/src/index.ts.template +44 -0
- package/src/ng-add/files/functions/tsconfig.json.template +13 -0
- package/src/ng-add/files/package.json.template +5 -3
- package/src/ng-add/files/src/app/admin/admin-panel/admin-panel.component.html.template +3 -1
- package/src/ng-add/files/src/app/admin/admin-panel/admin-panel.component.spec.ts.template +6 -8
- package/src/ng-add/files/src/app/admin/admin-panel/admin-panel.component.ts.template +2 -0
- package/src/ng-add/files/src/app/app.component.html.template +2 -2
- package/src/ng-add/files/src/app/app.component.ts.template +2 -0
- package/src/ng-add/files/src/app/app.routes.ts.template +6 -0
- package/src/ng-add/files/src/app/auth-routing.spec.ts.template +9 -4
- package/src/ng-add/files/src/app/core/auth/auth.service.ts.template +6 -1
- package/src/ng-add/files/src/app/core/auth/guards/require-admin.guard.spec.ts.template +38 -0
- package/src/ng-add/files/src/app/core/auth/guards/require-admin.guard.ts.template +3 -2
- package/src/ng-add/files/src/app/core/auth/guards/require-auth-and-consent.guard.ts.template +7 -2
- package/src/ng-add/files/src/app/core/firebase/cached-listeners.service.ts.template +11 -5
- package/src/ng-add/files/src/app/core/firebase/database.service.ts.template +34 -17
- package/src/ng-add/files/src/app/core/firebase/email-link-context.service.spec.ts.template +59 -0
- package/src/ng-add/files/src/app/core/firebase/email-link-context.service.ts.template +147 -0
- package/src/ng-add/files/src/app/core/firebase/firebase.mock.service.ts.template +104 -17
- package/src/ng-add/files/src/app/core/firebase/firebase.service.spec.ts.template +116 -0
- package/src/ng-add/files/src/app/core/firebase/firebase.service.ts.template +367 -70
- package/src/ng-add/files/src/app/core/store/app.store.ts.template +4 -1
- package/src/ng-add/files/src/app/core/store/auth/auth.mock.ts.template +52 -66
- package/src/ng-add/files/src/app/core/store/auth/auth.store.spec.ts.template +127 -0
- package/src/ng-add/files/src/app/core/store/auth/auth.store.ts.template +216 -147
- package/src/ng-add/files/src/app/core/store/user/user.mock.ts.template +2 -4
- package/src/ng-add/files/src/app/core/store/user/user.model.ts.template +1 -1
- package/src/ng-add/files/src/app/core/store/user-private/user-private.model.ts.template +1 -0
- package/src/ng-add/files/src/app/first-time/auth-action/auth-action.component.html.template +4 -0
- package/src/ng-add/files/src/app/first-time/auth-action/auth-action.component.scss.template +1 -0
- package/src/ng-add/files/src/app/first-time/auth-action/auth-action.component.ts.template +38 -0
- package/src/ng-add/files/src/app/first-time/consent/consent.guard.ts.template +5 -1
- package/src/ng-add/files/src/app/first-time/early-access/early-access.component.spec.ts.template +12 -1
- package/src/ng-add/files/src/app/first-time/early-access/early-access.component.ts.template +93 -48
- package/src/ng-add/files/src/app/first-time/early-access/early-access.guard.ts.template +5 -1
- package/src/ng-add/files/src/app/first-time/email-link/email-link.component.html.template +18 -0
- package/src/ng-add/files/src/app/first-time/email-link/email-link.component.scss.template +2 -0
- package/src/ng-add/files/src/app/first-time/email-link/email-link.component.spec.ts.template +40 -0
- package/src/ng-add/files/src/app/first-time/email-link/email-link.component.ts.template +76 -0
- package/src/ng-add/files/src/app/first-time/first-time-routing.spec.ts.template +7 -2
- package/src/ng-add/files/src/app/first-time/landing/hero/hero.component.html.template +19 -7
- package/src/ng-add/files/src/app/first-time/landing/hero/hero.component.scss.template +51 -0
- package/src/ng-add/files/src/app/first-time/landing/hero/hero.component.ts.template +29 -5
- package/src/ng-add/files/src/app/first-time/landing/landing.component.html.template +2 -1
- package/src/ng-add/files/src/app/first-time/landing/landing.component.scss.template +12 -8
- package/src/ng-add/files/src/app/first-time/landing/landing.component.spec.ts.template +31 -10
- package/src/ng-add/files/src/app/first-time/landing/landing.component.ts.template +6 -19
- package/src/ng-add/files/src/app/first-time/login/login.component.html.template +58 -6
- package/src/ng-add/files/src/app/first-time/login/login.component.scss.template +151 -22
- package/src/ng-add/files/src/app/first-time/login/login.component.spec.ts.template +18 -38
- package/src/ng-add/files/src/app/first-time/login/login.component.ts.template +59 -31
- package/src/ng-add/files/src/app/main/account-profile/account-profile.component.html.template +12 -0
- package/src/ng-add/files/src/app/main/account-profile/account-profile.component.scss.template +39 -0
- package/src/ng-add/files/src/app/main/account-profile/account-profile.component.spec.ts.template +68 -0
- package/src/ng-add/files/src/app/main/account-profile/account-profile.component.ts.template +20 -0
- package/src/ng-add/files/src/app/main/account-profile/delete-guest-card/delete-guest-card.component.html.template +24 -0
- package/src/ng-add/files/src/app/main/account-profile/delete-guest-card/delete-guest-card.component.scss.template +50 -0
- package/src/ng-add/files/src/app/main/account-profile/delete-guest-card/delete-guest-card.component.spec.ts.template +65 -0
- package/src/ng-add/files/src/app/main/account-profile/delete-guest-card/delete-guest-card.component.ts.template +59 -0
- package/src/ng-add/files/src/app/main/account-profile/guest-deletion-dialog.component.ts.template +51 -0
- package/src/ng-add/files/src/app/main/account-profile/profile-details-card/profile-details-card.component.html.template +50 -0
- package/src/ng-add/files/src/app/main/account-profile/profile-details-card/profile-details-card.component.scss.template +137 -0
- package/src/ng-add/files/src/app/main/account-profile/profile-details-card/profile-details-card.component.spec.ts.template +57 -0
- package/src/ng-add/files/src/app/main/account-profile/profile-details-card/profile-details-card.component.ts.template +59 -0
- package/src/ng-add/files/src/app/main/account-profile/sign-in-methods-card/sign-in-methods-card.component.html.template +133 -0
- package/src/ng-add/files/src/app/main/account-profile/sign-in-methods-card/sign-in-methods-card.component.scss.template +207 -0
- package/src/ng-add/files/src/app/main/account-profile/sign-in-methods-card/sign-in-methods-card.component.spec.ts.template +74 -0
- package/src/ng-add/files/src/app/main/account-profile/sign-in-methods-card/sign-in-methods-card.component.ts.template +130 -0
- package/src/ng-add/files/src/app/main/home/home.component.ts.template +0 -5
- package/src/ng-add/files/src/app/shared/guest-warning-bar/guest-warning-bar.component.html.template +15 -0
- package/src/ng-add/files/src/app/shared/guest-warning-bar/guest-warning-bar.component.scss.template +79 -0
- package/src/ng-add/files/src/app/shared/guest-warning-bar/guest-warning-bar.component.spec.ts.template +59 -0
- package/src/ng-add/files/src/app/shared/guest-warning-bar/guest-warning-bar.component.ts.template +44 -0
- package/src/ng-add/files/src/app/shared/navbar/navbar.component.html.template +45 -15
- package/src/ng-add/files/src/app/shared/navbar/navbar.component.scss.template +103 -19
- package/src/ng-add/files/src/app/shared/navbar/navbar.component.spec.ts.template +73 -9
- package/src/ng-add/files/src/app/shared/navbar/navbar.component.ts.template +46 -18
- package/src/ng-add/files/src/environments/environment.prod.ts.template +1 -0
- package/src/ng-add/files/src/environments/environment.test.ts.template +1 -0
- package/src/ng-add/files/src/environments/environment.ts.template +1 -1
- package/src/ng-add/index_spec.d.ts +1 -0
- package/src/ng-add/index_spec.js +108 -0
- package/src/ng-add/index_spec.js.map +1 -0
- package/tsconfig.json +2 -2
package/src/ng-add/files/src/app/shared/guest-warning-bar/guest-warning-bar.component.scss.template
ADDED
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
:host {
|
|
2
|
+
display: block;
|
|
3
|
+
}
|
|
4
|
+
|
|
5
|
+
.guest-warning-bar {
|
|
6
|
+
background: linear-gradient(135deg, #fffbe6 0%, #fef3c7 100%);
|
|
7
|
+
border-bottom: 1px solid #fde68a;
|
|
8
|
+
color: #92400e;
|
|
9
|
+
padding: 8px 16px;
|
|
10
|
+
font-size: 0.875rem;
|
|
11
|
+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.04);
|
|
12
|
+
position: relative;
|
|
13
|
+
z-index: 999;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
.banner-content {
|
|
17
|
+
max-width: 1200px;
|
|
18
|
+
margin: 0 auto;
|
|
19
|
+
display: flex;
|
|
20
|
+
align-items: center;
|
|
21
|
+
justify-content: space-between;
|
|
22
|
+
gap: 16px;
|
|
23
|
+
|
|
24
|
+
@media (max-width: 640px) {
|
|
25
|
+
flex-direction: column;
|
|
26
|
+
align-items: flex-start;
|
|
27
|
+
gap: 8px;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
.message-group {
|
|
32
|
+
display: flex;
|
|
33
|
+
align-items: center;
|
|
34
|
+
gap: 8px;
|
|
35
|
+
|
|
36
|
+
.warning-icon {
|
|
37
|
+
font-size: 1.1rem;
|
|
38
|
+
flex-shrink: 0;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
.message-text {
|
|
42
|
+
line-height: 1.4;
|
|
43
|
+
|
|
44
|
+
strong {
|
|
45
|
+
color: #78350f;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
.action-group {
|
|
51
|
+
display: flex;
|
|
52
|
+
align-items: center;
|
|
53
|
+
gap: 12px;
|
|
54
|
+
flex-shrink: 0;
|
|
55
|
+
|
|
56
|
+
@media (max-width: 640px) {
|
|
57
|
+
align-self: flex-end;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
.save-link {
|
|
62
|
+
display: inline-flex;
|
|
63
|
+
align-items: center;
|
|
64
|
+
background: #78350f;
|
|
65
|
+
color: #ffffff !important;
|
|
66
|
+
font-weight: 700;
|
|
67
|
+
font-size: 0.8rem;
|
|
68
|
+
padding: 4px 12px;
|
|
69
|
+
border-radius: 12px;
|
|
70
|
+
text-decoration: none;
|
|
71
|
+
transition: all 0.2s ease;
|
|
72
|
+
box-shadow: 0 1px 4px rgba(120, 53, 15, 0.2);
|
|
73
|
+
|
|
74
|
+
&:hover {
|
|
75
|
+
background: #451a03;
|
|
76
|
+
transform: translateY(-1px);
|
|
77
|
+
box-shadow: 0 2px 6px rgba(120, 53, 15, 0.3);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { render, screen } from '@testing-library/angular';
|
|
2
|
+
import { Injectable, signal } from '@angular/core';
|
|
3
|
+
import { provideRouter } from '@angular/router';
|
|
4
|
+
import { provideFirebaseMock } from 'src/app/core/firebase/firebase.mock.service';
|
|
5
|
+
import { GuestWarningBarComponent } from './guest-warning-bar.component';
|
|
6
|
+
import { AuthStore } from 'src/app/core/store/auth/auth.store';
|
|
7
|
+
import { AuthMockDB, AuthLoggedInMockDB } from 'src/app/core/store/auth/auth.mock';
|
|
8
|
+
|
|
9
|
+
describe('GuestWarningBarComponent', () => {
|
|
10
|
+
it('should not show warning bar when user is signed out', async () => {
|
|
11
|
+
await render(GuestWarningBarComponent, {
|
|
12
|
+
providers: [
|
|
13
|
+
provideRouter([]),
|
|
14
|
+
{ provide: AuthStore, useClass: AuthMockDB },
|
|
15
|
+
...provideFirebaseMock({ disableLatency: true }),
|
|
16
|
+
],
|
|
17
|
+
});
|
|
18
|
+
expect(screen.queryByText(/Guest Account:/i)).toBeNull();
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
it('should not show warning bar when logged in as registered non-anonymous user', async () => {
|
|
22
|
+
await render(GuestWarningBarComponent, {
|
|
23
|
+
providers: [
|
|
24
|
+
provideRouter([]),
|
|
25
|
+
{ provide: AuthStore, useClass: AuthLoggedInMockDB },
|
|
26
|
+
...provideFirebaseMock({ disableLatency: true }),
|
|
27
|
+
],
|
|
28
|
+
});
|
|
29
|
+
expect(screen.queryByText(/Guest Account:/i)).toBeNull();
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it('should show persistent warning bar when logged in as an anonymous guest on an active route', async () => {
|
|
33
|
+
@Injectable()
|
|
34
|
+
class AnonymousAuthMockDB extends AuthMockDB {
|
|
35
|
+
override afUser = signal({
|
|
36
|
+
uid: 'anon-123',
|
|
37
|
+
email: null,
|
|
38
|
+
displayName: 'Guest',
|
|
39
|
+
photoURL: null,
|
|
40
|
+
isAnonymous: true,
|
|
41
|
+
emailVerified: false,
|
|
42
|
+
emailLinkEnabled: false,
|
|
43
|
+
providerIds: [],
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
await render(GuestWarningBarComponent, {
|
|
48
|
+
providers: [
|
|
49
|
+
provideRouter([]),
|
|
50
|
+
{ provide: AuthStore, useClass: AnonymousAuthMockDB },
|
|
51
|
+
...provideFirebaseMock({ disableLatency: true }),
|
|
52
|
+
],
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
// Warning text & Save Progress link should be visible
|
|
56
|
+
expect(screen.getByText(/Guest Account:/i)).toBeVisible();
|
|
57
|
+
expect(screen.getByRole('link', { name: /Save Progress/i })).toBeVisible();
|
|
58
|
+
});
|
|
59
|
+
});
|
package/src/ng-add/files/src/app/shared/guest-warning-bar/guest-warning-bar.component.ts.template
ADDED
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { Component, inject, computed, ChangeDetectionStrategy } from '@angular/core';
|
|
2
|
+
import { Router, NavigationEnd, RouterLink } from '@angular/router';
|
|
3
|
+
import { toSignal } from '@angular/core/rxjs-interop';
|
|
4
|
+
import { filter, map } from 'rxjs/operators';
|
|
5
|
+
import { AuthStore } from '../../core/store/auth/auth.store';
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Top warning banner displayed when a user is signed in with an anonymous guest account.
|
|
9
|
+
* Reminds users that guest progress is only saved locally on their current device and
|
|
10
|
+
* prompts them to link Google or an Email address to save progress permanently.
|
|
11
|
+
*/
|
|
12
|
+
@Component({
|
|
13
|
+
selector: 'app-guest-warning-bar',
|
|
14
|
+
standalone: true,
|
|
15
|
+
imports: [RouterLink],
|
|
16
|
+
templateUrl: './guest-warning-bar.component.html',
|
|
17
|
+
styleUrl: './guest-warning-bar.component.scss',
|
|
18
|
+
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
19
|
+
})
|
|
20
|
+
export class GuestWarningBarComponent {
|
|
21
|
+
private readonly authStore = inject(AuthStore);
|
|
22
|
+
private readonly router = inject(Router, { optional: true });
|
|
23
|
+
|
|
24
|
+
/** Current route URL signal. */
|
|
25
|
+
private readonly currentUrl = toSignal(
|
|
26
|
+
this.router?.events ?
|
|
27
|
+
this.router.events.pipe(
|
|
28
|
+
filter((event): event is NavigationEnd => event instanceof NavigationEnd),
|
|
29
|
+
map((event) => event.urlAfterRedirects || event.url),
|
|
30
|
+
) :
|
|
31
|
+
undefined,
|
|
32
|
+
{ initialValue: this.router?.url || '' },
|
|
33
|
+
);
|
|
34
|
+
|
|
35
|
+
/** Whether the banner should be visible. */
|
|
36
|
+
readonly showWarning = computed(() => {
|
|
37
|
+
const afUser = this.authStore.afUser?.();
|
|
38
|
+
if (!afUser?.isAnonymous) return false;
|
|
39
|
+
const url = this.currentUrl() || '';
|
|
40
|
+
const excludedRoutes = ['/landing', '/early-access', '/consent'];
|
|
41
|
+
if (excludedRoutes.some((route) => url.startsWith(route))) return false;
|
|
42
|
+
return true;
|
|
43
|
+
});
|
|
44
|
+
}
|
|
@@ -1,15 +1,45 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
1
|
+
<nav class="navbar-container">
|
|
2
|
+
<a routerLink="/" class="brand-section">
|
|
3
|
+
<div class="brand-mark" aria-hidden="true">
|
|
4
|
+
<svg class="brand-logo-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
|
5
|
+
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
|
|
6
|
+
</svg>
|
|
7
|
+
</div>
|
|
8
|
+
<span class="brand-title"><%= classify(project) %></span>
|
|
9
|
+
</a>
|
|
10
|
+
|
|
11
|
+
<div class="navbar-right">
|
|
12
|
+
@if (currentUser(); as user) {
|
|
13
|
+
<div class="user-setting-section">
|
|
14
|
+
@if (userPhotoUrl(); as photoUrl) {
|
|
15
|
+
<img
|
|
16
|
+
class="profile-pic"
|
|
17
|
+
[src]="photoUrl"
|
|
18
|
+
referrerpolicy="no-referrer"
|
|
19
|
+
alt="Profile Picture"
|
|
20
|
+
(error)="onPhotoError()"
|
|
21
|
+
[matMenuTriggerFor]="menu"
|
|
22
|
+
#menuTrigger
|
|
23
|
+
/>
|
|
24
|
+
} @else {
|
|
25
|
+
<div
|
|
26
|
+
class="profile-initial-avatar"
|
|
27
|
+
[matMenuTriggerFor]="menu"
|
|
28
|
+
#menuTrigger
|
|
29
|
+
role="button"
|
|
30
|
+
tabindex="0"
|
|
31
|
+
aria-label="User Profile Menu"
|
|
32
|
+
>
|
|
33
|
+
<span>{{ (user.name || 'G').charAt(0).toUpperCase() }}</span>
|
|
34
|
+
</div>
|
|
35
|
+
}
|
|
36
|
+
<mat-menu #menu="matMenu">
|
|
37
|
+
<a class="menu-item" routerLink="/account" mat-menu-item>Profile & Settings</a>
|
|
38
|
+
<button class="menu-item" (click)="logout()" mat-menu-item type="button">Logout</button>
|
|
39
|
+
</mat-menu>
|
|
40
|
+
</div>
|
|
41
|
+
} @else {
|
|
42
|
+
<a routerLink="/login" class="login-link">Log in</a>
|
|
43
|
+
}
|
|
44
|
+
</div>
|
|
45
|
+
</nav>
|
|
@@ -1,41 +1,125 @@
|
|
|
1
|
+
:host {
|
|
2
|
+
display: block;
|
|
3
|
+
width: 100%;
|
|
4
|
+
position: sticky;
|
|
5
|
+
top: 0;
|
|
6
|
+
z-index: 100;
|
|
7
|
+
}
|
|
8
|
+
|
|
1
9
|
.navbar-container {
|
|
2
10
|
height: 70px;
|
|
3
11
|
width: 100%;
|
|
4
|
-
background:
|
|
5
|
-
|
|
12
|
+
background: rgba(255, 255, 255, 0.85);
|
|
13
|
+
backdrop-filter: blur(12px);
|
|
14
|
+
border-bottom: 1px solid rgba(255, 255, 255, 0.5);
|
|
15
|
+
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.03);
|
|
6
16
|
display: flex;
|
|
7
17
|
flex-direction: row;
|
|
8
18
|
align-items: center;
|
|
9
|
-
|
|
19
|
+
justify-content: space-between;
|
|
20
|
+
padding: 8px max(20px, calc(50vw - 460px));
|
|
21
|
+
box-sizing: border-box;
|
|
22
|
+
|
|
23
|
+
.brand-section {
|
|
24
|
+
display: flex;
|
|
25
|
+
align-items: center;
|
|
26
|
+
gap: 10px;
|
|
27
|
+
text-decoration: none;
|
|
28
|
+
|
|
29
|
+
.brand-mark {
|
|
30
|
+
display: flex;
|
|
31
|
+
align-items: center;
|
|
32
|
+
justify-content: center;
|
|
33
|
+
color: #0e7490;
|
|
34
|
+
flex-shrink: 0;
|
|
35
|
+
|
|
36
|
+
.brand-logo-icon {
|
|
37
|
+
width: 28px;
|
|
38
|
+
height: 28px;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
.brand-title {
|
|
43
|
+
font-size: 1.35rem;
|
|
44
|
+
font-weight: 800;
|
|
45
|
+
color: #1e1b4b;
|
|
46
|
+
letter-spacing: -0.02em;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
&:hover {
|
|
50
|
+
opacity: 0.9;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
.navbar-right {
|
|
55
|
+
display: flex;
|
|
56
|
+
align-items: center;
|
|
57
|
+
gap: 20px;
|
|
10
58
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
59
|
+
.login-link {
|
|
60
|
+
color: #0e7490;
|
|
61
|
+
font-weight: 600;
|
|
62
|
+
font-size: 0.95rem;
|
|
63
|
+
text-decoration: none;
|
|
64
|
+
padding: 8px 16px;
|
|
65
|
+
border-radius: 6px;
|
|
66
|
+
transition: background-color 0.2s, color 0.2s;
|
|
67
|
+
|
|
68
|
+
&:hover {
|
|
69
|
+
background-color: rgba(14, 116, 144, 0.08);
|
|
70
|
+
color: #155e75;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
16
73
|
}
|
|
17
74
|
|
|
18
75
|
.user-setting-section {
|
|
19
|
-
margin-left: auto;
|
|
20
76
|
display: flex;
|
|
21
77
|
align-items: center;
|
|
22
|
-
|
|
23
|
-
.profile-pic{
|
|
24
|
-
height:
|
|
25
|
-
width:
|
|
78
|
+
|
|
79
|
+
.profile-pic {
|
|
80
|
+
height: 42px;
|
|
81
|
+
width: 42px;
|
|
26
82
|
border-radius: 50%;
|
|
27
83
|
cursor: pointer;
|
|
84
|
+
border: 2px solid #ffffff;
|
|
85
|
+
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
|
|
86
|
+
object-fit: cover;
|
|
87
|
+
transition: transform 0.2s ease;
|
|
88
|
+
|
|
89
|
+
&:hover {
|
|
90
|
+
transform: scale(1.05);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
.profile-initial-avatar {
|
|
95
|
+
height: 42px;
|
|
96
|
+
width: 42px;
|
|
97
|
+
border-radius: 50%;
|
|
98
|
+
background: linear-gradient(135deg, #0e7490 0%, #155e75 100%);
|
|
99
|
+
color: #ffffff;
|
|
100
|
+
font-size: 1.15rem;
|
|
101
|
+
font-weight: 700;
|
|
102
|
+
display: flex;
|
|
103
|
+
align-items: center;
|
|
104
|
+
justify-content: center;
|
|
105
|
+
cursor: pointer;
|
|
106
|
+
border: 2px solid #ffffff;
|
|
107
|
+
box-shadow: 0 2px 8px rgba(14, 116, 144, 0.25);
|
|
108
|
+
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
|
109
|
+
user-select: none;
|
|
110
|
+
|
|
111
|
+
&:hover {
|
|
112
|
+
transform: scale(1.05);
|
|
113
|
+
box-shadow: 0 4px 12px rgba(14, 116, 144, 0.35);
|
|
114
|
+
}
|
|
28
115
|
}
|
|
29
116
|
}
|
|
30
117
|
}
|
|
31
118
|
|
|
32
|
-
|
|
33
|
-
.logout {
|
|
119
|
+
.logout, .menu-item {
|
|
34
120
|
display: flex;
|
|
35
121
|
align-items: center;
|
|
36
|
-
font-size:
|
|
37
|
-
font-weight:
|
|
122
|
+
font-size: 15px;
|
|
123
|
+
font-weight: 500;
|
|
38
124
|
cursor: pointer;
|
|
39
|
-
padding: 10px;
|
|
40
125
|
}
|
|
41
|
-
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { render, screen } from '@testing-library/angular';
|
|
2
2
|
import userEvent from '@testing-library/user-event';
|
|
3
|
-
import { Provider } from '@angular/core';
|
|
3
|
+
import { Injectable, Provider, signal } from '@angular/core';
|
|
4
|
+
import { provideRouter } from '@angular/router';
|
|
5
|
+
import { provideFirebaseMock } from 'src/app/core/firebase/firebase.mock.service';
|
|
4
6
|
|
|
5
7
|
import { NavbarComponent } from './navbar.component';
|
|
6
8
|
import { AuthStore } from 'src/app/core/store/auth/auth.store';
|
|
@@ -13,7 +15,9 @@ async function setup(providers: Provider[] = []) {
|
|
|
13
15
|
|
|
14
16
|
const view = await render(NavbarComponent, {
|
|
15
17
|
providers: [
|
|
18
|
+
provideRouter([]),
|
|
16
19
|
{ provide: AuthStore, useClass: AuthMockDB },
|
|
20
|
+
...provideFirebaseMock({ disableLatency: true }),
|
|
17
21
|
...providers,
|
|
18
22
|
],
|
|
19
23
|
});
|
|
@@ -26,19 +30,36 @@ async function setup(providers: Provider[] = []) {
|
|
|
26
30
|
}
|
|
27
31
|
|
|
28
32
|
describe('NavbarComponent', () => {
|
|
33
|
+
it('should show the application brand', async () => {
|
|
34
|
+
await setup();
|
|
35
|
+
expect(screen.getByText('<%= classify(project) %>')).toBeVisible();
|
|
36
|
+
});
|
|
37
|
+
|
|
29
38
|
it('should not show profile picture when logged out', async () => {
|
|
30
39
|
await setup();
|
|
31
|
-
expect(screen.
|
|
40
|
+
expect(screen.queryByAltText('Profile Picture')).toBeNull();
|
|
32
41
|
});
|
|
33
42
|
|
|
34
|
-
it('should show profile picture when logged in, and clicking it opens menu
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
43
|
+
it('should show profile picture when logged in with a photo URL, and clicking it opens menu', async () => {
|
|
44
|
+
@Injectable()
|
|
45
|
+
class AuthWithPhotoMockDB extends AuthLoggedInMockDB {
|
|
46
|
+
override user = signal({ ...USER_DB[0], photoURL: 'https://example.com/avatar.jpg' });
|
|
47
|
+
override afUser = signal({
|
|
48
|
+
uid: USER_DB[0].__id,
|
|
49
|
+
email: 'user@example.com',
|
|
50
|
+
displayName: 'User A',
|
|
51
|
+
photoURL: 'https://example.com/avatar.jpg',
|
|
52
|
+
isAnonymous: false,
|
|
53
|
+
emailVerified: true,
|
|
54
|
+
emailLinkEnabled: false,
|
|
55
|
+
providerIds: ['google.com'],
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
const { user, authStore } = await setup([{ provide: AuthStore, useClass: AuthWithPhotoMockDB }]);
|
|
38
59
|
|
|
39
|
-
const profilePic = screen.
|
|
60
|
+
const profilePic = screen.getByAltText('Profile Picture');
|
|
40
61
|
expect(profilePic).toBeVisible();
|
|
41
|
-
expect(profilePic).toHaveAttribute('src',
|
|
62
|
+
expect(profilePic).toHaveAttribute('src', 'https://example.com/avatar.jpg');
|
|
42
63
|
|
|
43
64
|
// Menu should not be in the document initially
|
|
44
65
|
expect(screen.queryByText(/Logout/i)).toBeNull();
|
|
@@ -46,7 +67,8 @@ describe('NavbarComponent', () => {
|
|
|
46
67
|
// Click profile pic to open menu
|
|
47
68
|
await user.click(profilePic);
|
|
48
69
|
|
|
49
|
-
// Logout should be visible now
|
|
70
|
+
// Profile & Settings link & Logout button should be visible now
|
|
71
|
+
expect(screen.getByText(/Profile & Settings/i)).toBeVisible();
|
|
50
72
|
const logoutBtn = screen.getByText(/Logout/i);
|
|
51
73
|
expect(logoutBtn).toBeVisible();
|
|
52
74
|
|
|
@@ -55,4 +77,46 @@ describe('NavbarComponent', () => {
|
|
|
55
77
|
expect(logoutSpy).toHaveBeenCalled();
|
|
56
78
|
logoutSpy.mockRestore();
|
|
57
79
|
});
|
|
80
|
+
|
|
81
|
+
it('renders initial letter avatar fallback when user has no photoURL', async () => {
|
|
82
|
+
@Injectable()
|
|
83
|
+
class AuthLoggedInNoPhotoMockDB extends AuthLoggedInMockDB {
|
|
84
|
+
override user = signal({ ...USER_DB[0], photoURL: null as string | null });
|
|
85
|
+
}
|
|
86
|
+
const { user } = await setup([{ provide: AuthStore, useClass: AuthLoggedInNoPhotoMockDB }]);
|
|
87
|
+
|
|
88
|
+
expect(screen.queryByAltText('Profile Picture')).toBeNull();
|
|
89
|
+
const avatarFallback = screen.getByRole('button', { name: /User Profile Menu/i });
|
|
90
|
+
expect(avatarFallback).toBeVisible();
|
|
91
|
+
expect(avatarFallback).toHaveTextContent(USER_DB[0].name.charAt(0).toUpperCase());
|
|
92
|
+
|
|
93
|
+
await user.click(avatarFallback);
|
|
94
|
+
expect(screen.getByText(/Profile & Settings/i)).toBeVisible();
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
it('falls back to initial letter avatar if photoURL triggers an error event', async () => {
|
|
98
|
+
@Injectable()
|
|
99
|
+
class AuthWithPhotoMockDB extends AuthLoggedInMockDB {
|
|
100
|
+
override user = signal({ ...USER_DB[0], photoURL: 'https://example.com/broken.jpg' });
|
|
101
|
+
override afUser = signal({
|
|
102
|
+
uid: USER_DB[0].__id,
|
|
103
|
+
email: 'user@example.com',
|
|
104
|
+
displayName: 'User A',
|
|
105
|
+
photoURL: 'https://example.com/broken.jpg',
|
|
106
|
+
isAnonymous: false,
|
|
107
|
+
emailVerified: true,
|
|
108
|
+
emailLinkEnabled: false,
|
|
109
|
+
providerIds: ['google.com'],
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
const { fixture } = await setup([{ provide: AuthStore, useClass: AuthWithPhotoMockDB }]);
|
|
113
|
+
|
|
114
|
+
const profilePic = screen.getByAltText('Profile Picture');
|
|
115
|
+
profilePic.dispatchEvent(new Event('error'));
|
|
116
|
+
fixture.detectChanges();
|
|
117
|
+
|
|
118
|
+
expect(screen.queryByAltText('Profile Picture')).toBeNull();
|
|
119
|
+
const avatarFallback = screen.getByRole('button', { name: /User Profile Menu/i });
|
|
120
|
+
expect(avatarFallback).toBeVisible();
|
|
121
|
+
});
|
|
58
122
|
});
|
|
@@ -1,39 +1,67 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Component, ChangeDetectionStrategy, computed, inject, signal } from '@angular/core';
|
|
2
|
+
import { AccessState } from 'src/app/core/store/user/user.model';
|
|
3
3
|
import { AuthStore } from 'src/app/core/store/auth/auth.store';
|
|
4
|
-
import { MatMenuTrigger, MatMenu } from '@angular/material/menu';
|
|
4
|
+
import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu';
|
|
5
|
+
import { RouterLink } from '@angular/router';
|
|
5
6
|
|
|
7
|
+
function isValidPhotoUrl(url: string | null | undefined): boolean {
|
|
8
|
+
if (!url || typeof url !== 'string') return false;
|
|
9
|
+
const trimmed = url.trim();
|
|
10
|
+
if (trimmed === '' || trimmed === 'null' || trimmed === 'undefined') return false;
|
|
11
|
+
if (trimmed.includes('loremflickr.com')) return false;
|
|
12
|
+
return trimmed.startsWith('http://') || trimmed.startsWith('https://') || trimmed.startsWith('/');
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Shared top navigation bar component across the application.
|
|
17
|
+
* Displays the application brand and provides a user account profile menu with logout.
|
|
18
|
+
*/
|
|
6
19
|
@Component({
|
|
7
20
|
selector: 'app-navbar',
|
|
8
21
|
templateUrl: './navbar.component.html',
|
|
9
22
|
styleUrl: './navbar.component.scss',
|
|
10
23
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
11
|
-
imports: [MatMenuTrigger, MatMenu],
|
|
24
|
+
imports: [MatMenuTrigger, MatMenu, MatMenuItem, RouterLink],
|
|
12
25
|
})
|
|
13
|
-
export class NavbarComponent
|
|
26
|
+
export class NavbarComponent {
|
|
14
27
|
readonly authStore = inject(AuthStore);
|
|
15
28
|
|
|
16
29
|
// --------------- INPUTS AND OUTPUTS ------------------
|
|
17
30
|
|
|
18
|
-
/**
|
|
19
|
-
|
|
31
|
+
/** Track image load errors to fallback to initial letter avatar if photoURL fails to load. */
|
|
32
|
+
readonly hasPhotoError = signal(false);
|
|
20
33
|
|
|
21
|
-
|
|
34
|
+
onPhotoError() {
|
|
35
|
+
this.hasPhotoError.set(true);
|
|
36
|
+
}
|
|
22
37
|
|
|
23
|
-
|
|
38
|
+
/** The current signed in user (with fallback to afUser session if store entity is loading). */
|
|
39
|
+
readonly currentUser = computed(() => {
|
|
40
|
+
const user = this.authStore.user();
|
|
41
|
+
if (user) return user;
|
|
42
|
+
const afUser = this.authStore.afUser?.();
|
|
43
|
+
if (!afUser) return null;
|
|
44
|
+
return {
|
|
45
|
+
__id: afUser.uid,
|
|
46
|
+
name: afUser.displayName || afUser.email || (afUser.isAnonymous ? 'Guest' : 'Learner'),
|
|
47
|
+
photoURL: afUser.photoURL,
|
|
48
|
+
isAdmin: false,
|
|
49
|
+
consented: false,
|
|
50
|
+
accessState: AccessState.SUBMIT_INTEREST,
|
|
51
|
+
};
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
/** Validated image photo URL to render (or null for letter avatar fallback). */
|
|
55
|
+
readonly userPhotoUrl = computed(() => {
|
|
56
|
+
if (this.hasPhotoError()) return null;
|
|
57
|
+
const user = this.currentUser();
|
|
58
|
+
return user && isValidPhotoUrl(user.photoURL) ? user.photoURL! : null;
|
|
59
|
+
});
|
|
24
60
|
|
|
25
61
|
// --------------- EVENT HANDLING ----------------------
|
|
26
62
|
|
|
27
|
-
/** Logout. */
|
|
63
|
+
/** Logout current user. */
|
|
28
64
|
logout() {
|
|
29
65
|
this.authStore.logout();
|
|
30
66
|
}
|
|
31
|
-
|
|
32
|
-
// --------------- OTHER -------------------------------
|
|
33
|
-
|
|
34
|
-
constructor() {
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
ngOnInit(): void {
|
|
38
|
-
}
|
|
39
67
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|