From 0522f28b6178060706031e4b81ef30848f803209 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Wed, 3 Feb 2021 10:44:54 +0200
Subject: Fixed profile picture in front-end model

---
 .../src/app/components/comment/comment.component.html      |  2 +-
 .../src/app/components/feed/feed.component.html            |  4 ++--
 .../src/app/components/post/post.component.html            |  2 +-
 .../src/app/components/profile/profile.component.html      |  2 +-
 src/DevHive.Angular/src/models/identity/user.ts            | 14 +++++++-------
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/DevHive.Angular/src/app/components/comment/comment.component.html b/src/DevHive.Angular/src/app/components/comment/comment.component.html
index 8908b25..718e25c 100644
--- a/src/DevHive.Angular/src/app/components/comment/comment.component.html
+++ b/src/DevHive.Angular/src/app/components/comment/comment.component.html
@@ -3,7 +3,7 @@
 <div class="comment rounded-border" *ngIf="loaded">
 	<div class="content">
 		<div class="author" (click)="goToAuthorProfile()">
-			<img class="round-image" [src]="user.imageUrl">
+			<img class="round-image" [src]="user.profilePictureURL">
 			<div class="author-info">
 				<div class="name">
 					{{ user.firstName }} {{ user.lastName }}
diff --git a/src/DevHive.Angular/src/app/components/feed/feed.component.html b/src/DevHive.Angular/src/app/components/feed/feed.component.html
index 6d3da5f..c584055 100644
--- a/src/DevHive.Angular/src/app/components/feed/feed.component.html
+++ b/src/DevHive.Angular/src/app/components/feed/feed.component.html
@@ -3,7 +3,7 @@
 <div id="feed-page" *ngIf="dataArrived">
 	<nav id="profile-bar" class="round-image rounded-border">
 		<div id="profile-info" (click)="goToProfile()">
-			<img id="profile-bar-profile-pic" [src]="user.imageUrl" alt=""/>
+			<img id="profile-bar-profile-pic" class="round-image" [src]="user.profilePictureURL" alt=""/>
 			<div id="profile-bar-name">
 				{{ user.firstName }} {{ user.lastName }}
 			</div>
@@ -17,7 +17,7 @@
 	<div id="feed-content">
 		<nav id="top-bar">
 			<div id="main-content">
-				<img id="top-bar-profile-pic" class="round-image" [src]="user.imageUrl" alt="" (click)="goToProfile()">
+				<img id="top-bar-profile-pic" class="round-image" [src]="user.profilePictureURL" alt="" (click)="goToProfile()">
 				<form id="create-post-form" class="rounded-border" [formGroup]="createPostFormGroup" (ngSubmit)="createPost()">
 					<div id="form-inputs">
 						<input id="top-bar-create-post" type="text" formControlName="newPostMessage" placeholder="What's on your mind?"/>
diff --git a/src/DevHive.Angular/src/app/components/post/post.component.html b/src/DevHive.Angular/src/app/components/post/post.component.html
index 7347056..bc0d84a 100644
--- a/src/DevHive.Angular/src/app/components/post/post.component.html
+++ b/src/DevHive.Angular/src/app/components/post/post.component.html
@@ -3,7 +3,7 @@
 <div class="post rounded-border" *ngIf="loaded">
 	<div class="content">
 		<div class="author" (click)="goToAuthorProfile()">
-			<img class="round-image" [src]="user.imageUrl">
+			<img class="round-image" [src]="user.profilePictureURL">
 			<div class="author-info">
 				<div class="name">
 					{{ user.firstName }} {{ user.lastName }}
diff --git a/src/DevHive.Angular/src/app/components/profile/profile.component.html b/src/DevHive.Angular/src/app/components/profile/profile.component.html
index e2dacd1..03a36bf 100644
--- a/src/DevHive.Angular/src/app/components/profile/profile.component.html
+++ b/src/DevHive.Angular/src/app/components/profile/profile.component.html
@@ -10,7 +10,7 @@
 	<hr>
 	<div class="scroll-standalone" (scroll)="onScroll($event)">
 		<div id="main-info" class="rounded-border">
-			<img class="round-image" [src]="user.imageUrl" alt=""/>
+			<img class="round-image" [src]="user.profilePictureURL" alt=""/>
 			<div id="other-main-info">
 				<div id="name">
 					{{ user.firstName }} {{ user.lastName }}
diff --git a/src/DevHive.Angular/src/models/identity/user.ts b/src/DevHive.Angular/src/models/identity/user.ts
index 020a403..e0038e0 100644
--- a/src/DevHive.Angular/src/models/identity/user.ts
+++ b/src/DevHive.Angular/src/models/identity/user.ts
@@ -10,19 +10,19 @@ export class User {
   private _firstName : string;
   private _userName : string;
   private _email: string;
-  private _imageUrl : string;
+  private _profilePictureURL : string;
   private _languages: Language[];
   private _technologies: Technology[];
   private _roles: Role[];
   private _friends: Friend[];
 
-  constructor(id: Guid, userName: string, firstName: string, lastName: string, email: string, imageUrl: string, languages: Language[], technologies: Technology[], roles: Role[], friends: Friend[]) {
+  constructor(id: Guid, userName: string, firstName: string, lastName: string, email: string, profilePictureURL: string, languages: Language[], technologies: Technology[], roles: Role[], friends: Friend[]) {
     this.id = id;
     this.userName = userName;
     this.firstName = firstName;
     this.lastName = lastName;
     this.email = email;
-    this.imageUrl = imageUrl;
+    this._profilePictureURL = profilePictureURL;
     this.languages = languages;
     this.technologies = technologies;
     this.roles = roles;
@@ -63,11 +63,11 @@ export class User {
     this._email = v;
   }
 
-  public get imageUrl(): string {
-    return this._imageUrl;
+  public get profilePictureURL(): string {
+    return this._profilePictureURL;
   }
-  public set imageUrl(v: string) {
-    this._imageUrl = v;
+  public set profilePictureURL(v: string) {
+    this._profilePictureURL = v;
   }
 
   public get languages(): Language[] {
-- 
cgit v1.2.3