diff --git a/arai-frontend/favicon.png b/arai-frontend/favicon.png new file mode 100644 index 0000000..e4f3070 Binary files /dev/null and b/arai-frontend/favicon.png differ diff --git a/arai-frontend/src/app/case-input/case-input.component.html b/arai-frontend/src/app/case-input/case-input.component.html index 0918a93..bb35137 100644 --- a/arai-frontend/src/app/case-input/case-input.component.html +++ b/arai-frontend/src/app/case-input/case-input.component.html @@ -1,8 +1,10 @@ +
+ @if(!receivedInfo) {
-

Oblicz koszta i czas sporu

+

Oszacuj koszt i czas procesu

Opis Sprawy @@ -15,7 +17,7 @@ - Lokacja + Miasto diff --git a/arai-frontend/src/app/case-input/case-input.component.scss b/arai-frontend/src/app/case-input/case-input.component.scss index c14f097..9431587 100644 --- a/arai-frontend/src/app/case-input/case-input.component.scss +++ b/arai-frontend/src/app/case-input/case-input.component.scss @@ -6,6 +6,14 @@ body, html { margin: 0; } + .center-image { + display: block; + margin-left: auto; + margin-right: auto; + width: 150px; + height: 150px; + } + .center { text-align: center; } @@ -14,6 +22,7 @@ body, html { display: flex; justify-content: center; align-items: center; + flex-direction: column; } .lawyering-form { diff --git a/arai-frontend/src/app/case-input/case-input.component.ts b/arai-frontend/src/app/case-input/case-input.component.ts index 3072fdd..dcf7901 100644 --- a/arai-frontend/src/app/case-input/case-input.component.ts +++ b/arai-frontend/src/app/case-input/case-input.component.ts @@ -6,7 +6,7 @@ import { MatButtonModule } from '@angular/material/button' import { BackendService } from '../backend.service'; import { GenericRequest, Mediator, ReturnResponse, UserInputRequest, userInput } from '../requests-responses'; import { Router } from '@angular/router'; -import { KosztaService } from '../koszta.service'; +import { kosztService } from '../koszta.service'; import { MediatorzyService } from '../mediatorzy.service'; @@ -27,7 +27,7 @@ export class CaseInputComponent { userInput: userInput | null = null; receivedInfo: boolean = false; - constructor(private fb: FormBuilder, private readonly backendService: BackendService, private readonly router: Router, private readonly kosztaService: KosztaService, private readonly mediatorzyService: MediatorzyService) { + constructor(private fb: FormBuilder, private readonly backendService: BackendService, private readonly router: Router, private readonly kosztService: kosztService, private readonly mediatorzyService: MediatorzyService) { this.userInputForm = this.fb.group({ generic_input: ['pracodawca nie wyplacil mi wynagrodzenia za ostatnie 2 miesiace i mnie zwolnil'], trial_value: [1000], @@ -48,8 +48,8 @@ export class CaseInputComponent { this.receivedInfo = true; const result = await this.backendService.sendMessage(new UserInputRequest(this.userInput)) as ReturnResponse; this.mediatorzyService.setMediatorzy(CaseInputComponent.convertToMediators(result.response_data.second as unknown as string[])); - this.kosztaService.czas = String(result.response_data.first.time_of_trial); - this.kosztaService.koszta = String(result.response_data.first.cost_of_trial); + this.kosztService.czas = String(result.response_data.first.time_of_trial); + this.kosztService.koszt = String(result.response_data.first.cost_of_trial); console.log(`result: `, result); this.router.navigate(['koszt']); } diff --git a/arai-frontend/src/app/cost-view/cost-view.component.html b/arai-frontend/src/app/cost-view/cost-view.component.html index c350408..f59405a 100644 --- a/arai-frontend/src/app/cost-view/cost-view.component.html +++ b/arai-frontend/src/app/cost-view/cost-view.component.html @@ -1,16 +1,17 @@
+ -

Chcesz znacznie zredukować koszta?

+

Skorzystaj z pomocy mediatora

diff --git a/arai-frontend/src/app/cost-view/cost-view.component.scss b/arai-frontend/src/app/cost-view/cost-view.component.scss index 2de4eb7..ab17087 100644 --- a/arai-frontend/src/app/cost-view/cost-view.component.scss +++ b/arai-frontend/src/app/cost-view/cost-view.component.scss @@ -10,6 +10,15 @@ margin: 0 auto; } +.center-image { + display: block; + margin-left: auto; + margin-right: auto; + width: 150px; + height: 150px; +} + + .main { display: flex; justify-content: center; @@ -36,7 +45,12 @@ color: #28a745; } +.text-gap { + margin-bottom: 10px; +} + .bait { + margin-top: 20px; text-align: center; } diff --git a/arai-frontend/src/app/cost-view/cost-view.component.ts b/arai-frontend/src/app/cost-view/cost-view.component.ts index 98c6b11..ae548ce 100644 --- a/arai-frontend/src/app/cost-view/cost-view.component.ts +++ b/arai-frontend/src/app/cost-view/cost-view.component.ts @@ -3,7 +3,7 @@ import { StatisticsOutputInterface } from '../requests-responses'; import { DatePipe } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; import { Router } from '@angular/router'; -import { KosztaService } from '../koszta.service'; +import { kosztService } from '../koszta.service'; @Component({ selector: 'app-cost-view', @@ -18,12 +18,12 @@ export class CostViewComponent { time_of_trial: Date.UTC(0, 6, 0, 0, 0, 0, 0) }; -constructor(private readonly router: Router, private readonly kosztaService: KosztaService) {} +constructor(private readonly router: Router, private readonly kosztService: kosztService) {} ngOnInit() { this.costData = { - cost_of_trial: Number(this.kosztaService.koszta), - time_of_trial: Number(this.kosztaService.czas), + cost_of_trial: Number(this.kosztService.koszt), + time_of_trial: Number(this.kosztService.czas), } } diff --git a/arai-frontend/src/app/koszta.service.spec.ts b/arai-frontend/src/app/koszta.service.spec.ts index 0b19e19..7936227 100644 --- a/arai-frontend/src/app/koszta.service.spec.ts +++ b/arai-frontend/src/app/koszta.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { KosztaService } from './koszta.service'; +import { kosztService } from './koszt.service'; -describe('KosztaService', () => { - let service: KosztaService; +describe('kosztService', () => { + let service: kosztService; beforeEach(() => { TestBed.configureTestingModule({}); - service = TestBed.inject(KosztaService); + service = TestBed.inject(kosztService); }); it('should be created', () => { diff --git a/arai-frontend/src/app/koszta.service.ts b/arai-frontend/src/app/koszta.service.ts index a726a17..a03e7fb 100644 --- a/arai-frontend/src/app/koszta.service.ts +++ b/arai-frontend/src/app/koszta.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; @Injectable({ providedIn: 'root' }) -export class KosztaService { - public koszta: string = ""; +export class kosztService { + public koszt: string = ""; public czas: string = ""; } diff --git a/arai-frontend/src/assets/favicon.png b/arai-frontend/src/assets/favicon.png new file mode 100644 index 0000000..e4f3070 Binary files /dev/null and b/arai-frontend/src/assets/favicon.png differ diff --git a/arai-frontend/src/favicon.ico b/arai-frontend/src/favicon.ico index 57614f9..bd1944b 100644 Binary files a/arai-frontend/src/favicon.ico and b/arai-frontend/src/favicon.ico differ diff --git a/arai-frontend/src/favicon.png b/arai-frontend/src/favicon.png new file mode 100644 index 0000000..e4f3070 Binary files /dev/null and b/arai-frontend/src/favicon.png differ diff --git a/arai-frontend/src/index.html b/arai-frontend/src/index.html index 4a21630..257e9bb 100644 --- a/arai-frontend/src/index.html +++ b/arai-frontend/src/index.html @@ -5,7 +5,7 @@ AraiFrontend - +