components/CropPopup.vue

@@ -1,14 +1,15 @@
 <template>
   <div id="fullscreen-container">
     <div id="crop-preview">
-      <img ref="image" :src="imageSrc" style="min-height: 35dvh;">
+      <img ref="image" :src="imageSrc" style="min-height: 500px;">
-      <Button text="Crop" :callback="cropImage"></Button>
+      <Button class="button" text="Crop" :callback="cropImage"></Button>
-      <Button text="Cancel" :callback="closePopup"></Button>
+      <Button class="button" text="Cancel" :callback="closePopup"></Button>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
+import { ref, watch } from 'vue';
 import Cropper from 'cropperjs';
 
 const props = defineProps({
@@ -81,7 +82,7 @@ function closePopup() {
   width: 100%;
   height: 100%;
   z-index: 10;
-  background: rgba(0, 0, 0, 0.5);
+  background: rgba(0,0,0,0.5);
 }
 
 #crop-preview {

components/MessageArea.vue

@@ -158,12 +158,10 @@ if (accessToken && apiBase) {
 
 function sendMessage(e: Event) {
 	e.preventDefault();
-	const message = {
+	const text = messageInput.value;
-		message: messageInput.value
+	console.log("text:", text);
-	}
+	if (text) {
-	console.log("message:", message);
+		ws.send(text);
-	if (message.message) {
-		ws.send(JSON.stringify(message));
 		messageInput.value = "";
 		console.log("MESSAGE SENT!!!");
 	}

components/Settings/UserSettings/Profile.vue

@@ -33,19 +33,22 @@
 </template>
 
 <script lang="ts" setup>
+import Button from '~/components/Button.vue';
+import CropPopup from '~/components/CropPopup.vue';
 import type { UserResponse } from '~/types/interfaces';
 
-let newPfpFile: File;
-const isCropPopupVisible = ref(false);
-const cropImageSrc = ref("")
-;
 const { fetchUser } = useAuth();
 
+
 const user: UserResponse | undefined = await fetchUser()
 if (!user) {
   alert("could not fetch user info, aborting :(")
 }
 
+let newPfpFile: File;
+const isCropPopupVisible = ref(false);
+const cropImageSrc = ref('');
+
 async function saveChanges() {
   if (!user) return;
   

composables/auth.ts

@@ -37,19 +37,13 @@ export const useAuth = () => {
     //await fetchUser();
   }
 
-  async function logout() {
+  async function logout(password: string) {
+    console.log("password:", password);
     console.log("access:", accessToken.value);
-
-    await fetchWithApi("/auth/logout", { method: "GET", credentials: "include" });
-    clearAuth();
-
-	return await navigateTo("/login");
-  }
-
-  async function revoke(password: string) {
     const hashedPass = await hashPassword(password);
+    console.log("hashed");
 
-    await fetchWithApi("/auth/revoke", {
+    const res = await fetchWithApi("/auth/revoke", {
       method: "POST",
       body:
       {
@@ -60,6 +54,10 @@ export const useAuth = () => {
     clearAuth();
   }
 
+  async function revoke() {
+    clearAuth();
+  }
+
   async function refresh() {
     console.log("refreshing");
     const res = await fetchWithApi("/auth/refresh", {

nuxt.config.ts

@@ -27,9 +27,7 @@ export default defineNuxtConfig({
   runtimeConfig: {
     public: {
       apiVersion: 1,
-      messageGroupingMaxDifference: 300000,
+      messageGroupingMaxDifference: 300000
-      buildTimeString: new Date().toISOString(),
-      gitHash: process.env.GIT_SHORT_REV || "N/A",
     }
   },
   /* nitro: {

pages/servers/[serverId]/channels/[channelId].vue

@@ -100,7 +100,6 @@ function handleMemberClick(member: GuildMemberResponse) {
 	display: flex;
 	flex-direction: column;
 	overflow-y: scroll;
-	max-height: 92dvh;
 	padding-left: 1dvw;
 	padding-right: 1dvw;
 	margin-top: 1dvh;

pages/settings.vue

@@ -2,8 +2,8 @@
   <div id="settings-page-container">
     <div id="settings-page">
       <div id="sidebar">
+        <h4>(Search bar here)</h4>
         <ul>
-          <!-- categories and dynamic settings pages -->
           <div v-for="category in categories" :key="category.displayName">
             <h2>{{ category.displayName }}</h2>
             <li v-for="page in category.pages" :key="page.displayName" @click="selectCategory(page)"
@@ -13,22 +13,7 @@
             <span class="spacer"></span>
           </div>
 
-          <p>
           <Button text="Log Out" :callback=logout variant="scary"></Button>
-          </p>
-          <span class="spacer"></span>
-
-          <p id="links-and-socials">
-            <NuxtLink href="https://git.gorb.app/gorb/frontend" title="Source"><Icon name="lucide:git-branch-plus" /></NuxtLink>
-            <NuxtLink href="https://docs.gorb.app" title="Backend Documentation"><Icon name="lucide:book-open-text" /></NuxtLink>
-          </p>
-          
-          <p style="font-size: .8em; color: var(--secondary-text-color)">
-            Version Hash: {{ appConfig.public.gitHash }}
-            <br>
-            Build Time: {{ appConfig.public.buildTimeString }}
-          </p>
-
         </ul>
       </div>
       <div id="sub-page">
@@ -44,8 +29,6 @@ import Button from '~/components/Button.vue';
 
 const { logout } = useAuth()
 
-const appConfig = useRuntimeConfig()
-
 interface Page {
   displayName: string;
   pageData: any; // is actually Component but TS is yelling at me :(
@@ -120,7 +103,7 @@ function selectCategory(page: Page) {
   background-color: var(--sidebar-background-color);
   color: var(--text-color);
   padding: 1dvh 1dvw;
-  margin-left: 0;
+  margin-left: auto;
 
   overflow-y: auto;
   height: 100vh;
@@ -145,10 +128,6 @@ function selectCategory(page: Page) {
   transition: background-color 0.3s;
 }
 
-#sidebar p {
-  margin: 2dvh 0.8dvw;
-}
-
 .sidebar-focus {
   background-color: var(--sidebar-highlighted-background-color);
 }
@@ -168,15 +147,11 @@ function selectCategory(page: Page) {
   height: 100vh;
 }
 
-#links-and-socials * {
-  margin-right: 0.2em;
-}
-
 .spacer {
   height: 0.2dvh;
   display: block;
   margin: 0.8dvh 1dvw;
-  background-color: var(--padding-color);
+  background-color: var(--spacing-color);
 }
 
 /* applies to child pages too */