From 2ff47cbaf362d19395e8182616d363b134c64be5 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Tue, 9 Jul 2024 11:30:05 -0400
Subject: [PATCH] admin fixes

---
 backend/server/adventures/admin.py           |  9 +++++++--
 frontend/src/routes/settings/+page.server.ts | 10 ++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/backend/server/adventures/admin.py b/backend/server/adventures/admin.py
index ff85210..f368e7b 100644
--- a/backend/server/adventures/admin.py
+++ b/backend/server/adventures/admin.py
@@ -1,3 +1,4 @@
+import os
 from django.contrib import admin
 from django.utils.html import mark_safe
 from .models import Adventure
@@ -10,7 +11,9 @@ class AdventureAdmin(admin.ModelAdmin):
 
     def image_display(self, obj):
         if obj.image:
-            return mark_safe(f'<img src="{obj.image.url}" width="100px" height="100px"')
+            public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
+            public_url = public_url.replace("'", "")
+            return mark_safe(f'<img src="{public_url}/media/{obj.image.name}" width="100px" height="100px"')
         else:
             return
 
@@ -48,7 +51,9 @@ class CustomUserAdmin(UserAdmin):
     )
     def image_display(self, obj):
         if obj.profile_pic:
-            return mark_safe(f'<img src="{obj.profile_pic.url}" width="100px" height="100px"')
+            public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
+            public_url = public_url.replace("'", "")
+            return mark_safe(f'<img src="{public_url}/media/{obj.profile_pic.name}" width="100px" height="100px"')
         else:
             return
 
diff --git a/frontend/src/routes/settings/+page.server.ts b/frontend/src/routes/settings/+page.server.ts
index 02f0f43..aabcdb8 100644
--- a/frontend/src/routes/settings/+page.server.ts
+++ b/frontend/src/routes/settings/+page.server.ts
@@ -58,16 +58,16 @@ export const actions: Actions = {
 
 			let currentUser = (await resCurrent.json()) as User;
 
-			if (username === currentUser.username) {
+			if (username === currentUser.username || !username) {
 				username = undefined;
 			}
-			if (first_name === currentUser.first_name) {
+			if (first_name === currentUser.first_name || !first_name) {
 				first_name = undefined;
 			}
-			if (last_name === currentUser.last_name) {
+			if (last_name === currentUser.last_name || !last_name) {
 				last_name = undefined;
 			}
-			if (currentUser.profile_pic && !profile_pic) {
+			if (currentUser.profile_pic && profile_pic?.size === 0) {
 				profile_pic = undefined;
 			}
 
@@ -101,8 +101,6 @@ export const actions: Actions = {
 				return fail(res.status, response);
 			}
 
-			let user = response as User;
-
 			return { success: true };
 		} catch (error) {
 			console.error('Error:', error);