Merge branch 'devhub-ai:main' into Updated-Chat-UI

Author: DanielAgbeni

.github/workflows/main_devhub-server.yml

@@ -0,0 +1,2 @@
+node_modules/
+dist/

client/.dockerignore

@@ -0,0 +1,26 @@
+# Use an official node image as the base image
+FROM node:16-alpine
+
+# Set the working directory
+WORKDIR /app
+
+# Copy package.json and package-lock.json
+COPY package*.json ./
+
+# Install dependencies
+RUN npm install
+
+# Copy the rest of the application code
+COPY . .
+
+# Set environment variable
+ENV VITE_BACKEND_URL=https://devhub-server-original.onrender.com
+
+# Build the application
+RUN npm run build
+
+# Expose the port the app runs on
+EXPOSE 3000
+
+# Start the application
+CMD ["npm", "run", "serve"]

client/Dockerfile

@@ -0,0 +1,17 @@
+declare module "@/components/MultiSelect/TagInput" {
+    import { FC } from "react";
+
+    interface Tag {
+        value: string;
+        label: string;
+    }
+
+    interface TagInputProps {
+        selectedTags: Tag[];
+        onTagsChange: (tags: Tag[]) => void;
+    }
+
+    const TagInput: FC<TagInputProps>;
+    export type { Tag }; // Export the Tag type
+    export default TagInput;
+}

client/src/components/MultiSelect/TagInput.d.ts

@@ -1,6 +1,5 @@
 "use client";
 import { cn } from "@/lib/utils";
-import { Link,  LinkProps } from 'react-router-dom';
 import React, { useState, createContext, useContext } from "react";
 import { AnimatePresence, motion } from "framer-motion";
 import { IconMenu2, IconX } from "@tabler/icons-react";

client/src/components/ui/sidebar.tsx

@@ -16,6 +16,9 @@ const userSlice = createSlice({
   name: 'user',
   initialState,
   reducers: {
+    setUser: (state, action: PayloadAction<UserState>) => {
+            return { ...state, ...action.payload };
+    },
     setUsername(state, action: PayloadAction<string | null>) {
       state.username = action.payload;
     },
@@ -28,5 +31,6 @@ const userSlice = createSlice({
   },
 });
 
-export const { setUsername, setFriends, setFriendStatus } = userSlice.actions;
+export const { setUser, setUsername, setFriends, setFriendStatus } = userSlice.actions;
 export default userSlice.reducer;
+export type { UserState };

client/src/lib/userSlice.ts

@@ -74,7 +74,7 @@ export function ProfileForm() {
         control: form.control,
     })
 
-    function onSubmit(data: ProfileFormValues) {
+    function onSubmit() {
         toast.success("Signup successful", {
             description: "You can now log in with your new account."
 

client/src/pages/EditForm.tsx

@@ -9,12 +9,17 @@ import { toast } from "sonner";
 
 const backendUrl = import.meta.env.VITE_BACKEND_URL || 'http://localhost:5000';
 
+interface Tag {
+    value: string;
+    label: string;
+}
+
 interface Project {
     id?: number;
     title: string;
     description: string;
     repoLink: string;
-    tags: string[];
+    tags: Tag[];
 }
 
 
@@ -76,10 +81,15 @@ const EditProfileForm: React.FC<EditProfileFormProps> = ({ onProjectAdded }) =>
     const handleProjectChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         const { name, value } = e.target;
         if (selectedProject) {
-            setSelectedProject((prevProject: Project) => ({
-                ...prevProject,
-                [name]: value,
-            }));
+            setSelectedProject((prevProject: Project | null) => {
+                if (prevProject) {
+                    return {
+                        ...prevProject,
+                        [name]: value,
+                    };
+                }
+                return null; // or return a default Project object if you prefer
+            });
         } else {
             setNewProject((prevProject: Project) => ({
                 ...prevProject,
@@ -110,15 +120,14 @@ const EditProfileForm: React.FC<EditProfileFormProps> = ({ onProjectAdded }) =>
     const handleAddProject = async () => {
         try {
             console.log("Tags:", newProject.tags);
-            const tagsString = newProject.tags.map(tag => tag.value).join(",");
-
+            const tagsArray = newProject.tags.map(tag => ({ value: tag, label: tag }));  // Convert Tag objects to strings
 
-            console.log("Adding project:", tagsString);
+            console.log("Adding project:", tagsArray);
             const response = await axios.post(`${backendUrl}/profile/${username}/projects`, {
                 title: newProject.title,
                 description: newProject.description,
                 repo_link: newProject.repoLink,
-                tags: tagsString,
+                tags: tagsArray, // Use the formatted tagsArray
             }, { withCredentials: true });
             if(response.status === 200)
                 // console.log("Project added successfully:", );
@@ -356,8 +365,8 @@ const EditProfileForm: React.FC<EditProfileFormProps> = ({ onProjectAdded }) =>
                     <div>
                         <Label>Project Tags</Label>
                         <TagInput
-                            selectedTags={newProject.tags}
-                            onTagsChange={(tags: string[]) => setNewProject({ ...newProject, tags })}
+                            selectedTags={newProject.tags} // This should be an array of Tag objects
+                            onTagsChange={(tags: Tag[]) => setNewProject({ ...newProject, tags })} // Ensure tags are of type Tag[]
                         />
 
                     </div>

client/src/pages/EditProfileForm.tsx

@@ -18,11 +18,21 @@ interface ProfileProps {
   username: string;
 }
 
+export interface Tag {
+  value: string;
+  label: string;
+}
+
 interface Project {
   description: string;
   repoLink: string;
-  tags: string;
+  tags: Tag[];
   title: string;
+  repo?: string; 
+  link?: string; 
+  language?: string; 
+  stars?: number;
+  forks?: number; 
 }
 
 interface UserResponse {
@@ -50,28 +60,28 @@ interface Language {
   percentage: string;
 }
 
-interface LeetCodeData {
-  totalSolved: number;
-  totalSubmissions: number;
-  totalQuestions: number;
-  easySolved: number;
-  totalEasy: number;
-  mediumSolved: number;
-  totalMedium: number;
-  hardSolved: number;
-  totalHard: number;
-  ranking: number;
-  contributionPoint: number;
-  reputation: number;
-  submissionCalendar: string;
-  recentSubmissions: {
-    title: string;
-    titleSlug: string;
-    timestamp: string;
-    statusDisplay: string;
-    lang: string;
-  }[];
-}
+// interface LeetCodeData {
+//   totalSolved: number;
+//   totalSubmissions: number;
+//   totalQuestions: number;
+//   easySolved: number;
+//   totalEasy: number;
+//   mediumSolved: number;
+//   totalMedium: number;
+//   hardSolved: number;
+//   totalHard: number;
+//   ranking: number;
+//   contributionPoint: number;
+//   reputation: number;
+//   submissionCalendar: string;
+//   recentSubmissions: {
+//     title: string;
+//     titleSlug: string;
+//     timestamp: string;
+//     statusDisplay: string;
+//     lang: string;
+//   }[];
+// }
 
 const Profile: React.FC<ProfileProps> = ({ onLogout, username }) => {
   return (
@@ -94,16 +104,15 @@ const Dashboard: React.FC<DashboardProps> = ({ loggedInUsername }) => {
   const { username } = useParams<{ username: string }>();
   const dispatch = useDispatch<AppDispatch>();
   const friends = useSelector((state: RootState) => state.user.friends);
-  const friendStatus = useSelector(
-    (state: RootState) => state.user.friendStatus
-  );
+  // const friendStatus = useSelector(
+  //   (state: RootState) => state.user.friendStatus
+  // );
   const [profileData, setProfileData] = useState<UserResponse>();
   const [editing, setEditing] = useState(false);
   const [githubData, setGithubData] = useState<GitHubData | null>(null);
   const [languages, setLanguages] = useState<Language[]>([]);
   const [streakStats, setStreakStats] = useState<string | null>(null);
   const [pinnedRepos, setPinnedRepos] = useState<Project[]>([]);
-  const [leetcodeData, setLeetcodeData] = useState<LeetCodeData | null>(null);
   const [leetcodeSvg, setLeetcodeSvg] = useState(null);
   const [githubStreakSvg, setGithubStreakSvg] = useState(null);
 
@@ -248,13 +257,13 @@ const Dashboard: React.FC<DashboardProps> = ({ loggedInUsername }) => {
           data: { friend_username: loggedInUsername },
         });
         setProfileData((prev) => (prev ? { ...prev, isFriend: false } : prev));
-        dispatch(setFriendStatus(false)); // Update Redux state
+        dispatch(setFriendStatus({ username: loggedInUsername, isFriend: false })); // Updated to pass an object
       } else {
         await axios.post(`${backendUrl}/profile/${username}/friends`, {
           friend_username: loggedInUsername,
         });
         setProfileData((prev) => (prev ? { ...prev, isFriend: true } : prev));
-        dispatch(setFriendStatus(true)); // Update Redux state
+        dispatch(setFriendStatus({ username: loggedInUsername, isFriend: true })); // Updated to pass an object
       }
     } catch (error) {
       console.error("Failed to update friend status:", error);

client/src/pages/Profile.tsx

@@ -0,0 +1,5 @@
+{
+  "rewrites": [
+    {"source": "/:a*", "destination": "/"}
+  ]
+}