From b41a8d93ab6ee368de245bc670acdfb9a0f138fc Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 21 Jan 2022 05:37:06 -0500
Subject: [PATCH] Add profile pictures

---
 .../Pages/Partials/UserCardPartial.cshtml     | 47 ++++++++++---------
 ProjectLighthouse/Pages/UserPage.cshtml       | 24 ++++++----
 ProjectLighthouse/Types/User.cs               | 13 +++++
 3 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/ProjectLighthouse/Pages/Partials/UserCardPartial.cshtml b/ProjectLighthouse/Pages/Partials/UserCardPartial.cshtml
index 6832c030..ec1c2b06 100644
--- a/ProjectLighthouse/Pages/Partials/UserCardPartial.cshtml
+++ b/ProjectLighthouse/Pages/Partials/UserCardPartial.cshtml
@@ -6,28 +6,31 @@
 }
 
 <div class="ui grid">
-    <div class="eight wide column">
-        @if (showLink)
-        {
-            <h2 style="margin-bottom: 2px;">
-                <a href="~/user/@Model.UserId">@Model.Username</a>
-            </h2>
-        }
-        else
-        {
-            <h1 style="margin-bottom: 2px;">
-                @Model.Username
-            </h1>
-        }
-        <p>
-            <i>@Model.Status</i>
-        </p>
-        <div class="statsUnderTitle">
-            <i class="pink heart icon" title="Hearts"></i> <span>@Model.Hearts</span>
-            <i class="blue comment icon" title="Comments"></i> <span>@Model.Comments</span>
-            <i class="green upload icon" title="Uploaded Levels"></i><span>@Model.UsedSlots / @ServerSettings.Instance.EntitledSlots</span>
-            <i class="purple camera icon" title="Uploaded Photos"></i><span>@Model.PhotosByMe</span>
+    <div class="eight wide column" style="display: flex;">
+        <div style="margin-right: 10px; background-image: url('/gameAssets/@Model.WebsiteAvatarHash'); height: 100px; width: 100px; background-size: cover; background-position: center; border-radius: .28571429rem;">
+        </div>
+        <div style="height: fit-content; vertical-align: center; align-self: center">
+            @if (showLink)
+            {
+                <h2 style="margin-bottom: 2px;">
+                    <a href="~/user/@Model.UserId">@Model.Username</a>
+                </h2>
+            }
+            else
+            {
+                <h1 style="margin-bottom: 2px;">
+                    @Model.Username
+                </h1>
+            }
+            <p>
+                <i>@Model.Status</i>
+            </p>
+            <div class="statsUnderTitle">
+                <i class="pink heart icon" title="Hearts"></i> <span>@Model.Hearts</span>
+                <i class="blue comment icon" title="Comments"></i> <span>@Model.Comments</span>
+                <i class="green upload icon" title="Uploaded Levels"></i><span>@Model.UsedSlots / @ServerSettings.Instance.EntitledSlots</span>
+                <i class="purple camera icon" title="Uploaded Photos"></i><span>@Model.PhotosByMe</span>
+            </div>
         </div>
     </div>
-
 </div>
\ No newline at end of file
diff --git a/ProjectLighthouse/Pages/UserPage.cshtml b/ProjectLighthouse/Pages/UserPage.cshtml
index f70ceeb2..87f6ecc0 100644
--- a/ProjectLighthouse/Pages/UserPage.cshtml
+++ b/ProjectLighthouse/Pages/UserPage.cshtml
@@ -38,17 +38,21 @@
 }
 
 <div class="ui grid">
-    <div class="eight wide column">
-        <h1>@Model.Title</h1>
-        <p>
-            <i>@Model.ProfileUser!.Status</i>
-        </p>
+    <div class="eight wide column" style="display: flex">
+        <div style="margin-right: 10px; background-image: url('/gameAssets/@Model.ProfileUser.WebsiteAvatarHash'); height: 100px; width: 100px; background-size: cover; background-position: center; border-radius: .28571429rem;">
+        </div>
+        <div style="height: fit-content; vertical-align: center; align-self: center">
+            <h1>@Model.Title</h1>
+            <p>
+                <i>@Model.ProfileUser!.Status</i>
+            </p>
 
-        <div class="statsUnderTitle">
-            <i class="pink heart icon" title="Hearts"></i> <span>@Model.ProfileUser.Hearts</span>
-            <i class="blue comment icon" title="Comments"></i> <span>@Model.ProfileUser.Comments</span>
-            <i class="green upload icon" title="Uploaded Levels"></i><span>@Model.ProfileUser.UsedSlots / @ServerSettings.Instance.EntitledSlots</span>
-            <i class="purple camera icon" title="Uploaded Photos"></i><span>@Model.ProfileUser.PhotosByMe</span>
+            <div class="statsUnderTitle">
+                <i class="pink heart icon" title="Hearts"></i> <span>@Model.ProfileUser.Hearts</span>
+                <i class="blue comment icon" title="Comments"></i> <span>@Model.ProfileUser.Comments</span>
+                <i class="green upload icon" title="Uploaded Levels"></i><span>@Model.ProfileUser.UsedSlots / @ServerSettings.Instance.EntitledSlots</span>
+                <i class="purple camera icon" title="Uploaded Photos"></i><span>@Model.ProfileUser.PhotosByMe</span>
+            </div>
         </div>
     </div>
     <div class="eight wide right aligned column">
diff --git a/ProjectLighthouse/Types/User.cs b/ProjectLighthouse/Types/User.cs
index 3e2384e4..e47b45a4 100644
--- a/ProjectLighthouse/Types/User.cs
+++ b/ProjectLighthouse/Types/User.cs
@@ -25,6 +25,19 @@ public class User
     /// </summary>
     public string Biography { get; set; }
 
+    [NotMapped]
+    public string WebsiteAvatarHash {
+        get {
+            string avatarHash = this.IconHash;
+
+            if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.YayHash;
+            if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.MehHash;
+            if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.BooHash;
+
+            return avatarHash;
+        }
+    }
+
     [NotMapped]
     public int Reviews {
         get {