Skip to content

Commit d21134e

Browse files
committed
Fix linting
Added interfaces for hisotry response.
1 parent 407d3e8 commit d21134e

File tree

3 files changed

+44
-13
lines changed

3 files changed

+44
-13
lines changed

frontend/src/_services/history.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
22
import { HttpClient } from '@angular/common/http';
33
import { Observable } from 'rxjs';
44
import { map } from 'rxjs/operators';
5-
import { MatchingHistory } from '../app/account/history/history.model';
5+
import { historyResponse, MatchingHistory } from '../app/account/history/history.model';
66
import { ApiService } from './api.service';
77

88
@Injectable({
@@ -16,7 +16,7 @@ export class HistoryService extends ApiService {
1616
}
1717

1818
getHistories(): Observable<MatchingHistory[]> {
19-
return this.http.get<{ status: string; message: string; data: any[] }>(`${this.apiUrl}`).pipe(
19+
return this.http.get<historyResponse>(`${this.apiUrl}`).pipe(
2020
map(response =>
2121
response.data.map(item => ({
2222
id: item._id,
Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,40 @@
11
export interface MatchingHistory {
2-
id: number;
2+
id: string;
33
collaborator: string; // collaborator username
44
question: string; // question title
55
difficulty: string; // question difficulty
66
topics: string[]; // question topics
77
status: string; // status of the session
88
time: string; // time of the session
99
}
10+
11+
export interface User {
12+
username: string;
13+
_id: string;
14+
}
15+
16+
export interface Question {
17+
id: number;
18+
title: string;
19+
description: string;
20+
topics: string[];
21+
difficulty: string;
22+
_id: string;
23+
}
24+
25+
export interface sessionHistory {
26+
_id: string;
27+
roomId: string;
28+
user: User;
29+
collaborator: User;
30+
question: Question;
31+
status: string;
32+
createdAt: string;
33+
updatedAt: string;
34+
}
35+
36+
export interface historyResponse {
37+
status: string;
38+
message: string;
39+
data: sessionHistory[];
40+
}

frontend/src/app/account/register/register.component.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from '@angular/core';
22
import { CommonModule } from '@angular/common';
3-
import { AbstractControl, FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
3+
import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
44
import { RouterLink, Router, ActivatedRoute } from '@angular/router';
55
import { SelectButtonModule } from 'primeng/selectbutton';
66
import { InputTextModule } from 'primeng/inputtext';
@@ -9,15 +9,15 @@ import { ButtonModule } from 'primeng/button';
99
import { DividerModule } from 'primeng/divider';
1010
import { ToastModule } from 'primeng/toast';
1111
import { MessageService } from 'primeng/api';
12-
import { PASSWORD_LOWERCASE, lowercasePasswordValidator } from '../_validators/lowercase-password';
13-
import { PASSWORD_UPPERCASE, uppercasePasswordValidator } from '../_validators/uppercase-password';
14-
import { PASSWORD_NUMERIC, numericPasswordValidator } from '../_validators/numeric-password';
15-
import { PASSWORD_SPECIAL, specialPasswordValidator } from '../_validators/special-password';
16-
import { PASSWORD_SHORT, shortPasswordValidator } from '../_validators/short-password';
17-
import { PASSWORD_WEAK, weakPasswordValidator } from '../_validators/weak-password.validator';
18-
import { mismatchPasswordValidator, PASSWORD_MISMATCH } from '../_validators/mismatch-password.validator';
19-
import { invalidUsernameValidator, USERNAME_INVALID } from '../_validators/invalid-username.validator';
20-
import { invalidPasswordValidator, PASSWORD_INVALID } from '../_validators/invalid-password.validator';
12+
import { lowercasePasswordValidator } from '../_validators/lowercase-password';
13+
import { uppercasePasswordValidator } from '../_validators/uppercase-password';
14+
import { numericPasswordValidator } from '../_validators/numeric-password';
15+
import { specialPasswordValidator } from '../_validators/special-password';
16+
import { shortPasswordValidator } from '../_validators/short-password';
17+
import { weakPasswordValidator } from '../_validators/weak-password.validator';
18+
import { mismatchPasswordValidator } from '../_validators/mismatch-password.validator';
19+
import { invalidUsernameValidator } from '../_validators/invalid-username.validator';
20+
import { invalidPasswordValidator } from '../_validators/invalid-password.validator';
2121
import { AuthenticationService } from '../../../_services/authentication.service';
2222
import { FormUtilsService } from '../../../_services/form.utils.service';
2323

0 commit comments

Comments
 (0)