Changes in reactapp/src/Pages/Topic.js [af801e3:3b6962d]

File:

• reactapp/src/Pages/Topic.js (modified) (18 diffs)

reactapp/src/Pages/Topic.js

@@ -28 +28 @@
 } from "../Components/Styled/Modal.style";
 import axios from "../api/axios";
-import LoadingSpinner from "../Components/Styled/LoadingSpinner.style";
 
 const Topic = () => {
@@ -49 +48 @@
 
   useEffect(() => {
-    const url1 = `http://192.168.0.29:8080/public/thread/${params.topicId}`;
-    const url2 = `http://192.168.0.29:8080/secure/currentUser`;
+    const url1 = `http://192.168.0.19:8080/public/thread/${params.topicId}`;
+    const url2 = `http://192.168.0.19:8080/secure/currentUser`;
 
     const fetchTopic = async () => {
@@ -100 +99 @@
     if (!replyContent.length < 1) {
       const response = await axios(
-        `http://192.168.0.29:8080/secure/subject/${thread.targetSubject.subjectId}/replyToThread/${postId}`,
+        `http://192.168.0.19:8080/secure/subject/${thread.targetSubject.subjectId}/replyToThread/${postId}`,
         {
           method: "post",
@@ -110 +109 @@
       );
       setErrorMessage("");
-      window.location.reload();
+      window.location.reload(false);
     } else {
       setErrorMessage("Полето за содржина не смее да биде празно");
@@ -129 +128 @@
     if (!postContent.length < 1) {
       const response = await axios(
-        `http://192.168.0.29:8080/secure/subject/${thread.targetSubject.subjectId}/replyToThread/${params.topicId}`,
+        `http://192.168.0.19:8080/secure/subject/${thread.targetSubject.subjectId}/replyToThread/${params.topicId}`,
         {
           method: "post",
@@ -139 +138 @@
       );
       setErrorMessage("");
-      window.location.reload();
+      window.location.reload(false);
     } else {
       setErrorMessage("Полето за содржина не смее да биде празно");
@@ -161 +160 @@
       ) {
         const response = await axios(
-          `http://192.168.0.29:8080/secure/upvoteThread/${post.postId}`,
+          `http://192.168.0.19:8080/secure/upvoteThread/${post.postId}`,
           {
             method: "get",
@@ -167 +166 @@
           }
         );
-        window.location.reload();
+        window.location.reload(false);
       } else {
         return;
@@ -184 +183 @@
       ) {
         const response = await axios(
-          `http://192.168.0.29:8080/secure/downvoteThread/${post.postId}`,
+          `http://192.168.0.19:8080/secure/downvoteThread/${post.postId}`,
           {
             method: "get",
@@ -191 +190 @@
         );
 
-        window.location.reload();
+        window.location.reload(false);
       } else {
         return;
@@ -214 +213 @@
               {child.content}
             </p>
-            {new Date(child.timePosted).setMilliseconds(0) === new Date(child.timeLastEdited).setMilliseconds(0) ? (
+            {thread.timePosted === thread.timeLastEdited ? (
               <OpinionCardContentTime>
                 {dateConverter(
-                  new Date(child.timePosted).toString().slice(4, -43)
-                )} <span style={{fontStyle:"normal",color:"blue"}}>#{child.postId}</span>
+                  new Date(thread.timePosted).toString().slice(4, -43)
+                )}
               </OpinionCardContentTime>
             ) : (
               <OpinionCardContentTime>
                 {dateConverter(
-                  new Date(child.timeLastEdited).toString().slice(4, -43)
-                )}{" "} <span style={{fontStyle:"normal",color:"blue"}}>#{child.postId}</span>{" "}
+                  new Date(thread.timeLastEdited).toString().slice(4, -43)
+                )}{" "}
                 (едитирано од модератор)
               </OpinionCardContentTime>
@@ -271 +270 @@
               />
 
-              <VoteCount right={10 + "px"}>
+              <VoteCount right={50 + "px"}>
                 {child.votes.filter((v) => v.vote === "DOWNVOTE").length}
               </VoteCount>
@@ -325 +324 @@
       </CurrentPageNav>
       <div style={{ height: "20px", marginBottom: "50px", marginTop: "50px" }}>
-        <h3 style={{ float: "left" }}>{thread.title} <span style={{opacity:"50%", fontSize:"16px"}}>#{thread.postId}</span></h3>
+        <h3 style={{ float: "left" }}>{thread.title}</h3>
         {auth && (
           <AddOpinionButton onClick={handleAddOpinionButtonClick}>
@@ -370 +369 @@
             {thread.content}
           </p>
-          {new Date(thread.timePosted).setMilliseconds(0) === new Date(thread.timeLastEdited).setMilliseconds(0) ? (
+          {thread.timePosted === thread.timeLastEdited ? (
             <OpinionCardContentTime>
               {dateConverter(
                 new Date(thread.timePosted).toString().slice(4, -43)
-              )} <span style={{fontStyle:"normal",color:"blue"}}>#{thread.postId}</span>
+              )}
             </OpinionCardContentTime>
           ) : (
@@ -380 +379 @@
               {dateConverter(
                 new Date(thread.timeLastEdited).toString().slice(4, -43)
-              )}{" "} <span style={{fontStyle:"normal",color:"blue"}}>#{thread.postId}</span>{" "}
+              )}{" "}
               (едитирано од модератор)
             </OpinionCardContentTime>
@@ -445 +444 @@
                 {directChild.content}
               </p>
-              {new Date(directChild.timePosted).setMilliseconds(0) === new Date(directChild.timeLastEdited).setMilliseconds(0) ? (
+              {directChild.timePosted === directChild.timeLastEdited ? (
                 <OpinionCardContentTime>
                   {dateConverter(
                     new Date(directChild.timePosted).toString().slice(4, -43)
-                  )} <span style={{fontStyle:"normal",color:"blue"}}>#{directChild.postId}</span>
+                  )}
                 </OpinionCardContentTime>
               ) : (
@@ -457 +456 @@
                       .toString()
                       .slice(4, -43)
-                  )}{" "} <span style={{fontStyle:"normal",color:"blue"}}>#{directChild.postId}</span>{" "}
+                  )}{" "}
                   (едитирано од модератор)
                 </OpinionCardContentTime>
@@ -560 +559 @@
   ) : !fetchError && !loadedThread ? (
     <div>
-      <LoadingSpinner style={{ marginTop: "140px" }}/>
+      <p style={{ marginTop: "140px" }}>се вчитува...</p>
       <Outlet />
     </div>