Add proxy server

Somnath-Chattaraj · Oct 9, 2024 · 12ad6dd · 12ad6dd
1 parent 66b53c1
commit 12ad6dd
Show file tree

Hide file tree

Showing 13 changed files with 241 additions and 205 deletions.
diff --git a/frontend/src/components/AddDetails.jsx b/frontend/src/components/AddDetails.jsx
@@ -138,7 +138,7 @@ const AddDetails = () => {
     e.preventDefault();
     setLoading(true);
     try {
-      const response = await axios.post("/user/addDetails", formData, {
+      const response = await axios.post("/api/user/addDetails", formData, {
         withCredentials: true,
       });
       Toast({

diff --git a/frontend/src/components/AddUsername.jsx b/frontend/src/components/AddUsername.jsx
@@ -41,7 +41,7 @@ const AddUsername = () => {
     e.preventDefault();
     setLoading(true);
     try {
-      const response = await axios.post("/user/addusername", formData, {
+      const response = await axios.post("/api/user/addusername", formData, {
         withCredentials: true,
       });
       setLoading(false);

diff --git a/frontend/src/components/Login.jsx b/frontend/src/components/Login.jsx
@@ -30,7 +30,7 @@ const LoginPage = () => {
       const result = await signInWithPopup(auth, googleProvider);
       const user = result.user;
       const response = await axios.post(
-        "/user/google",
+        "/api/user/google",
         {
           email: user.email,
           displayName: user.displayName,
@@ -85,7 +85,7 @@ const LoginPage = () => {
       const result = await signInWithPopup(auth, githubProvider);
       const user = result.user;
       const response = await axios.post(
-        "/user/github",
+        "/api/user/github",
         {
           email: user.email,
           displayName: user.displayName,
@@ -137,7 +137,7 @@ const LoginPage = () => {
     setLoading(true);
     try {
       const response = await axios.post(
-        "/user/login",
+        "/api/user/login",
         { email, password },
         { withCredentials: true }
       );

diff --git a/frontend/src/components/Posts.jsx b/frontend/src/components/Posts.jsx
@@ -39,7 +39,7 @@ const Posts = () => {
         collegeId = selectedCommunity;
       }
       const response = await axios.post(
-        "/post/fetch",
+        "/api/post/fetch",
         {
           page: page,
           collegeId,
@@ -81,7 +81,7 @@ const Posts = () => {
   useEffect(() => {
     const fetchCommunities = async () => {
       try {
-        const response = await axios.get("/post/communities", {
+        const response = await axios.get("/api/post/communities", {
           withCredentials: true,
         });
         setCommunities(response.data.college);
@@ -99,7 +99,7 @@ const Posts = () => {
   useEffect(() => {
     const fetchAllCommunities = async () => {
       try {
-        const response = await axios.get("/post/allcommunities", {
+        const response = await axios.get("/api/post/allcommunities", {
           withCredentials: true,
         });
         setAllCommunities(response.data.college);
@@ -119,7 +119,7 @@ const Posts = () => {
 
   const handleLike = async (postId) => {
     try {
-      await axios.post("/post/like", { postId }, { withCredentials: true });
+      await axios.post("/api/post/like", { postId }, { withCredentials: true });
       setPosts((prevPosts) =>
         prevPosts.map((post) => {
           if (post.post_id === postId) {
@@ -135,7 +135,7 @@ const Posts = () => {
 
   const handleCreatePost = async ({ title, content, community }) => {
     const response = await axios.post(
-      "/post/create",
+      "/api/post/create",
       {
         title: title,
         content: content,

diff --git a/frontend/src/components/Register.jsx b/frontend/src/components/Register.jsx
@@ -160,7 +160,7 @@ const RegisterForm = () => {
     try {
       registerSchema.parse(formData);
       setErrors({});
-      const response = await axios.post("/user/register", formData, {
+      const response = await axios.post("/api/user/register", formData, {
         withCredentials: true,
       });
       toast({
@@ -183,7 +183,9 @@ const RegisterForm = () => {
 
   return (
     <Box w="100%" maxW="500px" mx="auto" mt="5">
-      <FormLabel fontSize="5xl" textAlign="center" >Register</FormLabel>
+      <FormLabel fontSize="5xl" textAlign="center">
+        Register
+      </FormLabel>
       {/* <Navbar btnName="Login"/> */}
       <form onSubmit={handleSubmit}>
         <VStack spacing={4}>

diff --git a/frontend/src/components/SearchBar.jsx b/frontend/src/components/SearchBar.jsx
@@ -21,7 +21,7 @@ const SearchBar = () => {
   const fetchSuggestions = async (value) => {
     try {
       const response = await axios.post(
-        "/post/search",
+        "/api/post/search",
         { query: value },
         { withCredentials: true }
       );
@@ -69,7 +69,7 @@ const SearchBar = () => {
   const handleSearchSubmit = async () => {
     try {
       const response = await axios.post(
-        "/post/search",
+        "/api/post/search",
         { query: searchTerm },
         { withCredentials: true }
       );

diff --git a/frontend/src/components/SinglePost.jsx b/frontend/src/components/SinglePost.jsx
@@ -25,7 +25,7 @@ const SinglePost = () => {
   useEffect(() => {
     const fetchPost = async () => {
       try {
-        const response = await axios.get(`/post/fetch/${id}`, {
+        const response = await axios.get(`/api/post/fetch/${id}`, {
           withCredentials: true,
         });
         setPost(response.data.post);
@@ -39,7 +39,7 @@ const SinglePost = () => {
     const checkIfLiked = async () => {
       try {
         const response = await axios.post(
-          `/post/liked`,
+          `/api/post/liked`,
           { postId: id },
           { withCredentials: true }
         );
@@ -58,15 +58,23 @@ const SinglePost = () => {
   const handleLike = async (postId) => {
     if (postLiked) {
       try {
-        await axios.post("/post/unlike", { postId }, { withCredentials: true });
+        await axios.post(
+          "/api/post/unlike",
+          { postId },
+          { withCredentials: true }
+        );
         setPost((prevPost) => ({ ...prevPost, likes: prevPost.likes - 1 }));
         setPostLiked(false);
       } catch (error) {
         console.error("Error unliking post:", error);
       }
     } else {
       try {
-        await axios.post("/post/like", { postId }, { withCredentials: true });
+        await axios.post(
+          "/api/post/like",
+          { postId },
+          { withCredentials: true }
+        );
         setPost((prevPost) => ({ ...prevPost, likes: prevPost.likes + 1 }));
         setPostLiked(true);
       } catch (error) {

diff --git a/frontend/src/components/chatroomui/chatroom.jsx b/frontend/src/components/chatroomui/chatroom.jsx
@@ -10,28 +10,27 @@ const Chatroom = () => {
   const [allMsg, setAllMsg] = useState([]);
   const [prevMsg, setPrevMsg] = useState([]);
   const [myMsg, setMyMsg] = useState("");
-  const messageEndRef = useRef(null); 
-  const {loading, userDeatils} = useUser();
-
-
-  const { sendJsonMessage, lastJsonMessage, readyState } = useWebSocket('ws://localhost:8080');
+  const messageEndRef = useRef(null);
+  const { loading, userDeatils } = useUser();
 
+  const { sendJsonMessage, lastJsonMessage, readyState } = useWebSocket(
+    "ws://localhost:8080"
+  );
 
   useEffect(() => {
     const fetchChatHistory = async () => {
       try {
-        const response = await axios.get(`/chat/history/${roomId}`, {
+        const response = await axios.get(`/api/chat/history/${roomId}`, {
           withCredentials: true,
         });
-        setPrevMsg(response.data); 
-
+        setPrevMsg(response.data);
 
         const tosend = {
           type: "joinRoom",
           data: {
             userId: userId,
             roomId: roomId,
-          }
+          },
         };
         sendJsonMessage(tosend);
       } catch (error) {
@@ -40,21 +39,26 @@ const Chatroom = () => {
     };
 
     fetchChatHistory();
-  }, [roomId, userId, sendJsonMessage]); 
+  }, [roomId, userId, sendJsonMessage]);
   useEffect(() => {
     if (lastJsonMessage !== null) {
       if (lastJsonMessage.type === "error") {
         alert("Room not connected...");
-      } else if (lastJsonMessage.type === "newMessage" && lastJsonMessage.data.roomId === roomId) {
+      } else if (
+        lastJsonMessage.type === "newMessage" &&
+        lastJsonMessage.data.roomId === roomId
+      ) {
         const data = lastJsonMessage.data.message;
 
-
         if (data.senderId !== userId) {
-          setAllMsg(prev => [...prev, {
-            senderId: data.senderId,
-            message: data.content,
-            at: data.timestamp,
-          }]);
+          setAllMsg((prev) => [
+            ...prev,
+            {
+              senderId: data.senderId,
+              message: data.content,
+              at: data.timestamp,
+            },
+          ]);
         }
       }
     }
@@ -81,41 +85,45 @@ const Chatroom = () => {
       data: {
         roomId: roomId,
         userId: userId,
-        message: myMsg
-      }
+        message: myMsg,
+      },
     };
     sendJsonMessage(tosend);
 
-
-    setAllMsg(prev => [...prev, {
-      senderId: "you",
-      message: myMsg,
-      at: new Date().toISOString(),
-    }]);
-    setMyMsg(""); 
+    setAllMsg((prev) => [
+      ...prev,
+      {
+        senderId: "you",
+        message: myMsg,
+        at: new Date().toISOString(),
+      },
+    ]);
+    setMyMsg("");
   };
 
   // Format date
   const formatDate = (isoString) => {
     const date = new Date(isoString);
-    return new Intl.DateTimeFormat('en-US', {
-      weekday: 'short',
-      hour: 'numeric',
-      minute: 'numeric',
-      hour12: true
+    return new Intl.DateTimeFormat("en-US", {
+      weekday: "short",
+      hour: "numeric",
+      minute: "numeric",
+      hour12: true,
     }).format(date);
   };
 
   const constatus = {
-    [ReadyState.CONNECTING]: 'Connecting',
-    [ReadyState.OPEN]: 'Open',
-    [ReadyState.CLOSING]: 'Closing',
-    [ReadyState.CLOSED]: 'Closed',
-    [ReadyState.UNINSTANTIATED]: 'Uninstantiated',
+    [ReadyState.CONNECTING]: "Connecting",
+    [ReadyState.OPEN]: "Open",
+    [ReadyState.CLOSING]: "Closing",
+    [ReadyState.CLOSED]: "Closed",
+    [ReadyState.UNINSTANTIATED]: "Uninstantiated",
   }[readyState];
 
   // Combine and sort messages
-  const combinedMessages = [...prevMsg, ...allMsg].sort((a, b) => new Date(a.at) - new Date(b.at));
+  const combinedMessages = [...prevMsg, ...allMsg].sort(
+    (a, b) => new Date(a.at) - new Date(b.at)
+  );
 
   return (
     <div className="min-h-screen flex flex-col bg-gradient-to-br from-gray-800 to-slate-600 p-4 text-white">
@@ -137,14 +145,22 @@ const Chatroom = () => {
               <div
                 key={index}
                 className={`p-4 rounded-lg my-3 shadow-md space-y-2 ${
-                  (data.senderId === "you" || data.senderId === userId) ? "bg-green-700 ml-auto" : "bg-slate-700 mr-auto"
+                  data.senderId === "you" || data.senderId === userId
+                    ? "bg-green-700 ml-auto"
+                    : "bg-slate-700 mr-auto"
                 } max-w-xs`}
               >
-                <div>{(data.senderId === "you" || data.senderId === userId) ? "You" : (data.senderId || data.id)}</div>
+                <div>
+                  {data.senderId === "you" || data.senderId === userId
+                    ? "You"
+                    : data.senderId || data.id}
+                </div>
                 <div>
                   <b>{data.message || data.content}</b>
                 </div>
-                <div className="text-sm text-gray-400">Sent at: {formatDate(data.at) || formatDate(data.timestamp)}</div>
+                <div className="text-sm text-gray-400">
+                  Sent at: {formatDate(data.at) || formatDate(data.timestamp)}
+                </div>
               </div>
             ))
           ) : (
@@ -168,7 +184,6 @@ const Chatroom = () => {
           >
             Send
           </button>
-
         </div>
       </div>
     </div>