Changeset 3b6962d for reactapp/src/Pages/Topic.js

Timestamp:

11/23/22 12:15:28 (20 months ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

af801e3, e49d1b6

Parents:

c68150f

Message:

moderation/reporting api in spring boot

File:

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

reactapp/src/Pages/Topic.js

@@ -48 +48 @@
 
   useEffect(() => {
-    const url1 = `http://192.168.0.17:8080/public/thread/${params.topicId}`;
-    const url2 = `http://192.168.0.17: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 () => {
@@ -84 +84 @@
       setReplyModalDisplay("block");
       setPostForModal(post);
+      document.body.style.overflowY = "hidden";
     } else {
       navigate("/login");
@@ -98 +99 @@
     if (!replyContent.length < 1) {
       const response = await axios(
-        `http://192.168.0.17:8080/secure/subject/${thread.targetSubject.subjectId}/replyToThread/${postId}`,
+        `http://192.168.0.19:8080/secure/subject/${thread.targetSubject.subjectId}/replyToThread/${postId}`,
         {
           method: "post",
@@ -117 +118 @@
     if (auth) {
       setPostModalDisplay("block");
+      document.body.style.overflowY = "hidden";
     } else {
       navigate("/login");
@@ -126 +128 @@
     if (!postContent.length < 1) {
       const response = await axios(
-        `http://192.168.0.17: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",
@@ -144 +146 @@
     setPostModalDisplay("none");
     setReplyModalDisplay("none");
+    document.body.style.overflowY = "auto";
   };
   const handleContentChange = (e) => {
@@ -157 +160 @@
       ) {
         const response = await axios(
-          `http://192.168.0.17:8080/secure/upvoteThread/${post.postId}`,
+          `http://192.168.0.19:8080/secure/upvoteThread/${post.postId}`,
           {
             method: "get",
@@ -180 +183 @@
       ) {
         const response = await axios(
-          `http://192.168.0.17:8080/secure/downvoteThread/${post.postId}`,
+          `http://192.168.0.19:8080/secure/downvoteThread/${post.postId}`,
           {
             method: "get",
@@ -210 +213 @@
               {child.content}
             </p>
-            <OpinionReplyCardContentTime>
-              {dateConverter(
-                new Date(child.timePosted).toString().slice(4, -43)
-              )}
-            </OpinionReplyCardContentTime>
+            {thread.timePosted === thread.timeLastEdited ? (
+              <OpinionCardContentTime>
+                {dateConverter(
+                  new Date(thread.timePosted).toString().slice(4, -43)
+                )}
+              </OpinionCardContentTime>
+            ) : (
+              <OpinionCardContentTime>
+                {dateConverter(
+                  new Date(thread.timeLastEdited).toString().slice(4, -43)
+                )}{" "}
+                (едитирано од модератор)
+              </OpinionCardContentTime>
+            )}
 
             <div
@@ -232 +244 @@
                         (e) => e.vote === "UPVOTE" && e.user.id === user.id
                       )
-                      ? "greenyellow"
+                      ? "green"
                       : "darkgrey"
                     : "darkgrey"
@@ -337 +349 @@
                   value={postContent}
                   onChange={handleContentChange}
+                  spellCheck={false}
                 />
               </label>
@@ -356 +369 @@
             {thread.content}
           </p>
-          <OpinionCardContentTime>
-            {dateConverter(
-              new Date(thread.timePosted).toString().slice(4, -43)
-            )}
-          </OpinionCardContentTime>
+          {thread.timePosted === thread.timeLastEdited ? (
+            <OpinionCardContentTime>
+              {dateConverter(
+                new Date(thread.timePosted).toString().slice(4, -43)
+              )}
+            </OpinionCardContentTime>
+          ) : (
+            <OpinionCardContentTime>
+              {dateConverter(
+                new Date(thread.timeLastEdited).toString().slice(4, -43)
+              )}{" "}
+              (едитирано од модератор)
+            </OpinionCardContentTime>
+          )}
           <div
             style={{
@@ -377 +399 @@
                       (e) => e.vote === "UPVOTE" && e.user.id === user.id
                     )
-                    ? "greenyellow"
+                    ? "green"
                     : "darkgrey"
                   : "darkgrey"
@@ -422 +444 @@
                 {directChild.content}
               </p>
-              <OpinionCardContentTime>
-                {dateConverter(
-                  new Date(directChild.timePosted).toString().slice(4, -43)
-                )}
-              </OpinionCardContentTime>
+              {directChild.timePosted === directChild.timeLastEdited ? (
+                <OpinionCardContentTime>
+                  {dateConverter(
+                    new Date(directChild.timePosted).toString().slice(4, -43)
+                  )}
+                </OpinionCardContentTime>
+              ) : (
+                <OpinionCardContentTime>
+                  {dateConverter(
+                    new Date(directChild.timeLastEdited)
+                      .toString()
+                      .slice(4, -43)
+                  )}{" "}
+                  (едитирано од модератор)
+                </OpinionCardContentTime>
+              )}
               <div
                 style={{
@@ -444 +477 @@
                           (e) => e.vote === "UPVOTE" && e.user.id === user.id
                         )
-                        ? "greenyellow"
+                        ? "green"
                         : "darkgrey"
                       : "darkgrey"