From 051da12e0edd5408c902695fbc45ddd15d7972b1 Mon Sep 17 00:00:00 2001 From: Danail Dimitrov Date: Thu, 11 Mar 2021 21:57:16 +0200 Subject: added upvote post functionality --- src/app/app-constants.module.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'src/app/app-constants.module.ts') diff --git a/src/app/app-constants.module.ts b/src/app/app-constants.module.ts index d72af53..f8722f7 100644 --- a/src/app/app-constants.module.ts +++ b/src/app/app-constants.module.ts @@ -9,6 +9,7 @@ export class AppConstants { public static API_TECHNOLOGY_URL = AppConstants.BASE_API_URL + '/Technology'; public static API_POST_URL = AppConstants.BASE_API_URL + '/Post'; + public static API_RATING_URL = AppConstants.BASE_API_URL + '/Rating'; public static API_FEED_URL = AppConstants.BASE_API_URL + '/Feed'; public static API_COMMENT_URL = AppConstants.BASE_API_URL + '/Comment'; -- cgit v1.2.3 From 533bf3779ac4e4736320fdb5f23746cb5e765105 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Fri, 19 Mar 2021 16:31:26 +0200 Subject: Removed old image assets and added new default user icon asset --- src/app/app-constants.module.ts | 2 +- src/assets/icons/tabler-icon-user.svg | 71 +++++++++++++++++++++++++++++++++ src/assets/images/comment.png | Bin 31366 -> 0 bytes src/assets/images/feed/chat-pic.png | Bin 7634 -> 0 bytes src/assets/images/feed/profile-pic.png | Bin 7870 -> 0 bytes src/assets/images/paper-clip.png | Bin 2923 -> 0 bytes 6 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 src/assets/icons/tabler-icon-user.svg delete mode 100644 src/assets/images/comment.png delete mode 100644 src/assets/images/feed/chat-pic.png delete mode 100644 src/assets/images/feed/profile-pic.png delete mode 100644 src/assets/images/paper-clip.png (limited to 'src/app/app-constants.module.ts') diff --git a/src/app/app-constants.module.ts b/src/app/app-constants.module.ts index f8722f7..39538e0 100644 --- a/src/app/app-constants.module.ts +++ b/src/app/app-constants.module.ts @@ -14,7 +14,7 @@ export class AppConstants { public static API_COMMENT_URL = AppConstants.BASE_API_URL + '/Comment'; public static PAGE_SIZE = 10; - public static FALLBACK_PROFILE_ICON = 'assets/images/feed/profile-pic.png'; + public static FALLBACK_PROFILE_ICON = 'assets/icons/tabler-icon-user.svg'; public static SESSION_TOKEN_KEY = 'UserCred'; public static ADMIN_ROLE_NAME = 'Admin'; diff --git a/src/assets/icons/tabler-icon-user.svg b/src/assets/icons/tabler-icon-user.svg new file mode 100644 index 0000000..37969ec --- /dev/null +++ b/src/assets/icons/tabler-icon-user.svg @@ -0,0 +1,71 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/assets/images/comment.png b/src/assets/images/comment.png deleted file mode 100644 index 5f8e8d9..0000000 Binary files a/src/assets/images/comment.png and /dev/null differ diff --git a/src/assets/images/feed/chat-pic.png b/src/assets/images/feed/chat-pic.png deleted file mode 100644 index 60241fa..0000000 Binary files a/src/assets/images/feed/chat-pic.png and /dev/null differ diff --git a/src/assets/images/feed/profile-pic.png b/src/assets/images/feed/profile-pic.png deleted file mode 100644 index 87f67f5..0000000 Binary files a/src/assets/images/feed/profile-pic.png and /dev/null differ diff --git a/src/assets/images/paper-clip.png b/src/assets/images/paper-clip.png deleted file mode 100644 index 46ce0a7..0000000 Binary files a/src/assets/images/paper-clip.png and /dev/null differ -- 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/app-constants.module.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 ed7f805d265e3162639d329785de0edb8cfc22ff Mon Sep 17 00:00:00 2001 From: Syndamia Date: Thu, 8 Apr 2021 09:19:39 +0300 Subject: Added friends service, from which you could add and remove friends --- src/app/app-constants.module.ts | 1 + src/app/services/friend.service.ts | 44 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/app/services/friend.service.ts (limited to 'src/app/app-constants.module.ts') diff --git a/src/app/app-constants.module.ts b/src/app/app-constants.module.ts index d1bd9f5..67091d9 100644 --- a/src/app/app-constants.module.ts +++ b/src/app/app-constants.module.ts @@ -3,6 +3,7 @@ export class AppConstants { public static API_USER_URL = AppConstants.BASE_API_URL + '/User'; public static API_PROFILE_PICTURE_URL = AppConstants.BASE_API_URL + '/ProfilePicture'; + public static API_FRIENDS_URL = AppConstants.BASE_API_URL + '/Friends'; 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/friend.service.ts b/src/app/services/friend.service.ts new file mode 100644 index 0000000..6821606 --- /dev/null +++ b/src/app/services/friend.service.ts @@ -0,0 +1,44 @@ +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 FriendService { + constructor(private _http: HttpClient, private _tokenService: TokenService) + { } + + postFriendWithSessionStorageRequest(friendUsername: string): Observable { + const userId = this._tokenService.getUserIdFromSessionStorageToken(); + const token = this._tokenService.getTokenFromSessionStorage(); + + return this.postFriendRequest(userId, token, friendUsername); + } + + deleteFriendWithSessionStorageRequest(friendUsername: string): Observable { + const userId = this._tokenService.getUserIdFromSessionStorageToken(); + const token = this._tokenService.getTokenFromSessionStorage(); + + return this.deleteFriendRequest(userId, token, friendUsername); + } + + postFriendRequest(userId: Guid, authToken: string, friendUsername: string): Observable { + const options = { + params: new HttpParams().set('UserId', userId.toString()).set('FriendUsername', friendUsername), + headers: new HttpHeaders().set('Authorization', 'Bearer ' + authToken) + }; + return this._http.post(AppConstants.API_FRIENDS_URL, {}, options); + } + + deleteFriendRequest(userId: Guid, authToken: string, friendUsername: string): Observable { + const options = { + params: new HttpParams().set('UserId', userId.toString()).set('FriendUsername', friendUsername), + headers: new HttpHeaders().set('Authorization', 'Bearer ' + authToken) + }; + return this._http.delete(AppConstants.API_FRIENDS_URL, options); + } +} -- cgit v1.2.3