Skip to content

Commit b68c995

Browse files
gitcommitshowgitcommitshow
authored
Merge pull request #20 from khajatakreemulla/feat-new-updates
add: All frontend pages
2 parents 6af1173 + 7f78798 commit b68c995

Some content is hidden

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

50 files changed

+981
-179
lines changed

‎frontend/src/app/app-routing.module.ts‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,24 @@ const routes: Routes = [
4848
loadChildren: () => import('./send-jwt4/send-jwt4.module').then(mod => mod.SendJwt4Module),
4949
},
5050
{
51-
path: 'send-jwt5',
52-
loadChildren: () => import('./send-jwt4/send-jwt4.module').then(mod => mod.SendJwt4Module),
51+
path: 'best-method',
52+
loadChildren: () => import('./best-method/best-method.module').then(mod => mod.BestMethodModule),
53+
},
54+
{
55+
path: 'implement-logout',
56+
loadChildren: () => import('./logout/logout.module').then(mod => mod.LogoutModule),
57+
},
58+
{
59+
path: 'finish',
60+
loadChildren: () => import('./finish/finish.module').then(mod => mod.FinishModule),
61+
},
62+
{
63+
path: 'disclosures',
64+
loadChildren: () => import('./disclosures/disclosures.module').then(mod => mod.DisclosuresModule),
65+
},
66+
{
67+
path: 'reference',
68+
loadChildren: () => import('./reference/reference.module').then(mod => mod.ReferenceModule),
5369
},
5470
{
5571
path: '**',

‎frontend/src/app/app.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@
9696
<span class="ms-2">{{ "app.finishTutorial" | transloco }}</span>
9797
</li>
9898
<li class="nav-item m-2">
99-
<img src="assets/images/icon-checked.svg" class="w-12px" *ngIf="step > 13" />
100-
<img src="assets/images/icon-check.svg" class="w-12px" *ngIf="step === 13" />
101-
<div class="w-12px d-inline-flex" *ngIf="step <= 12"></div>
99+
<img src="assets/images/icon-checked.svg" class="w-12px" *ngIf="step > 14" />
100+
<img src="assets/images/icon-check.svg" class="w-12px" *ngIf="step === 14" />
101+
<div class="w-12px d-inline-flex" *ngIf="step <= 13"></div>
102102
<span class="ms-2">{{ "app.disclosure" | transloco }}</span>
103103
</li>
104104
<li class="nav-item m-2">
105-
<img src="assets/images/icon-checked.svg" class="w-12px" *ngIf="step > 13" />
106-
<img src="assets/images/icon-check.svg" class="w-12px" *ngIf="step === 13" />
107-
<div class="w-12px d-inline-flex" *ngIf="step <= 12"></div>
105+
<img src="assets/images/icon-checked.svg" class="w-12px" *ngIf="step > 15" />
106+
<img src="assets/images/icon-check.svg" class="w-12px" *ngIf="step === 15" />
107+
<div class="w-12px d-inline-flex" *ngIf="step <= 14"></div>
108108
<span class="ms-2">{{ "app.reference" | transloco }}</span>
109109
</li>
110110
</ul>

‎frontend/src/app/best-method/best-method-routing.module.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { NgModule } from '@angular/core';
2+
import { RouterModule, Routes } from '@angular/router';
3+
import { BestMethodComponent } from './best-method.component';
4+
5+
const routes: Routes = [
6+
{
7+
path:"",
8+
component: BestMethodComponent
9+
}
10+
];
11+
12+
@NgModule({
13+
imports: [RouterModule.forChild(routes)],
14+
exports: [RouterModule]
15+
})
16+
export class BestMethodRoutingModule { }

‎frontend/src/app/best-method/best-method.component.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<h1 class="mb-3 heading">{{ "best-method.introduction" | transloco }}</h1>
2+
3+
<p class="font-grey" style="font-size: 24px;">{{ "best-method.method" | transloco }}</p>
4+
5+
<hr>
6+
7+
<p class="font-grey method" style="margin-top: 40px;">{{"best-method.method1" | transloco}}</p>
8+
9+
<p class="font-grey method">{{"best-method.method2" | transloco}}</p>
10+
11+
<p class="font-grey method">{{"best-method.method3" | transloco}}</p>
12+
13+
<p class="font-grey method" style="font-weight: bold;">{{"best-method.implement" | transloco}}</p>
14+
15+
<div class="row">
16+
<div class="col text-end">
17+
<button type="button" (click)="backStep()" class="btn btn-outline-light mt-5">{{ "verify.back" | transloco }}</button>
18+
</div>
19+
<div class="col-auto text-end">
20+
<button type="button" (click)="nextStep()" class="btn btn-warning mt-5" innerHTML="{{ 'best-method.body' | transloco }}"></button>
21+
</div>
22+
</div>

‎frontend/src/app/best-method/best-method.component.scss‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.method {
2+
margin-top: 25px;
3+
font-family: Helvetica;
4+
font-size: 18px;
5+
font-weight: normal;
6+
font-stretch: normal;
7+
font-style: normal;
8+
line-height: 1.56;
9+
letter-spacing: 0.18px;
10+
text-align: left;
11+
color: #b9c0ca;
12+
}
13+
.heading {
14+
font-family: Helvetica;
15+
font-size: 48px;
16+
font-weight: bold;
17+
font-stretch: normal;
18+
font-style: normal;
19+
line-height: 1.25;
20+
letter-spacing: 0.48px;
21+
text-align: left;
22+
color: #f7fafc;
23+
}

‎frontend/src/app/best-method/best-method.component.spec.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
3+
import { BestMethodComponent } from './best-method.component';
4+
5+
describe('BestMethodComponent', () => {
6+
let component: BestMethodComponent;
7+
let fixture: ComponentFixture<BestMethodComponent>;
8+
9+
beforeEach(async () => {
10+
await TestBed.configureTestingModule({
11+
declarations: [ BestMethodComponent ]
12+
})
13+
.compileComponents();
14+
});
15+
16+
beforeEach(() => {
17+
fixture = TestBed.createComponent(BestMethodComponent);
18+
component = fixture.componentInstance;
19+
fixture.detectChanges();
20+
});
21+
22+
it('should create', () => {
23+
expect(component).toBeTruthy();
24+
});
25+
});

‎frontend/src/app/best-method/best-method.component.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { Component, OnInit } from '@angular/core';
2+
import { Router } from '@angular/router';
3+
import { StepService } from '../shared/services/step.service';
4+
5+
@Component({
6+
selector: 'app-best-method',
7+
templateUrl: './best-method.component.html',
8+
styleUrls: ['./best-method.component.scss']
9+
})
10+
export class BestMethodComponent implements OnInit {
11+
12+
constructor(
13+
private router: Router,
14+
private stepService: StepService
15+
) {
16+
this.stepService.setStep(11)
17+
}
18+
19+
ngOnInit(): void {
20+
}
21+
backStep(){
22+
this.stepService.setStep(10)
23+
this.router.navigate(['send-jwt4'])
24+
}
25+
nextStep(){
26+
this.stepService.setStep(12)
27+
this.router.navigate(['implement-logout'])
28+
}
29+
}

‎frontend/src/app/best-method/best-method.module.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { NgModule } from '@angular/core';
2+
import { CommonModule } from '@angular/common';
3+
4+
import { BestMethodRoutingModule } from './best-method-routing.module';
5+
import { TranslocoModule } from '@ngneat/transloco';
6+
import { BestMethodComponent } from './best-method.component';
7+
8+
9+
@NgModule({
10+
declarations: [
11+
BestMethodComponent
12+
],
13+
imports: [
14+
CommonModule,
15+
TranslocoModule,
16+
BestMethodRoutingModule
17+
]
18+
})
19+
export class BestMethodModule { }

‎frontend/src/app/disclosures/disclosures-routing.module.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { NgModule } from '@angular/core';
2+
import { RouterModule, Routes } from '@angular/router';
3+
import { DisclosuresComponent } from './disclosures.component';
4+
5+
const routes: Routes = [
6+
{
7+
path:"",
8+
component: DisclosuresComponent
9+
}
10+
];
11+
12+
@NgModule({
13+
imports: [RouterModule.forChild(routes)],
14+
exports: [RouterModule]
15+
})
16+
export class DisclosuresRoutingModule { }

‎frontend/src/app/disclosures/disclosures.component.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<h1 class="mb-3 heading">{{ "disclosures.introduction" | transloco }}</h1>
2+
<hr>
3+
4+
<p class="font-grey">
5+
<img src="assets/images/icon-crog.svg" class="me-2" />
6+
{{ "disclosures.disclosure1" | transloco }}
7+
</p>
8+
9+
<p class="font-grey">
10+
<img src="assets/images/icon-crog.svg" class="me-2" />
11+
{{ "disclosures.disclosure2" | transloco }}
12+
</p>
13+
14+
<div class="row">
15+
<div class="col text-end">
16+
<button type="button" (click)="nextStep()" class="btn btn-outline-light mt-5">{{ "finish.next" | transloco }}</button>
17+
</div>
18+
</div>

0 commit comments

Comments
 (0)