components/Message.vue

@@ -55,6 +55,10 @@ const dateHidden = ref<boolean>(true);
 
 const date = new Date(props.timestamp);
 
+console.log("Message.vue: message:", props.text);
+console.log("Message.vue: message type:", props.type);
+console.log("Message.vue: is last?", props.last);
+
 let dateHour = date.getHours();
 let dateMinute = date.getMinutes();
 if (props.format == "12") {
@@ -71,12 +75,7 @@ if (props.format == "12") {
 	messageDate.value = `${dateHour}:${dateMinute < 10 ? "0" + dateMinute : dateMinute}`
 }
 
-console.log("message:", props.text);
+onMounted(() => {
-console.log("author:", props.username);
-
-onMounted(async () => {
-	console.log("adding listeners")
-	await nextTick();
 	messageElement.value?.addEventListener("mouseenter", (e: Event) => {
 		dateHidden.value = false;
 	});
@@ -84,7 +83,6 @@ onMounted(async () => {
 	messageElement.value?.addEventListener("mouseleave", (e: Event) => {
 		dateHidden.value = true;
 	});
-	console.log("added listeners");
 });
 
 //function toggleTooltip(e: Event) {

components/MessageArea.vue

@@ -4,7 +4,7 @@
 			<Message v-for="(message, i) of messages" :username="message.user.display_name ?? message.user.username"
 				:text="message.message" :timestamp="messageTimestamps[message.uuid]" :img="message.user.avatar"
 				format="12" :type="messagesType[message.uuid]"
-				:margin-bottom="(messages[i + 1] && messagesType[messages[i + 1].uuid] == 'normal') ?? false"
+				:margin-bottom="messages[i + 1] && messagesType[messages[i + 1].uuid] == 'normal'"
 				:last="i == messages.length - 1" />
 		</div>
 		<div id="message-box" class="rounded-corners">
@@ -34,28 +34,13 @@ const messagesRes: MessageResponse[] | undefined = await fetchWithApi(
 	{ query: { "amount": props.amount ?? 100, "offset": props.offset ?? 0 } }
 );
 
-const firstMessageByUsers = ref<Record<string, MessageResponse | undefined>>({});
+function groupMessage(message: MessageResponse) {
-const previousMessage = ref<MessageResponse>();
-
-function groupMessage(message: MessageResponse, options?: { prevMessage?: MessageResponse, reverse?: boolean }) {
 	messageTimestamps.value[message.uuid] = uuidToTimestamp(message.uuid);
+
 		console.log("message:", message.message);
-	console.log("author:", message.user.username, `(${message.user.uuid})`);
-
-	if (!previousMessage.value || previousMessage.value && message.user.uuid != previousMessage.value.user.uuid) {
-		console.log("no previous message or author is different than last messsage's");
-		messagesType.value[message.uuid] = "normal";
-		previousMessage.value = message;
-		console.log("set previous message to:", previousMessage.value.message);
-		console.log(`setting first post by user ${message.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
-		firstMessageByUsers.value[message.user.uuid] = message;
-		return;
-	}
-
-
 		const firstByUser = firstMessageByUsers.value[message.user.uuid];
 		if (firstByUser) {
-		console.log("first by user exists:", firstByUser);
+			console.log("first by user exists");
 			if (message.user.uuid != firstByUser.user.uuid) {
 				console.log("message is by new user, setting their first message")
 				firstMessageByUsers.value[message.user.uuid] = message;
@@ -74,10 +59,9 @@ function groupMessage(message: MessageResponse, options?: { prevMessage?: Messag
 		
 		const prevTimestamp = messageTimestamps.value[firstByUser.uuid];
 		const timestamp = messageTimestamps.value[message.uuid];
-	
 		console.log("first message timestamp:", prevTimestamp);
 		console.log("timestamp:", timestamp);
-	const diff = Math.abs(timestamp - prevTimestamp);
+		const diff = (timestamp - prevTimestamp);
 		console.log("min diff:", messageGroupingMaxDifference);
 		console.log("diff:", diff);
 		const lessThanMax = diff <= messageGroupingMaxDifference;
@@ -93,6 +77,7 @@ function groupMessage(message: MessageResponse, options?: { prevMessage?: Messag
 		messagesType.value[message.uuid] = "grouped";
 }
 
+const firstMessageByUsers = ref<Record<string, MessageResponse | undefined>>({});
 if (messagesRes) {
 	messagesRes.reverse();
 	console.log("messages res:", messagesRes.map(msg => msg.message));
@@ -112,7 +97,6 @@ if (messagesRes) messages.value = messagesRes;
 const accessToken = useCookie("access_token").value;
 const apiBase = useCookie("api_base").value;
 const { refresh } = useAuth();
-const { fetchMessages } = useApi();
 
 let ws: WebSocket;
 
@@ -163,42 +147,9 @@ function sendMessage(e: Event) {
 	}
 }
 
-const route = useRoute();
-
 onMounted(async () => {
-	if (import.meta.server) return;
 	if (messagesElement.value) {
 		scrollToBottom(messagesElement);
-		let fetched = false;
-		const amount = messages.value.length;
-		let offset = messages.value.length;
-		messagesElement.value.addEventListener("scroll", async (e) => {
-			if (e.target) {
-				const target = e.target as HTMLDivElement;
-				if (target.scrollTop <= target.scrollHeight * 0.1) {
-					if (fetched) return;
-					fetched = true;
-					console.log("scroll height is at 10% or less");
-					//console.log("current oldest:", currentOldestMessage);
-					const olderMessages = await fetchMessages(route.params.channelId as string, { amount, offset });
-					if (olderMessages) {
-						olderMessages.reverse();
-						console.log("older messages:", olderMessages);
-						if (olderMessages.length == 0) return;
-						for (const [i, oldMessage] of olderMessages.entries()) {
-							console.log("old message:", oldMessage);
-							messages.value.unshift(oldMessage);
-							for (const message of messages.value) {
-								groupMessage(message);
-							}
-						}
-						offset += offset;
-					}
-				} else {
-					fetched = false;
-				}
-			}
-		});
 	}
 });
 

components/Userpopup.vue

@@ -3,12 +3,8 @@
     <img v-if="props.user.avatar" id="avatar" :src="props.user.avatar" alt="profile avatar">
     <div id="cover-colour"></div>
     <div id="main-body">
-      <p id="display-name">
+      <p id="display-name"><strong>{{ props.user.display_name || "display_name" }}</strong></p>
-        <strong>{{ props.user.display_name || "display_name" }}</strong>
+      <p id="username"> {{ props.user.username || "username" }}</p>
-      </p>
-      <p id="username-and-pronouns">
-        {{ props.user.username || "username" }} - {{ props.user.pronouns || "un/defined" }} 
-      </p>
       <div id="about-me">
         <span>About me</span>
       </div>
@@ -22,15 +18,15 @@ import type { UserResponse } from '~/types/interfaces';
 const { fetchMembers } = useApi();
 
 const props = defineProps<{
-	user: UserResponse | any, // actually UserResponse | null but TS is yelling at me again
+	user: UserResponse,
 }>();
 
 </script>
 
 <style scoped>
 #profile-popup {
-  min-width: 300px;
+  min-width: 200px;
-  max-width: 300px;
+  max-width: 200px;
   border-radius: 8px;
   position: relative;
   display: flex;
@@ -38,44 +34,46 @@ const props = defineProps<{
 }
 
 #cover-colour {
-  border-radius: 12px 12px 0 0;
+  border-radius: 8px 8px 0 0;
-  min-height: 60px;
+  min-height: 52px;
   background-color: #442505;
 }
 
 #main-body {
-  border-radius: 0 0 12px 12px;
+  border-radius: 0 0 8px 8px;
-  padding: 12px;
+  padding: 8px;
-  min-height: 280px;
+  min-height: 180px;
   background-color: #4b3018;
   overflow-wrap: break-word;
   hyphens: manual;
 }
 
 #avatar {
-  width: 96px;
+  width: 64px;
-  height: 96px;
+  border: 4px solid #4b3018;
-  border: 5px solid #4b3018;
   border-radius: 100%;
   position: absolute;
-  left: 16px;
+  left: 12px;
-  top: 16px;
+  top: 12px;
 }
 
 #display-name {
-  margin-top: 60px;
+  margin-top: 28px;
   margin-bottom: 0;
-  font-size: 28px;
+  font-size: 18px;
 }
 
-#username-and-pronouns {
+#username {
-  margin: 2px;
+  margin-top: 2px;
-  font-size: 16px;
+  margin-bottom: 0;
+  font-size: 12px;
 }
 
 #about-me {
   margin-top: 4px;
   padding: 4px;
-  font-size: 16px;
+  font-size: 14px;
 }
+
+
 </style>

components/buttons/Button.vue

@@ -28,11 +28,11 @@ const props = defineProps<{
 	background-color: #b35719;
 	color: #ffffff;
 
-	padding: 8px 18px;
+	padding: 8px 16px;
-	font-size: 18px;
+	font-size: 16px;
 	transition: background-color 0.2s;
 
-	border-radius: 12px;
+	border-radius: 16px;
 	text-decoration: none;
 	display: inline-block;
 }

components/buttons/ButtonScary.vue

@@ -28,11 +28,11 @@ const props = defineProps<{
 	background-color: #f02f2f;
 	color: #ffffff;
 
-	padding: 8px 18px;
+	padding: 8px 16px;
-	font-size: 18px;
+	font-size: 16px;
 	transition: background-color 0.2s;
 
-	border-radius: 12px;
+	border-radius: 16px;
 	text-decoration: none;
 	display: inline-block;
 }

components/settings/user_settings/Account.vue

@@ -2,30 +2,9 @@
   <div>
     <h1>My Account</h1>
     
-    <div class="profile-and-user-data-fields">
+    <div id="profile-container">
-      <div class="user-data-fields">
+      <Userpopup :user=user_me></Userpopup>
-        <h3 class="subtitle">AVATAR</h3>
-        <Button text="Change Avatar" :callback="changeAvatar"></Button>
-        <Button text="Remove Avatar" :callback="removeAvatar" style="margin-left: 10px; background-color: grey;"></Button>
-        <h3 class="subtitle">DISPLAY NAME</h3>
-        <input type="text" v-model="user.display_name" placeholder="Enter display name" />
-        <h3 class="subtitle">USERNAME</h3>
-        <input type="text" v-model="user.username" placeholder="Enter username" />
-        <h3 class="subtitle">PRONOUNS</h3>
-        <input type="text" v-model="user.pronouns" placeholder="Enter pronouns" />
-        <h3 class="subtitle">ABOUT ME</h3>
-        <p>{{ user?.about_me || "TBD" }}</p>
-
-        <Button text="Save Changes" :callback="saveChanges"></Button>
     </div>
-      <Userpopup :user=user_me class="profile"></Userpopup>
-    </div>
-
-    <!-- i love html -->
-    <br>
-    <br>
-    <br>
-    <br>
 
     <h2>Password (and eventually authenticator)</h2>
     <Button text="Reset Password (tbd)" :callback=resetPassword></Button> 
@@ -40,81 +19,10 @@
 import Button from '~/components/buttons/Button.vue';
 import ButtonScary from '~/components/buttons/ButtonScary.vue';
 
-const { fetchUser } = useAuth();
+const { user, fetchUser } = useAuth();
 
 const user_me = await fetchUser()
-let user_reference = Object.assign({}, user_me)
-const user = user_me!
 
-let new_pfp_file: any = null
-
-const saveChanges = async () => {
-  try {
-    const formData = new FormData()
-
-    if (new_pfp_file) {
-      formData.append('avatar', new_pfp_file, new_pfp_file.name)
-      new_pfp_file = null
-    }
-    
-    // oh lord praise deep seek v3
-    const jsonBlob = new Blob(
-      [JSON.stringify({
-        display_name: user.display_name,
-        username: user.username,
-        pronouns: user.pronouns,
-      })], 
-      { type: 'application/json' }
-    );
-    formData.append('json', jsonBlob, 'data.json');
-    
-    await fetchWithApi("/me", {
-      method: "PATCH",
-      body: formData
-    })
-
-    user_reference = Object.assign({}, user_me)
-    alert("success!!")
-  } catch (error: any) {
-    if (error?.response?.status !== 200) {
-      const errorData = await error?.response?.json()
-
-      alert(`error ${error?.response?.status} met whilst trying to update profile info\n${errorData}`)
-    }
-  }  
-};
-
-
-const removeAvatar = async () => {
-  alert("TBD")
-  // await fetchWithApi(`/auth/reset-password`);
-}
-
-const changeAvatar = async () => {
-  try {
-    let input = document.createElement('input');
-    input.type = 'file';
-    input.accept = 'image/*';
-
-    input.onchange = async(e) => {
-      const file = e.target.files?.[0];
-      if (!file) return;
-
-      new_pfp_file = file;
-
-      const reader = new FileReader();
-      reader.onload = (e) => {
-        user.avatar = e?.target?.result;
-      };
-      reader.readAsDataURL(file);
-    }
-    
-    input.oncancel = () => alert("cancelled upload!");
-    input.click();
-  } catch (err) {
-    console.error('User canceled or error:', err);
-  }
-}
 
 const resetPassword = async () => {
   alert("TBD")
@@ -127,24 +35,11 @@ const deleteAccount = async () => {
 </script>
 
 <style scoped>
-.profile-container {
+#profile-container {
+  border: 2px solid orange;
   min-width: 250px;
   min-height: 200px;
   padding: 8px;
   border-radius: 8px;
 }
-
-.profile-and-user-data-fields {
-  display: flex;
-}
-
-.profile-container, .user-data-fields {
-  min-width: 350px;
-}
-
-.subtitle {
-  font-size: 14px;
-  font-weight: 800;
-  margin: 12px 0;
-}
 </style>

pages/settings.vue

@@ -115,8 +115,8 @@ const selectCategory = (_category: Category, page: Page) => {
 }
 
 #sidebar {
-  min-width: 250px;
+  min-width: 200px;
-  max-width: 250px;
+  max-width: 200px;
   background-color: #2f3136;
   color: white;
   padding: 10px;
@@ -127,7 +127,7 @@ const selectCategory = (_category: Category, page: Page) => {
 }
 
 #sidebar h2 {
-  font-size: 2em;
+  font-size: 1.5em;
   padding: 0 8px;
 }
 
@@ -140,7 +140,6 @@ const selectCategory = (_category: Category, page: Page) => {
 #sidebar li {
   border-radius: 8px;
   padding: 8px;
-  font-size: 1.3em;
   margin: 2px 0;
   cursor: pointer;
   transition: background-color 0.3s;
@@ -156,7 +155,7 @@ const selectCategory = (_category: Category, page: Page) => {
 
 #sub_page {
   flex-grow: 1;
-  max-width: 800px;
+  max-width: 600px;
   margin-left: 1.5rem;
   margin-right: auto;
 

types/interfaces.ts

@@ -59,7 +59,6 @@ export interface UserResponse {
 	display_name: string | null,
 	avatar: string | null,
 	pronouns: string | null,
-	about_me: string | null,
 	email?: string,
 	email_verified?: boolean
   }