From e8fef550d576aa3eba9d51ea70a3beeac6157ba5 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 14 Mar 2021 09:03:03 +0200 Subject: Renamed all models to have proper naming (from model-name.ts to model-name.model.ts), updated includes of services --- src/app/services/user.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/app/services/user.service.ts') diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts index 31862c4..f22952e 100644 --- a/src/app/services/user.service.ts +++ b/src/app/services/user.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; import { Guid } from 'guid-typescript'; -import { User } from '../../models/identity/user'; +import { User } from '../../models/identity/user.model'; import { FormGroup } from '@angular/forms'; import { AppConstants } from 'src/app/app-constants.module'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { Role } from 'src/models/identity/role'; -import { Friend } from 'src/models/identity/friend'; +import { Role } from 'src/models/identity/role.model'; +import { Friend } from 'src/models/identity/friend.model'; import { TokenService } from './token.service'; @Injectable({ -- cgit v1.2.3 From b78b0d1509ba1f7eae276734254933374544827e Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 22 Mar 2021 16:36:15 +0200 Subject: Service methods that return default object values now return empty string values --- src/app/services/comment.service.ts | 2 +- src/app/services/post.service.ts | 2 +- src/app/services/user.service.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/app/services/user.service.ts') diff --git a/src/app/services/comment.service.ts b/src/app/services/comment.service.ts index 70ab005..9839b01 100644 --- a/src/app/services/comment.service.ts +++ b/src/app/services/comment.service.ts @@ -14,7 +14,7 @@ export class CommentService { { } getDefaultComment(): Comment { - return new Comment(Guid.createEmpty(), Guid.createEmpty(), 'Gosho', 'Trapov', 'gosho_trapov', 'Your opinion on my idea?', new Date()); + return new Comment(Guid.createEmpty(), Guid.createEmpty(), '', '', '', '', new Date()); } /* Requests from session storage */ diff --git a/src/app/services/post.service.ts b/src/app/services/post.service.ts index b49ffea..1a6e021 100644 --- a/src/app/services/post.service.ts +++ b/src/app/services/post.service.ts @@ -15,7 +15,7 @@ export class PostService { { } getDefaultPost(): Post { - return new Post(Guid.createEmpty(), 'Gosho', 'Trapov', 'gosho_trapov', 'Your opinion on my idea?', new Date(), [], [], 0); + return new Post(Guid.createEmpty(), '', '', '', '', new Date(), [], [], 0); } /* Requests from session storage */ diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts index f22952e..29058b4 100644 --- a/src/app/services/user.service.ts +++ b/src/app/services/user.service.ts @@ -17,7 +17,7 @@ export class UserService { { } getDefaultUser(): User { - return new User(Guid.createEmpty(), 'gosho_trapov', 'Gosho', 'Trapov', 'gotra@bg.com', AppConstants.FALLBACK_PROFILE_ICON, [], [], [], []); + return new User(Guid.createEmpty(), '', '', '', '', AppConstants.FALLBACK_PROFILE_ICON, [], [], [], []); } /* Requests from session storage */ -- cgit v1.2.3 From ab8122e2cbeefe55b7dca1aeeb1cbaf830ed25b5 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 29 Mar 2021 15:46:25 +0300 Subject: Fixed update user request in service and in profile settings --- .../profile-settings/profile-settings.component.ts | 2 +- src/app/services/user.service.ts | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/app/services/user.service.ts') diff --git a/src/app/components/profile-settings/profile-settings.component.ts b/src/app/components/profile-settings/profile-settings.component.ts index 4724f02..78a57ec 100644 --- a/src/app/components/profile-settings/profile-settings.component.ts +++ b/src/app/components/profile-settings/profile-settings.component.ts @@ -201,7 +201,7 @@ export class ProfileSettingsComponent implements OnInit { this.patchLanguagesControl(); this.patchTechnologiesControl(); - this._userService.putUserFromSessionStorageRequest(this.updateUserFormGroup, this.user.roles, this.user.friends).subscribe({ + this._userService.putUserFromSessionStorageRequest(this.updateUserFormGroup, this.chosenLanguages, this.chosenTechnologies, this.user.roles, this.user.friends).subscribe({ next: () => { this._successBar.showMsg('Profile updated successfully!'); diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts index 29058b4..10c8c59 100644 --- a/src/app/services/user.service.ts +++ b/src/app/services/user.service.ts @@ -8,6 +8,8 @@ import { Observable } from 'rxjs'; import { Role } from 'src/models/identity/role.model'; import { Friend } from 'src/models/identity/friend.model'; import { TokenService } from './token.service'; +import { Language } from 'src/models/language.model'; +import { Technology } from 'src/models/technology.model'; @Injectable({ providedIn: 'root' @@ -36,11 +38,11 @@ export class UserService { return this.addFriendToUserRequest(userUserName, token, newFriendUserName); } - putUserFromSessionStorageRequest(updateUserFormGroup: FormGroup, userRoles: Role[], userFriends: Friend[]): Observable { + putUserFromSessionStorageRequest(updateUserFormGroup: FormGroup, languages: Language[], technologies: Technology[], userRoles: Role[], userFriends: Friend[]): Observable { const userId = this._tokenService.getUserIdFromSessionStorageToken(); const token = this._tokenService.getTokenFromSessionStorage(); - return this.putUserRequest(userId, token, updateUserFormGroup, userRoles, userFriends); + return this.putUserRequest(userId, token, updateUserFormGroup, languages, technologies, userRoles, userFriends); } putProfilePictureFromSessionStorageRequest(newPicture: File): Observable { @@ -119,7 +121,7 @@ export class UserService { return this._http.get(AppConstants.API_USER_URL + '/GetUser', options); } - putUserRequest(userId: Guid, authToken: string, updateUserFormGroup: FormGroup, userRoles: Role[], userFriends: Friend[]): Observable { + putUserRequest(userId: Guid, authToken: string, updateUserFormGroup: FormGroup, languages: Language[], technologies: Technology[], userRoles: Role[], userFriends: Friend[]): Observable { const body = { UserName: updateUserFormGroup.get('username')?.value, Email: updateUserFormGroup.get('email')?.value, @@ -128,8 +130,8 @@ export class UserService { Password: updateUserFormGroup.get('password')?.value, Roles: userRoles, Friends: userFriends, - Languages: updateUserFormGroup.get('languages')?.value, - Technologies: updateUserFormGroup.get('technologies')?.value + Languages: languages, + Technologies: technologies }; const options = { params: new HttpParams().set('Id', userId.toString()), -- cgit v1.2.3 From 386b25c583c1a1632282beab91537ff54e1bce83 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Wed, 7 Apr 2021 21:13:28 +0300 Subject: Added profile picture service and removed put profile picture from user service --- src/app/app-constants.module.ts | 1 + src/app/services/profile-picture.service.ts | 32 +++++++++++++++++++++++++++++ src/app/services/user.service.ts | 17 --------------- 3 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 src/app/services/profile-picture.service.ts (limited to 'src/app/services/user.service.ts') diff --git a/src/app/app-constants.module.ts b/src/app/app-constants.module.ts index 39538e0..d1bd9f5 100644 --- a/src/app/app-constants.module.ts +++ b/src/app/app-constants.module.ts @@ -2,6 +2,7 @@ export class AppConstants { public static BASE_API_URL = 'http://localhost:5000/api'; public static API_USER_URL = AppConstants.BASE_API_URL + '/User'; + public static API_PROFILE_PICTURE_URL = AppConstants.BASE_API_URL + '/ProfilePicture'; public static API_USER_LOGIN_URL = AppConstants.API_USER_URL + '/login'; public static API_USER_REGISTER_URL = AppConstants.API_USER_URL + '/register'; diff --git a/src/app/services/profile-picture.service.ts b/src/app/services/profile-picture.service.ts new file mode 100644 index 0000000..8b9d0a3 --- /dev/null +++ b/src/app/services/profile-picture.service.ts @@ -0,0 +1,32 @@ +import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Guid } from 'guid-typescript'; +import { Observable } from 'rxjs'; +import { AppConstants } from '../app-constants.module'; +import { TokenService } from './token.service'; + +@Injectable({ + providedIn: 'root' +}) +export class ProfilePictureService { + constructor(private _http: HttpClient, private _tokenService: TokenService) + { } + + putPictureWithSessionStorageRequest(newPicture: File): Observable { + const userId = this._tokenService.getUserIdFromSessionStorageToken(); + const token = this._tokenService.getTokenFromSessionStorage(); + + return this.putRatingRequest(userId, token, newPicture); + } + + putRatingRequest(userId: Guid, authToken: string, newPicture: File): Observable { + const options = { + params: new HttpParams().set('UserId', userId.toString()), + headers: new HttpHeaders().set('Authorization', 'Bearer ' + authToken) + }; + const form = new FormData(); + form.append('picture', newPicture); + + return this._http.put(AppConstants.API_PROFILE_PICTURE_URL, form, options); + } +} diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts index 10c8c59..e910ada 100644 --- a/src/app/services/user.service.ts +++ b/src/app/services/user.service.ts @@ -45,13 +45,6 @@ export class UserService { return this.putUserRequest(userId, token, updateUserFormGroup, languages, technologies, userRoles, userFriends); } - putProfilePictureFromSessionStorageRequest(newPicture: File): Observable { - const userId = this._tokenService.getUserIdFromSessionStorageToken(); - const token = this._tokenService.getTokenFromSessionStorage(); - - return this.putProfilePictureRequest(userId, token, newPicture); - } - putBareUserFromSessionStorageRequest(user: User, password: string): Observable { const userId = this._tokenService.getUserIdFromSessionStorageToken(); const token = this._tokenService.getTokenFromSessionStorage(); @@ -150,16 +143,6 @@ export class UserService { return this._http.put(AppConstants.API_USER_URL, body, options); } - putProfilePictureRequest(userId: Guid, authToken: string, newPicture: File): Observable { - const form = new FormData(); - form.append('picture', newPicture); - const options = { - params: new HttpParams().set('UserId', userId.toString()), - headers: new HttpHeaders().set('Authorization', 'Bearer ' + authToken) - }; - return this._http.put(AppConstants.API_USER_URL + '/ProfilePicture', form, options); - } - deleteUserRequest(userId: Guid, authToken: string): Observable { const options = { params: new HttpParams().set('Id', userId.toString()), -- cgit v1.2.3 From 3b778aef651fe9383a281c4c2999f21312ea28ba Mon Sep 17 00:00:00 2001 From: Syndamia Date: Thu, 8 Apr 2021 09:24:10 +0300 Subject: Removed unused bare user requests from user service --- src/app/services/user.service.ts | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/app/services/user.service.ts') diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts index e910ada..690fff5 100644 --- a/src/app/services/user.service.ts +++ b/src/app/services/user.service.ts @@ -45,13 +45,6 @@ export class UserService { return this.putUserRequest(userId, token, updateUserFormGroup, languages, technologies, userRoles, userFriends); } - putBareUserFromSessionStorageRequest(user: User, password: string): Observable { - const userId = this._tokenService.getUserIdFromSessionStorageToken(); - const token = this._tokenService.getTokenFromSessionStorage(); - - return this.putBareUserRequest(userId, token, user, password); - } - deleteUserFromSessionStorageRequest(): Observable { const userId = this._tokenService.getUserIdFromSessionStorageToken(); const token = this._tokenService.getTokenFromSessionStorage(); @@ -133,16 +126,6 @@ export class UserService { return this._http.put(AppConstants.API_USER_URL, body, options); } - putBareUserRequest(userId: Guid, authToken: string, user: User, password: string): Observable { - const body: object = user; - Object.assign(body, { password: password }); - const options = { - params: new HttpParams().set('Id', userId.toString()), - headers: new HttpHeaders().set('Authorization', 'Bearer ' + authToken) - }; - return this._http.put(AppConstants.API_USER_URL, body, options); - } - deleteUserRequest(userId: Guid, authToken: string): Observable { const options = { params: new HttpParams().set('Id', userId.toString()), -- cgit v1.2.3