Hint
- @for(card of hint; track card.id) {
+ @for(card of gameService.hint; track card.id) {
0) return;
- this.hint = await this.gameService.showHint();
+ await this.gameService.showHint();
}
}
diff --git a/frontend/src/environments/environment.development.ts b/frontend/src/environments/environment.development.ts
new file mode 100644
index 0000000..f274e5e
--- /dev/null
+++ b/frontend/src/environments/environment.development.ts
@@ -0,0 +1 @@
+export const environment = {};
diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts
new file mode 100644
index 0000000..3baf987
--- /dev/null
+++ b/frontend/src/environments/environment.ts
@@ -0,0 +1,6 @@
+export const environment = {
+ production: false,
+ apiUrl: 'http://localhost:5224/api/v1/Games',
+ authUrl: 'http://localhost:5224/api/v1/Auth',
+ authTokenKey: 'auth_token',
+};
\ No newline at end of file
diff --git a/frontend/src/service/auth/auth.interceptor.ts b/frontend/src/service/auth/auth.interceptor.ts
index 1213e72..7ec2134 100644
--- a/frontend/src/service/auth/auth.interceptor.ts
+++ b/frontend/src/service/auth/auth.interceptor.ts
@@ -1,15 +1,17 @@
-import { HttpInterceptorFn, HttpRequest } from '@angular/common/http';
import { inject } from '@angular/core';
+import { HttpInterceptorFn } from '@angular/common/http';
+
import { AuthService } from './auth.service';
export const authInterceptor: HttpInterceptorFn = (req, next) => {
- const authService = inject(AuthService);
+ const authService: AuthService = inject(AuthService);
const token = authService.getToken();
if (token) {
const cloned = req.clone({
headers: req.headers.set('Authorization', `Bearer ${token}`)
});
+
return next(cloned);
}
diff --git a/frontend/src/service/auth/auth.service.ts b/frontend/src/service/auth/auth.service.ts
index 443306e..ff4f9de 100644
--- a/frontend/src/service/auth/auth.service.ts
+++ b/frontend/src/service/auth/auth.service.ts
@@ -1,37 +1,33 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
+import { Router } from '@angular/router';
import { HttpClient } from '@angular/common/http';
import { BehaviorSubject, Observable, tap } from 'rxjs';
-import { Router } from '@angular/router';
-interface LoginResponse {
- token: string;
-}
+import { environment } from '../../environments/environment';
-@Injectable({
- providedIn: 'root'
-})
+import { Credentials, LoginResponse } from './auth.types';
+
+@Injectable({ providedIn: 'root' })
export class AuthService {
- private API_URL = 'http://localhost:5224/api/v1/Auth';
- private tokenKey = 'auth_token';
+ private http: HttpClient = inject(HttpClient);
+ private router: Router = inject(Router);
+
private isAuthenticatedSubject = new BehaviorSubject(this.hasToken());
- public redirectUrl: string | null = null;
- constructor(private http: HttpClient, private router: Router) {}
-
- login(username: string, password: string): Observable {
- return this.http.post(`${this.API_URL}/login`, { username, password })
+ login(credentials: Credentials): Observable {
+ return this.http.post(`${environment.authUrl}/login`, credentials)
.pipe(
tap(response => {
- localStorage.setItem(this.tokenKey, response.token);
+ localStorage.setItem(environment.authTokenKey, response.token);
this.isAuthenticatedSubject.next(true);
})
);
}
logout(): void {
- localStorage.removeItem(this.tokenKey);
+ localStorage.removeItem(environment.authTokenKey);
this.isAuthenticatedSubject.next(false);
- this.router.navigate(['/login']);
+ this.router.navigate([ '/login' ]);
}
isAuthenticated(): Observable {
@@ -39,10 +35,10 @@ export class AuthService {
}
getToken(): string | null {
- return localStorage.getItem(this.tokenKey);
+ return localStorage.getItem(environment.authTokenKey);
}
private hasToken(): boolean {
- return !!localStorage.getItem(this.tokenKey);
+ return !!localStorage.getItem(environment.authTokenKey);
}
}
\ No newline at end of file
diff --git a/frontend/src/service/auth/auth.types.ts b/frontend/src/service/auth/auth.types.ts
new file mode 100644
index 0000000..cc64429
--- /dev/null
+++ b/frontend/src/service/auth/auth.types.ts
@@ -0,0 +1,8 @@
+export type Credentials = {
+ username: string;
+ password: string;
+}
+
+export type LoginResponse = {
+ token: string;
+}
\ No newline at end of file
diff --git a/frontend/src/service/game/game.service.ts b/frontend/src/service/game/game.service.ts
index daf2fd9..cc31512 100755
--- a/frontend/src/service/game/game.service.ts
+++ b/frontend/src/service/game/game.service.ts
@@ -1,37 +1,22 @@
import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
-import { Card, toCard } from '../../app/models/card';
import { lastValueFrom } from 'rxjs';
-interface GameResponse {
- deck: number[];
- hand: number[];
- found: number[];
- startedAt: Date;
- finishedAt?: Date;
- fails: number;
- hints: number;
- id: number;
-}
+import { Card, toCard } from '../../app/models/card';
+import { environment } from '../../environments/environment';
-interface SetCheckResponse {
- isSet: boolean;
- newState: GameResponse;
-}
-
-type HintResponse = number[];
+import { GameResponse, SetCheckResponse, HintResponse } from './game.types';
@Injectable({ providedIn: 'root' })
export class GameService {
private http = inject(HttpClient);
-
- private API_URL = 'http://localhost:5224/api/v1/Games';
- public deck: Card[] = [];
- public hand: Card[] = [];
- public selectedCards: Card[] = [];
- public foundSets: Card[][] = [];
- public possibleSets: Card[][] = [];
+ public deck: Card[] = [];
+ public hand: Card[] = [];
+ public hint: Card[] = [];
+ private selectedCards: Card[] = [];
+ public foundSets: Card[][] = [];
+ public possibleSets: Card[][] = [];
public fails: number = 0;
public hints: number = 0;
@@ -40,9 +25,12 @@ export class GameService {
public startDate: Date = new Date();
public finishedAt?: Date;
- constructor() {}
-
- public updateState(game: GameResponse): void {
+ private updateState(game: GameResponse): void {
+ // Clear hint if set is found
+ if ((this.deck.length + this.hand.length) !== (game.deck.length + game.hand.length)) {
+ this.hint.length = 0;
+ }
+
this.gameId = game.id;
this.fails = game.fails;
this.hints = game.hints;
@@ -68,9 +56,9 @@ export class GameService {
// Fetch game data from the server, use lastValueFrom to convert Observable to Promise
let game: GameResponse;
if (gameId) {
- game = await lastValueFrom(this.http.get(`${this.API_URL}/${gameId}`))
+ game = await lastValueFrom(this.http.get(`${environment.apiUrl}/${gameId}`))
} else {
- game = await lastValueFrom(this.http.post(this.API_URL, {}));
+ game = await lastValueFrom(this.http.post(environment.apiUrl, {}));
}
// Update the game state with the fetched data
@@ -79,17 +67,17 @@ export class GameService {
return game.id;
}
- public async getSetsInHand(): Promise {
+ private async getSetsInHand(): Promise {
const sets = await lastValueFrom(
- this.http.get(`${this.API_URL}/SetsInHand/${this.gameId}`)
+ this.http.get(`${environment.apiUrl}/SetsInHand/${this.gameId}`)
);
this.possibleSets = sets.map(set => set.map(cardIndex => this.hand[cardIndex]));
}
- public async checkSet(cards: number[]): Promise {
+ private async checkSet(cards: number[]): Promise {
const response = await lastValueFrom(
- this.http.post(`${this.API_URL}/CheckSet/${this.gameId}`, cards)
+ this.http.post(`${environment.apiUrl}/CheckSet/${this.gameId}`, cards)
);
this.updateState(response.newState);
@@ -116,14 +104,14 @@ export class GameService {
}
}
- public async showHint(): Promise {
- const hint = await lastValueFrom(this.http.get(`${this.API_URL}/Hint/${this.gameId}`));
+ public async showHint(): Promise {
+ const hint = await lastValueFrom(this.http.get(`${environment.apiUrl}/Hint/${this.gameId}`));
this.hints++;
- return hint.map((indexOfCard: number) => this.hand[indexOfCard]);
+ this.hint = hint.map((indexOfCard: number) => this.hand[indexOfCard]);
}
public deleteGame(): void {
- this.http.delete(`${this.API_URL}/${this.gameId}`).subscribe();
+ this.http.delete(`${environment.apiUrl}/${this.gameId}`).subscribe();
}
}
\ No newline at end of file
diff --git a/frontend/src/service/game/game.types.ts b/frontend/src/service/game/game.types.ts
new file mode 100644
index 0000000..f487b43
--- /dev/null
+++ b/frontend/src/service/game/game.types.ts
@@ -0,0 +1,17 @@
+export type GameResponse = {
+ deck: number[];
+ hand: number[];
+ found: number[];
+ startedAt: Date;
+ finishedAt?: Date;
+ fails: number;
+ hints: number;
+ id: number;
+}
+
+export type SetCheckResponse = {
+ isSet: boolean;
+ newState: GameResponse;
+}
+
+export type HintResponse = number[];
diff --git a/frontend/src/service/user/user-data.service.ts b/frontend/src/service/user/user-data.service.ts
index 483d322..284a3c0 100644
--- a/frontend/src/service/user/user-data.service.ts
+++ b/frontend/src/service/user/user-data.service.ts
@@ -1,40 +1,28 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { lastValueFrom } from 'rxjs';
+
import { AuthService } from '../auth/auth.service';
+import { environment } from '../../environments/environment';
-@Injectable({
- providedIn: 'root'
-})
+import { Credentials } from '../auth/auth.types';
+import { GameResponse } from '../game/game.types';
+
+@Injectable({ providedIn: 'root' })
export class UserDataService {
- private GAMES_API_URL = 'http://localhost:5224/api/v1/Games';
+ private http: HttpClient = inject(HttpClient);
+ private authService: AuthService = inject(AuthService);
- constructor(
- private http: HttpClient,
- private authService: AuthService
- ) {}
-
- public async login(credentials: { username: string, password: string }): Promise {
- try {
- await lastValueFrom(this.authService.login(credentials.username, credentials.password));
- } catch (error) {
- console.error('Login error:', error);
- throw error;
- }
+ public async login(credentials: Credentials): Promise {
+ await lastValueFrom(this.authService.login(credentials));
}
- public async getGames(): Promise {
- try {
- const data = await lastValueFrom(this.http.get(this.GAMES_API_URL));
-
- const sortedGames = data
- .sort((a: any, b: any) => new Date(a.startedAt).getTime() - new Date(b.startedAt).getTime())
- .reverse();
-
- return sortedGames;
- } catch (error) {
- console.error('Error getting games:', error);
- throw error;
- }
+ public async getGames(): Promise {
+ const games = await lastValueFrom(this.http.get(environment.apiUrl));
+
+ return games
+ .sort((a: GameResponse, b: GameResponse) =>
+ new Date(a.startedAt).getTime() - new Date(b.startedAt).getTime()
+ ).reverse();
}
}
\ No newline at end of file
diff --git a/frontend/webpack.config.ts b/frontend/webpack.config.ts
new file mode 100644
index 0000000..e0aedf1
--- /dev/null
+++ b/frontend/webpack.config.ts
@@ -0,0 +1,6 @@
+import { EnvironmentPlugin } from 'webpack';
+const Dotenv = require('dotenv-webpack');
+
+module.exports = {
+ plugins: [new Dotenv()],
+};
\ No newline at end of file