"style: Clean up whitespace and update socket message handling"

xDeFc0nx · Jan 17, 2025 · b7f37e8 · b7f37e8
1 parent 1e1400f
commit b7f37e8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/client/biome.json b/client/biome.json
@@ -1,3 +1,5 @@
+
+
 {
   "$schema": "https://biomejs.dev/schemas/1.8.0/schema.json",
   "organizeImports": {
@@ -26,5 +28,5 @@
     "rules": {
       "recommended": true
     }
-  }
-}
+  },
+ 
diff --git a/client/src/components/nav-user.tsx b/client/src/components/nav-user.tsx
@@ -70,7 +70,6 @@ export function NavUser({
               className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
             >
               <Avatar className="h-8 w-8 rounded-lg">
-                <AvatarImage src={user.avatar} alt={user.FirstName} />
                 <AvatarFallback className="rounded-lg">CN</AvatarFallback>
               </Avatar>
               <div className="grid flex-1 text-left text-sm leading-tight">
@@ -89,7 +88,6 @@ export function NavUser({
             <DropdownMenuLabel className="p-0 font-normal">
               <div className="flex items-center gap-2 px-1 py-1.5 text-left text-sm">
                 <Avatar className="h-8 w-8 rounded-lg">
-                  <AvatarImage src={user.avatar} alt={user.FirstName} />
                   <AvatarFallback className="rounded-lg">CN</AvatarFallback>
                 </Avatar>
                 <div className="grid flex-1 text-left text-sm leading-tight">

diff --git a/client/src/components/ui/theme.tsx b/client/src/components/ui/theme.tsx
@@ -26,7 +26,7 @@ export function ThemeChanger() {
   }, []);
 
   return (
-    <div className="absolute top-4 right-4">
+    <div className="absolute top-4 left-4">
       <Button
         variant="ghost"
         size="icon"

diff --git a/client/src/lib/socket.ts b/client/src/lib/socket.ts
@@ -8,10 +8,10 @@ export class WebSocketClient {
 
     this.socket.onmessage = (event) => {
       this.messageHandlers.forEach((handler) => handler(event.data));
-        const message = JSON.parse(event.data);
-        console.log(message)
-      if (message === "ping") {
-            if (this.socket.readyState === WebSocket.OPEN) {
+        const response = JSON.parse(event.data);
+        console.log(response)
+       if (response.message === "pong") {
+           if (this.socket.readyState === WebSocket.OPEN) {
         this.socket.send(JSON.stringify({ Action: "pong" }));
             }else {
     console.error("Socket is not open. Cannot send pong.");

diff --git a/client/src/pages/(secure)/settings/index.tsx b/client/src/pages/(secure)/settings/index.tsx
@@ -77,14 +77,28 @@ export default function Index() {
          ID: userData?.ID,
                } );
 
-       }
+
+       socket.onMessage((msg)=>{
+
+           const response =  JSON.parse(msg)
+
+       if (response.userData){
+
+
  setUserData({ 
      ...userData,
         FirstName: values.FirstName,
         LastName: values.LastName,
         Email: values.Email,
         Country: values.Country,
       });
+       }
+       if (response.Error){
+        toast.error(response.Error)
+
+       }
+       }
+                       )}
     } catch (error) {
       console.error("Form submission error", error);
       toast.error("Failed to submit the form. Please try again.");