Merge pull request #55 from deepraj21/main

Updated Profile and EditProfile section
devhub-ai · Oct 18, 2024 · 9368408 · 9368408
2 parents 1639521 + 50ef1dc
commit 9368408
Show file tree

Hide file tree

Showing 15 changed files with 1,022 additions and 1,283 deletions.
diff --git a/client/dist/assets/index-9KsGJqp-.js b/client/dist/assets/index-9KsGJqp-.js
diff --git a/client/dist/assets/index-BVs10sFn.js b/client/dist/assets/index-BVs10sFn.js
diff --git a/client/dist/assets/index-BaUmUz5n.css b/client/dist/assets/index-BaUmUz5n.css
diff --git a/client/dist/assets/index-C_VlOH-m.css b/client/dist/assets/index-C_VlOH-m.css
diff --git a/client/dist/index.html b/client/dist/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image" href="/logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>DevHub</title>
-    <script type="module" crossorigin src="/assets/index-9KsGJqp-.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BaUmUz5n.css">
+    <script type="module" crossorigin src="/assets/index-BVs10sFn.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-C_VlOH-m.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -6,6 +6,7 @@ import Login from './pages/Login';
 import Home from './pages/Home';
 import Profile from './pages/Profile';
 import { Toaster } from "@/components/ui/sonner";
+import EditProfileForm from './pages/EditProfileForm';
 
 const App = () => {
 
@@ -17,6 +18,7 @@ const App = () => {
           <Route path="/signup" element={<Signup />} />
           <Route path="/login" element={<Login />} />
           <Route path="/home" element={<Home />} />
+          <Route path="/settings" element={<EditProfileForm />} />
           <Route path="/u/:username" element={<Profile />} />
           <Route path="*" element={<div>404</div>} />
         </Routes>

diff --git a/client/src/components/Chat/Chat.tsx b/client/src/components/Chat/Chat.tsx
@@ -127,7 +127,7 @@ export const Chat: React.FC = () => {
 											<AvatarImage src="/ai-avatar.png" alt="dh" />
 											<AvatarFallback>dh</AvatarFallback>
 										</Avatar>
-										<div className="flex-grow mt-2" style={{ maxWidth: '70%' }}> {/* Set maxWidth to 70% */}
+										<div className="flex-grow mt-2" style={{ maxWidth: '70%' }}>
 											{message.isLoading ? (
 												<>
 													<Skeleton className="h-4 w-[250px]" />

diff --git a/client/src/components/Hero/Hero.tsx b/client/src/components/Hero/Hero.tsx
@@ -194,7 +194,7 @@ const SkeletonFour = () => {
           Just code in Vanilla Javascript
         </p>
         <p className="border border-red-500 bg-red-100 dark:bg-red-900/20 text-red-600 text-xs rounded-full px-2 py-0.5 mt-4">
-          Developer 🧑🏻‍💻
+          Developer
         </p>
       </motion.div>
       <motion.div className="h-full relative z-20 w-1/3 rounded-2xl bg-white p-4 dark:bg-black dark:border-white/[0.1] border border-neutral-200 flex flex-col items-center justify-center">
@@ -227,7 +227,7 @@ const SkeletonFour = () => {
           I love angular, RSC, and Redux.
         </p>
         <p className="border border-orange-500 bg-orange-100 dark:bg-orange-900/20 text-orange-600 text-xs rounded-full px-2 py-0.5 mt-4">
-          Backend 🚀
+          Backend
         </p>
       </motion.div>
     </motion.div>

diff --git a/client/src/components/MobileSidebar/MobileSidebar.tsx b/client/src/components/MobileSidebar/MobileSidebar.tsx
@@ -45,9 +45,9 @@ const MobileSidebar = () => {
             <div className="w-full flex-1"></div>
             <DropdownMenu>
                 <DropdownMenuTrigger asChild>
-                    <Button variant="secondary" size="icon" className="rounded-full">
-                        <CircleUser className="h-5 w-5" />
-                    </Button>
+                    {/* <Button variant="secondary" size="icon" className="rounded-full"> */}
+                        <CircleUser className="h-8 w-8" />
+                    {/* </Button> */}
                 </DropdownMenuTrigger>
                 <DropdownMenuContent align="end">
                     <DropdownMenuLabel>My Account</DropdownMenuLabel>

diff --git a/client/src/lib/userSlice.ts b/client/src/lib/userSlice.ts
@@ -17,7 +17,7 @@ const userSlice = createSlice({
   initialState,
   reducers: {
     setUser: (state, action: PayloadAction<UserState>) => {
-            return { ...state, ...action.payload };
+      return { ...state, ...action.payload };
     },
     setUsername(state, action: PayloadAction<string | null>) {
       state.username = action.payload;
@@ -33,4 +33,4 @@ const userSlice = createSlice({
 
 export const { setUser, setUsername, setFriends, setFriendStatus } = userSlice.actions;
 export default userSlice.reducer;
-export type { UserState };
+export type { UserState };
diff --git a/client/src/pages/EditForm.tsx b/client/src/pages/EditForm.tsx