Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3c559fe
moved components to the core/components folder
rnastyuk Mar 3, 2025
8273b6a
added basic login component
rnastyuk Mar 3, 2025
01776c3
added auth service and auth store
rnastyuk Mar 3, 2025
d9ee0b6
removed login component, added sign-in and sign-up components
rnastyuk Mar 3, 2025
d0f43ba
removed redundant modifiers in auth service
rnastyuk Mar 4, 2025
23da6fa
chore(merge): main into 49
rnastyuk Mar 4, 2025
77d8953
chore(primeng-setup): basic design system configuration
rnastyuk Mar 7, 2025
866b053
Merge branch 'refs/heads/main' into chore/101-setup-primeng-design-sy…
rnastyuk Mar 7, 2025
fb38072
chore(primeng-setup): removed sign-in component
rnastyuk Mar 7, 2025
5731428
chore(primeng-setup): changed all private modifiers to '#'
rnastyuk Mar 7, 2025
1aa3a94
Merge branch 'refs/heads/main' into chore/101-setup-primeng-design-sy…
rnastyuk Mar 10, 2025
e15b309
feat(sign-up-design): create initial form layout
rnastyuk Mar 10, 2025
773cc6d
Merge branch 'main' into feat/49-design-sign-up-form
rnastyuk Mar 10, 2025
2e796bf
Merge branch 'refs/heads/main' into feat/49-design-sign-up-form
rnastyuk Mar 10, 2025
1ecfbbf
feat(sign-up-design): changed icons, finished form layout
rnastyuk Mar 10, 2025
0cf97d1
feat(sign-up-design): changed regexp, added autocomplete input attrib…
rnastyuk Mar 10, 2025
e89ae1e
feat(sign-up-design): removed console log
rnastyuk Mar 11, 2025
31c1d05
Merge remote-tracking branch 'origin/feat/49-design-sign-up-form' int…
rnastyuk Mar 11, 2025
ca54337
feat(sign-up-design): fixed some styles, added dynamic header button …
rnastyuk Mar 11, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore(primeng-setup): changed all private modifiers to '#'
  • Loading branch information
rnastyuk committed Mar 7, 2025
commit 573142811d8108620b483a1de747fe1790dc31d9
4 changes: 2 additions & 2 deletions src/app/core/components/root/root.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ import { toSignal } from '@angular/core/rxjs-interop';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class RootComponent {
private isPortrait$ = inject(IS_PORTRAIT);
isPortrait = toSignal(this.isPortrait$);
#isPortrait$ = inject(IS_PORTRAIT);
isPortrait = toSignal(this.#isPortrait$);
}
4 changes: 2 additions & 2 deletions src/app/core/services/json-api/json-api.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Injectable } from '@angular/core';
import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { map, Observable } from 'rxjs';
import {
Expand All @@ -10,7 +10,7 @@ import {
providedIn: 'root',
})
export class JsonApiService {
constructor(private http: HttpClient) {}
http: HttpClient = inject(HttpClient);

get<T>(url: string): Observable<T> {
return this.http
Expand Down
41 changes: 23 additions & 18 deletions src/app/features/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,25 @@ import { SetAuthToken, ClearAuth } from '@core/store/auth';
providedIn: 'root',
})
export class AuthService {
private readonly API_URL = 'VALID_API_URL';
private readonly AUTH_TOKEN_KEY = '';
readonly #API_URL = 'VALID_API_URL';
readonly #AUTH_TOKEN_KEY = '';

private readonly http: HttpClient = inject(HttpClient);
private readonly store: Store = inject(Store);
readonly #http: HttpClient = inject(HttpClient);
readonly #store: Store = inject(Store);

//TODO: rewrite/refactor methods according to the API
async login(credentials: LoginCredentials): Promise<void> {
try {
const response = await firstValueFrom(
this.http.post<AuthResponse>(`${this.API_URL}/auth/login`, credentials),
this.#http.post<AuthResponse>(
`${this.#API_URL}/auth/login`,
credentials,
),
);

if (response.accessToken) {
this.setAuthToken(response.accessToken);
this.store.dispatch(new SetAuthToken(response.accessToken));
this.#setAuthToken(response.accessToken);
this.#store.dispatch(new SetAuthToken(response.accessToken));
}
} catch (error) {
console.error('Login failed:', error);
Expand All @@ -33,22 +36,24 @@ export class AuthService {
}

logout(): void {
localStorage.removeItem(this.AUTH_TOKEN_KEY);
this.store.dispatch(new ClearAuth());
localStorage.removeItem(this.#AUTH_TOKEN_KEY);
this.#store.dispatch(new ClearAuth());
}

getAuthToken(): string | null {
return localStorage.getItem(this.AUTH_TOKEN_KEY);
return localStorage.getItem(this.#AUTH_TOKEN_KEY);
}

private setAuthToken(token: string): void {
localStorage.setItem(this.AUTH_TOKEN_KEY, token);
#setAuthToken(token: string): void {
localStorage.setItem(this.#AUTH_TOKEN_KEY, token);
}

private checkInitialAuthState(): void {
const token: string | null = this.getAuthToken();
if (token) {
this.store.dispatch(new SetAuthToken(token));
}
}
// not sure if it's gonna be used, comment out for now

// #checkInitialAuthState(): void {
// const token: string | null = this.getAuthToken();
// if (token) {
// this.#store.dispatch(new SetAuthToken(token));
// }
// }
}
5 changes: 3 additions & 2 deletions src/app/features/auth/sign-up/sign-up.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, inject } from '@angular/core';
import {
FormBuilder,
FormGroup,
Expand Down Expand Up @@ -29,8 +29,9 @@ import { CommonModule } from '@angular/common';
})
export class SignUpComponent {
signUpForm: FormGroup;
fb: FormBuilder = inject(FormBuilder);

constructor(private fb: FormBuilder) {
constructor() {
this.signUpForm = this.fb.group({
fullName: ['', Validators.required],
email: ['', [Validators.required, Validators.email]],
Expand Down