Changeset 3b6962d for reactapp/src/Components

Timestamp:

11/23/22 12:15:28 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

af801e3, e49d1b6

Parents:

c68150f

Message:

moderation/reporting api in spring boot

Location:

reactapp/src/Components

Files:

• OpinionTree.js (modified) (11 diffs)
• Search.js (modified) (1 diff)
• Styled/Modal.style.js (modified) (4 diffs)
• UserHeader.js (modified) (1 diff)

reactapp/src/Components/OpinionTree.js

@@ -42 +42 @@
 
   useEffect(() => {
-    const url = `http://192.168.0.17:8080/secure/currentUser`;
+    const url = `http://192.168.0.19:8080/secure/currentUser`;
 
     const fetchUser = async () => {
@@ -68 +68 @@
       ) {
         const response = await axios(
-          `http://192.168.0.17:8080/secure/upvoteOpinion/${post.postId}`,
+          `http://192.168.0.19:8080/secure/upvoteOpinion/${post.postId}`,
           {
             method: "get",
@@ -91 +91 @@
       ) {
         const response = await axios(
-          `http://192.168.0.17:8080/secure/downvoteOpinion/${post.postId}`,
+          `http://192.168.0.19:8080/secure/downvoteOpinion/${post.postId}`,
           {
             method: "get",
@@ -111 +111 @@
       setReplyModalDisplay("block");
       setPostForModal(opinion);
+      document.body.style.overflowY = "hidden";
     } else {
       navigate("/login");
@@ -118 +119 @@
   const handleModalCloseClick = () => {
     setReplyModalDisplay("none");
+    document.body.style.overflowY = "auto";
   };
 
@@ -129 +131 @@
     if (!replyContent.length < 1) {
       const response = await axios(
-        `http://192.168.0.17:8080/secure/professor/${professor.professorId}/replyToOpinion/${postId}`,
+        `http://192.168.0.19:8080/secure/professor/${professor.professorId}/replyToOpinion/${postId}`,
         {
           method: "post",
@@ -159 +161 @@
               {child.content}
             </p>
-            <OpinionReplyCardContentTime>
-              {dateConverter(
-                new Date(child.timePosted).toString().slice(4, -43)
-              )}
-            </OpinionReplyCardContentTime>
+            {child.timePosted === child.timeLastEdited ? (
+              <OpinionCardContentTime>
+                {dateConverter(
+                  new Date(child.timePosted).toString().slice(4, -43)
+                )}
+              </OpinionCardContentTime>
+            ) : (
+              <OpinionCardContentTime>
+                {dateConverter(
+                  new Date(child.timeLastEdited).toString().slice(4, -43)
+                )}{" "}
+                (едитирано од модератор)
+              </OpinionCardContentTime>
+            )}
 
             <div
@@ -181 +192 @@
                         (e) => e.vote === "UPVOTE" && e.user.id === user.id
                       )
-                      ? "greenyellow"
+                      ? "green"
                       : "darkgrey"
                     : "darkgrey"
@@ -249 +260 @@
                     {opinion.content}
                   </p>
-                  <OpinionCardContentTime>
-                    {dateConverter(
-                      new Date(opinion.timePosted).toString().slice(4, -43)
-                    )}
-                  </OpinionCardContentTime>
+                  {opinion.timePosted === opinion.timeLastEdited ? (
+                    <OpinionCardContentTime>
+                      {dateConverter(
+                        new Date(opinion.timePosted).toString().slice(4, -43)
+                      )}
+                    </OpinionCardContentTime>
+                  ) : (
+                    <OpinionCardContentTime>
+                      {dateConverter(
+                        new Date(opinion.timeLastEdited)
+                          .toString()
+                          .slice(4, -43)
+                      )}{" "}
+                      (едитирано од модератор)
+                    </OpinionCardContentTime>
+                  )}
 
                   <div
@@ -273 +295 @@
                                 e.vote === "UPVOTE" && e.user.id === user.id
                             )
-                            ? "greenyellow"
+                            ? "green"
                             : "darkgrey"
                           : "darkgrey"
@@ -343 +365 @@
                     value={replyContent}
                     onChange={handleContentChange}
+                    spellCheck={false}
                   />
                 </label>

reactapp/src/Components/Search.js

@@ -15 +15 @@
 
   useEffect(() => {
-    const url = `http://192.168.0.17:8080/public/professors/nameContains/${transliterate(
+    const url = `http://192.168.0.19:8080/public/professors/nameContains/${transliterate(
       query
     )}`;

reactapp/src/Components/Styled/Modal.style.js

@@ -28 +28 @@
   top: 0;
   width: 100%;
-  height: auto;
+  height: 100%;
   overflow: auto;
   background-color: rgb(0, 0, 0);
@@ -47 +47 @@
 export const ModalContent = styled.div`
   background-color: #fefefe;
-  margin: 15% auto;
+  margin: 2% auto;
   padding: 20px;
   border: 1px solid #888;
@@ -107 +107 @@
   padding: 12px 16px;
   border: 1px solid #ccc;
+  font-family: inherit;
 `;
 
@@ -116 +117 @@
   border: 1px solid #ccc;
   resize: none;
+  font-family: inherit;
 `;

reactapp/src/Components/UserHeader.js

@@ -10 +10 @@
 
   useEffect(() => {
-    const url = `http://192.168.0.17:8080/secure/currentUser`;
+    const url = `http://192.168.0.19:8080/secure/currentUser`;
 
     const fetchUser = async () => {