Skip to content

Commit f96fd60

Browse files
marcogagliardimarcogagliardi
committed
Merge branch 'master' into VIH-11091-replace-Faker.NetCore-with-Bogus
2 parents 6066c14 + b8f406d commit f96fd60

File tree

74 files changed

+446
-269
lines changed

Some content is hidden

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

74 files changed

+446
-269
lines changed

Diff for: ‎VideoWeb/VideoWeb/ClientApp/angular.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,17 @@
2121
"tsConfig": "src/tsconfig.app.json",
2222
"assets": [
2323
"src/assets",
24+
"src/scripts",
2425
{
2526
"glob": "*",
2627
"input": "node_modules/govuk-frontend/dist/govuk/assets/fonts",
2728
"output": "assets/fonts/"
2829
},
29-
"src/scripts"
30+
{
31+
"glob": "*",
32+
"input": "node_modules/govuk-frontend/dist/govuk/assets/images",
33+
"output": "assets/images/"
34+
}
3035
],
3136
"styles": ["src/styles.scss", "node_modules/ngx-toastr/toastr.css"],
3237
"stylePreprocessorOptions": {
@@ -119,6 +124,16 @@
119124
"glob": "*",
120125
"input": "node_modules/govuk-frontend/dist/govuk/assets/fonts",
121126
"output": "assets/fonts/"
127+
},
128+
{
129+
"glob": "*",
130+
"input": "node_modules/govuk-frontend/dist/govuk/assets/images",
131+
"output": "assets/images/"
132+
},
133+
{
134+
"glob": "manifest.json",
135+
"input": "node_modules/govuk-frontend/dist/govuk/assets",
136+
"output": "assets/"
122137
}
123138
]
124139
}

Diff for: ‎VideoWeb/VideoWeb/ClientApp/package-lock.json

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎VideoWeb/VideoWeb/ClientApp/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@mediapipe/selfie_segmentation": "0.1.1632777926",
5050
"@microsoft/applicationinsights-web": "^3.3.0",
5151
"@microsoft/signalr": "^8.0.7",
52-
"@ministryofjustice/frontend": "^2.2.0",
52+
"@ministryofjustice/frontend": "^3.3.0",
5353
"@ng-select/ng-select": "^12.0.7",
5454
"@ngrx/component-store": "^17.2.0",
5555
"@ngrx/effects": "^17.2.0",
@@ -61,7 +61,7 @@
6161
"aspnet-prerendering": "^3.0.1",
6262
"chart.js": "^4.4.2",
6363
"core-js": "^3.8.2",
64-
"govuk-frontend": "^5.5.0",
64+
"govuk-frontend": "^5.7.1",
6565
"guid-typescript": "^1.0.9",
6666
"launchdarkly-js-client-sdk": "^3.5.0",
6767
"libphonenumber-js": "^1.11.9",

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/app.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
'app.skip-to-main-content' | translate
66
}}</a>
77
</nav>
8-
<header class="govuk-header" data-module="govuk-header">
9-
<app-header class="govuk-!-display-none-print non-video-element" [loggedIn]="loggedIn" [username]="username"></app-header>
10-
</header>
8+
9+
<app-header class="govuk-!-display-none-print non-video-element" [loggedIn]="loggedIn" [username]="username"></app-header>
10+
1111
<div class="govuk-width-container app-width-container--wide" id="master-container">
1212
<section
1313
aria-label="Beta banner and back navigation container"

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/on-the-day/introduction/introduction.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[sctsAltText]="'introduction.scottish-crest' | translate"
99
[hmctsAltText]="'introduction.hm-courts-and-tribunals-service-crest' | translate"
1010
[sctsImageSource]="'/assets/images/scottish-crest-circle.png'"
11-
[hmctsImageSource]="'/assets/images/BluePanelIdent.png'"
11+
[hmctsImageSource]="'/assets/images/govuk-crest-black-circle.svg'"
1212
class="govuk-header__logotype-crest govuk-!-margin-bottom-6"
1313
alt=""
1414
/>
@@ -24,7 +24,7 @@ <h1 class="govuk-heading-xl text-white">{{ 'introduction.get-ready-for-the-heari
2424
</ul>
2525

2626
<button
27-
*ngIf="(existingTest$ | async) && isRepresentative || isObserver"
27+
*ngIf="((existingTest$ | async) && isRepresentative) || isObserver"
2828
class="govuk-button govuk-button--secondary govuk-!-margin-top-4 govuk-!-margin-right-3"
2929
data-module="govuk-button"
3030
(click)="skipToCourtRulesPage()"

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/on-the-day/introduction/introduction.component.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Store } from '@ngrx/store';
1212
import { ConferenceState } from '../../waiting-space/store/reducers/conference.reducer';
1313
import * as ConferenceSelectors from '../../waiting-space/store/selectors/conference.selectors';
1414
import { HearingRole } from '../../waiting-space/models/hearing-role-model';
15-
import { takeUntil } from 'rxjs/operators';
15+
import { filter, takeUntil } from 'rxjs/operators';
1616

1717
@Component({
1818
selector: 'app-introduction',
@@ -48,7 +48,10 @@ export class IntroductionComponent extends ParticipantStatusBaseDirective implem
4848
const getActiveConference = this.conferenceStore.select(ConferenceSelectors.getActiveConference);
4949
this.existingTest$ = this.videoWebService.checkUserHasCompletedSelfTest();
5050
combineLatest([loggedInParticipant$, getActiveConference])
51-
.pipe(takeUntil(this.destroy$))
51+
.pipe(
52+
filter(([loggedInParticipant, activeConference]) => !!loggedInParticipant && !!activeConference),
53+
takeUntil(this.destroy$)
54+
)
5255
.subscribe(([loggedInParticipant, activeConference]) => {
5356
this.conferenceId = activeConference.id;
5457
this.isRepresentative = loggedInParticipant.role === Role.Representative;

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/services/connection-status.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class ConnectionStatusService {
7070

7171
private getFavicon(): Observable<boolean> {
7272
// NOTE: a status of "0" is received when app is offline
73-
return this.http.head('/assets/images/favicons/favicon.ico?_=' + new Date().getTime(), { observe: 'response' }).pipe(
73+
return this.http.head('/assets/images/favicon.ico?_=' + new Date().getTime(), { observe: 'response' }).pipe(
7474
map(response => response.status > 0),
7575
catchError((err: HttpErrorResponse) => of(err.status !== 0))
7676
);

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/services/logging/loggers/app-insights-logger.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export class AppInsightsLoggerService implements LogAdapter {
136136
const remoteDepedencyType = 'RemoteDependencyData';
137137
if (envelope.baseType === remoteDepedencyType && (envelope.baseData.name as string)) {
138138
const name = envelope.baseData.name as string;
139-
if (name.startsWith('HEAD /assets/images/favicons/favicon.ico?')) {
139+
if (name.startsWith('HEAD /assets/images/favicon.ico?')) {
140140
// ignore favicon requests used to poll for availability
141141
return false;
142142
}

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/shared/contact-us-folding/contact-us-folding.component.html

+18-12
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
11
<div class="govuk-!-margin-top-7">
2-
<details class="govuk-details" data-module="govuk-details">
3-
<a class="govuk-details__summary" (click)="toggle()" (keydown.enter)="toggle()" tabindex="0" [attr.aria-expanded]="expanded">
2+
<details class="govuk-details">
3+
<summary class="govuk-details__summary">
44
<span class="govuk-details__summary-text" id="citizen-contact-details">
5-
{{'contact-us-folding.contact-for-help' | translate}}
5+
{{ 'contact-us-folding.contact-for-help' | translate }}
66
</span>
7-
</a>
8-
<div class="govuk-details__text" *ngIf="expanded">
7+
</summary>
8+
<div class="govuk-details__text">
99
<p class="govuk-body govuk-!-margin-bottom-0">
10-
<strong>{{'contact-us-folding.england-and-wales' | translate}}</strong>
10+
<strong>{{ 'contact-us-folding.england-and-wales' | translate }}</strong>
1111
</p>
1212
<p class="govuk-body govuk-!-margin-bottom-0">
13-
{{'contact-us-folding.call-us' | translate}} <strong>{{ contactDetails.englandAndWales.phoneNumber }}</strong>
13+
{{ 'contact-us-folding.call-us' | translate }} <strong>{{ contactDetails.englandAndWales.phoneNumber }}</strong>
1414
</p>
1515
<p class="govuk-body govuk-!-margin-bottom-4">
16-
{{'contact-us-folding.email-us' | translate}} <a [href]="'mailto:' + contactDetails.englandAndWales.email">{{ contactDetails.englandAndWales.email }}</a> {{'contact-us-folding.quoting-case-number' | translate}}
16+
{{ 'contact-us-folding.email-us' | translate }}
17+
<a [href]="'mailto:' + contactDetails.englandAndWales.email">{{ contactDetails.englandAndWales.email }}</a>
18+
{{ 'contact-us-folding.quoting-case-number' | translate }}
1719
</p>
1820

1921
<p class="govuk-body govuk-!-margin-bottom-0">
20-
<strong>{{'contact-us-folding.scotland' | translate}}</strong>
22+
<strong>{{ 'contact-us-folding.scotland' | translate }}</strong>
2123
</p>
2224
<p class="govuk-body govuk-!-margin-bottom-0">
23-
{{'contact-us-folding.call-us' | translate}} <strong>{{ contactDetails.scotland.phoneNumber }}</strong>
25+
{{ 'contact-us-folding.call-us' | translate }} <strong>{{ contactDetails.scotland.phoneNumber }}</strong>
2426
</p>
2527
<p class="govuk-body govuk-!-margin-bottom-0">
26-
{{'contact-us-folding.email-us' | translate}} <a [href]="'mailto:' + contactDetails.scotland.email">{{ contactDetails.scotland.email }}</a> {{'contact-us-folding.quoting-case-number' | translate}}
28+
{{ 'contact-us-folding.email-us' | translate }}
29+
<a [href]="'mailto:' + contactDetails.scotland.email">{{ contactDetails.scotland.email }}</a>
30+
{{ 'contact-us-folding.quoting-case-number' | translate }}
31+
</p>
32+
<p class="govuk-body govuk-!-margin-top-3 govuk-!-font-size-14 govuk-!-font-weight-bold available-time">
33+
{{ 'contact-us-folding.available-time' | translate }}
2734
</p>
28-
<p class="govuk-body govuk-!-margin-top-3 govuk-!-font-size-14 govuk-!-font-weight-bold available-time">{{'contact-us-folding.available-time' | translate}}</p>
2935
</div>
3036
</details>
3137
</div>

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/shared/footer/footer.component.scss

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@
1616
}
1717

1818
.govuk-footer-background-hmcts {
19-
background-image: url('/assets/images/govuk-crest.png');
20-
@media only screen and (-webkit-min-device-pixel-ratio: 2),
21-
only screen and (min-resolution: 192dpi),
22-
only screen and (min-resolution: 2dppx) {
23-
background-image: url('/assets/images/govuk-crest-2x.png');
24-
}
19+
background-image: url('/assets/images/govuk-crest.svg');
2520
}
2621

2722
.govuk-footer-background-scts {

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/shared/header/header-logo-svg/header-logo-svg.component.html

+142-3
Large diffs are not rendered by default.

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/shared/header/header.component.html

+32-33
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
1-
<div class="govuk-header__container govuk-width-container">
2-
<div class="govuk-header__logo">
3-
<span class="govuk-header__logotype-crown">
1+
<header class="moj-header" role="banner">
2+
<div class="moj-header__container">
3+
<div class="moj-header__logo">
44
<ng-container *ngIf="hearingVenueIsScottish$ | async; then sctsCrest; else hmctsCrest"></ng-container>
55
<ng-template #sctsCrest>
6-
<img
7-
id="header-logo-scot"
8-
class="govuk-header__logotype-crest"
9-
src="/assets/images/scot-crest-white.png"
10-
height="40"
11-
[attr.alt]="'participants-panel.scottish-crest' | translate"
12-
/>
6+
<span class="moj-header__logotype-crest">
7+
<img
8+
id="header-logo-scot"
9+
class="govuk-header__logotype-crest"
10+
src="/assets/images/scot-crest-white.png"
11+
height="40"
12+
[attr.alt]="'participants-panel.scottish-crest' | translate"
13+
/>
14+
</span>
1315
</ng-template>
1416
<ng-template #hmctsCrest>
1517
<app-header-logo-svg></app-header-logo-svg>
1618
</ng-template>
17-
<span class="govuk-header__service-name govuk-!-margin-left-1">
18-
{{ 'header.hm-courts' | translate }} &amp; {{ 'header.tribunals-service' | translate }}</span
19-
>
20-
</span>
21-
</div>
2219

23-
<div class="govuk-header__content">
24-
<nav class="govuk-header__navigation" [attr.aria-label]="'header.account-details' | translate">
25-
<ul class="govuk-header__navigation-list">
26-
<li class="govuk-header__navigation-item stay-right">
27-
<span id="header-username">{{ username }}</span>
28-
</li>
29-
</ul>
30-
</nav>
31-
</div>
32-
<div class="govuk-header__content govuk-header__content_secondary">
33-
<nav class="govuk-header__navigation" [attr.aria-label]="'header.account-navigation-label' | translate">
34-
<ul class="govuk-header__navigation-list">
35-
<li *ngIf="loggedIn" class="govuk-header__navigation-item stay-right">
36-
<a id="logout-link" class="govuk-header__link" [routerLink]="logoutRoute">{{ 'header.sign-out' | translate }}</a>
37-
</li>
38-
</ul>
39-
</nav>
20+
<a class="moj-header__link moj-header__link--organisation-name" href="javascript:void(0)">{{
21+
'header.organisation-name' | translate
22+
}}</a>
23+
24+
<a class="moj-header__link moj-header__link--service-name" href="javascript:void(0)">{{ 'header.service-name' | translate }}</a>
25+
</div>
26+
<div *ngIf="loggedIn" class="moj-header__content">
27+
<nav class="moj-header__navigation" aria-label="Account navigation">
28+
<ul class="moj-header__navigation-list">
29+
<li class="moj-header__navigation-item">
30+
<a id="header-username" class="moj-header__navigation-link" href="javascript:void(0)" aria-current="page">{{ username }}</a>
31+
</li>
32+
33+
<li class="moj-header__navigation-item">
34+
<a id="logout-link" class="govuk-header__link" [routerLink]="logoutRoute">{{ 'header.sign-out' | translate }}</a>
35+
</li>
36+
</ul>
37+
</nav>
38+
</div>
4039
</div>
41-
</div>
40+
</header>

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/shared/header/header.component.scss

-6
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,3 @@
2020
.govuk-header__logotype-crown {
2121
margin-right: 10px;
2222
}
23-
24-
@media only screen and (max-width: 600px) {
25-
.govuk-header__logo {
26-
width: 100%;
27-
}
28-
}

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/individual-participant-status-list/individual-participant-status-list.component.html

+11-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
appCrestLogoImageSource
1616
[sctsImageSource]="'/assets/images/scottish-crest-grey.png'"
1717
[sctsAltText]="'individual-participant-status-list.scottish-crest' | translate"
18-
[hmctsImageSource]="'/assets/images/govuk-crest.png'"
18+
[hmctsImageSource]="'/assets/images/govuk-crest.svg'"
1919
[hmctsAltText]="'individual-participant-status-list.crest-icon-alt' | translate"
20-
>
20+
/>
2121
</div>
2222
</div>
2323
<div class="vh-line govuk-!-margin-bottom-3"></div>
@@ -31,7 +31,9 @@ <h2 class="govuk-heading-s">{{ 'individual-participant-status-list.wingers' | tr
3131
<div class="vh-border">
3232
<div *ngFor="let participant of wingers; let lastItem = last" class="govuk-grid-row govuk-!-margin-bottom-1">
3333
<div id="p-row-{{ participant.id }}-panel-member" class="govuk-grid-column-full">
34-
<p id="p-{{ participant.id }}-name-panel-member" class="govuk-heading-s govuk-!-margin-bottom-0">{{ participant.name ?? participant.displayName }}</p>
34+
<p id="p-{{ participant.id }}-name-panel-member" class="govuk-heading-s govuk-!-margin-bottom-0">
35+
{{ participant.name ?? participant.displayName }}
36+
</p>
3537
<div class="vh-line" *ngIf="!lastItem"></div>
3638
</div>
3739
</div>
@@ -47,7 +49,9 @@ <h2 class="govuk-heading-s">{{ 'individual-participant-status-list.panel-members
4749
<div class="vh-border">
4850
<div *ngFor="let participant of panelMembers; let lastItem = last" class="govuk-grid-row govuk-!-margin-bottom-1">
4951
<div id="p-row-{{ participant.id }}-panel-member" class="govuk-grid-column-full">
50-
<p id="p-{{ participant.id }}-name-panel-member" class="govuk-heading-s govuk-!-margin-bottom-0">{{ participant.name ?? participant.displayName }}</p>
52+
<p id="p-{{ participant.id }}-name-panel-member" class="govuk-heading-s govuk-!-margin-bottom-0">
53+
{{ participant.name ?? participant.displayName }}
54+
</p>
5155
<div class="vh-line" *ngIf="!lastItem"></div>
5256
</div>
5357
</div>
@@ -146,7 +150,9 @@ <h2 class="govuk-heading-s">{{ 'individual-participant-status-list.observers' |
146150
<div class="vh-border">
147151
<div *ngFor="let participant of observers; let lastItem = last" class="govuk-grid-row govuk-!-margin-bottom-1">
148152
<div id="p-row-{{ participant.id }}-observer" class="govuk-grid-column-full">
149-
<p id="p-{{ participant.id }}-name-observer" class="govuk-heading-s govuk-!-margin-bottom-0">{{ participant.name ?? participant.displayName }}</p>
153+
<p id="p-{{ participant.id }}-name-observer" class="govuk-heading-s govuk-!-margin-bottom-0">
154+
{{ participant.name ?? participant.displayName }}
155+
</p>
150156
<div class="vh-line" *ngIf="!lastItem"></div>
151157
</div>
152158
</div>

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/judge-participant-status-list/judge-participant-status-list.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
appCrestLogoImageSource
66
[sctsImageSource]="'/assets/images/scottish-crest-grey.png'"
77
[sctsAltText]="'judge-participant-status-list.scottish-crest' | translate"
8-
[hmctsImageSource]="'/assets/images/govuk-crest.png'"
8+
[hmctsImageSource]="'/assets/images/govuk-crest.svg'"
99
[hmctsAltText]="'judge-participant-status-list.crest-alt' | translate"
1010
src=""
1111
alt=""

Diff for: ‎VideoWeb/VideoWeb/ClientApp/src/app/waiting-space/participant-waiting-room/participant-waiting-room.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ <h1 #roomTitleLabel class="room-title-label">{{ getCaseNameAndNumber() }}</h1>
107107
<img
108108
class="transferFeedImage"
109109
id="transferFeedImage"
110-
ngSrc="/assets/images/UkGovCrestWhite.png"
110+
ngSrc="/assets/images/govuk-crest-white.svg"
111111
[attr.alt]="'participant-waiting-room.witness-transferring-warning-img' | translate"
112112
height="247"
113113
width="300"

0 commit comments

Comments
 (0)