Changeset 2998dc4

Timestamp:

07/30/22 15:39:04 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

e958037

Parents:

3a44163

Message:

made OpinionTree display author info

Files:

• reactapp/package-lock.json (modified) (3 diffs)
• reactapp/package.json (modified) (1 diff)
• reactapp/src/App.css (modified) (1 diff)
• reactapp/src/App.js (modified) (1 diff)
• reactapp/src/Components/OpinionTree.js (modified) (2 diffs)
• reactapp/src/Pages/Professor.js (modified) (2 diffs)
• springapp/pom.xml (modified) (1 diff)
• springapp/src/main/java/mk/profesori/springapp/Model/CustomUserDetails.java (modified) (3 diffs)
• springapp/src/main/java/mk/profesori/springapp/Model/Post.java (modified) (2 diffs)
• springapp/src/main/java/mk/profesori/springapp/Model/_Thread.java (modified) (1 diff)

reactapp/package-lock.json

@@ -12 +12 @@
         "@testing-library/react": "^13.3.0",
         "@testing-library/user-event": "^13.5.0",
+        "jsog": "^1.0.7",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -11226 +11227 @@
       }
     },
+    "node_modules/jsog": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/jsog/-/jsog-1.0.7.tgz",
+      "integrity": "sha512-9IA6ZY6g5rSgRTvHO7B4Ro9LGGqJEPXdKRkvPohmzdk777fldQ3rjbUkmiIG3gxswLi2ZiAKsdgqfs+zMwmRcg=="
+    },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
@@ -24734 +24740 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
+    "jsog": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/jsog/-/jsog-1.0.7.tgz",
+      "integrity": "sha512-9IA6ZY6g5rSgRTvHO7B4Ro9LGGqJEPXdKRkvPohmzdk777fldQ3rjbUkmiIG3gxswLi2ZiAKsdgqfs+zMwmRcg=="
+    },
     "json-parse-even-better-errors": {
       "version": "2.3.1",

reactapp/package.json

@@ -7 +7 @@
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^13.5.0",
+    "jsog": "^1.0.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

reactapp/src/App.css

@@ -2 +2 @@
   text-align: center;
 }
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

reactapp/src/App.js

@@ -4 +4 @@
   return (
     <div>
-      <h1>Main App Page</h1>
-      <nav
-        style={{
-          borderBottom: "solid 1px",
-          paddingBottom: "1rem",
-        }}
-      >
-        <Link to="/professor">Professor</Link>
-      </nav>
+      <h1>profesori.mk</h1>
       <Outlet />
     </div>

reactapp/src/Components/OpinionTree.js

@@ -1 +1 @@
 function OpinionTree({ professor }) {
-  function displayChildPosts(post) {
-    if (post == null) return;
+  var renderedOpinionIds = [];
+  var postCount; // za da ne go pokazuva ispod postot
+
+  function displayChildPosts(child) {
+    if (child == null) return;
+    postCount = renderedOpinionIds.push(child.postId);
     return (
-      <div key={post.postId}>
-        <p>Содржина: {post.content}</p>
-        {post.children.map((child) => displayChildPosts(child))}
+      <div key={child.postId}>
+        <p>{child.author.username} реплицирал</p>
+        <p>Содржина: {child.content}</p>
+        {child.children.map((childOfChild) => displayChildPosts(childOfChild))}
       </div>
     );
@@ -13 +18 @@
     <div className="opinionTree">
       {professor.relatedOpinions.map((opinion) => {
-        if (opinion.hasOwnProperty("title")) {
+        if (!renderedOpinionIds.includes(opinion.postId)) {
+          postCount = renderedOpinionIds.push(opinion.postId);
           return (
             <div key={opinion.postId}>
+              <p>{opinion.author.username} напишал</p>
               <p>Наслов: {opinion.title}</p>
               <p>Содржина: {opinion.content}</p>
               {opinion.children.map((child) => displayChildPosts(child))}
+              <hr />
             </div>
           );

reactapp/src/Pages/Professor.js

@@ -1 +1 @@
 import React, { useEffect, useState } from "react";
 import { Outlet, useParams } from "react-router-dom";
+import JSOG from "jsog";
 import OpinionTree from "../Components/OpinionTree";
 
@@ -15 +16 @@
       try {
         const response = await fetch(url);
-        const json = await response.json();
-        setProfessor(json);
+        var cyclicGraph = await response.json();
+        var jsogStructure = JSOG.encode(cyclicGraph); // has { '@ref': 'ID' } links instead of cycles
+        cyclicGraph = JSOG.decode(jsogStructure);
+        setProfessor(cyclicGraph);
         setLoaded(true);
       } catch (error) {

springapp/pom.xml

@@ -57 +57 @@
                 <version>2.7.2</version>
                 </dependency>
+                <dependency>
+                        <groupId>com.voodoodyne.jackson.jsog</groupId>
+                        <artifactId>jackson-jsog</artifactId>
+                        <version>1.1.2</version>
+                        <scope>compile</scope>
+                </dependency>
         </dependencies>
 

springapp/src/main/java/mk/profesori/springapp/Model/CustomUserDetails.java

@@ -23 +23 @@
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.voodoodyne.jackson.jsog.JSOGGenerator;
 
 import lombok.EqualsAndHashCode;
@@ -35 +35 @@
 @NoArgsConstructor
 @Entity
-@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "id")
+@JsonIdentityInfo(generator = JSOGGenerator.class)
 public class CustomUserDetails implements UserDetails {
 
@@ -45 +45 @@
     private String username;
     private String email;
-    private String password;
+    private String password; // TODO dont expose password in api
     @Enumerated(EnumType.STRING)
     private UserRole userRole;

springapp/src/main/java/mk/profesori/springapp/Model/Post.java

@@ -20 +20 @@
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.voodoodyne.jackson.jsog.JSOGGenerator;
 
 import lombok.NoArgsConstructor;
@@ -27 +27 @@
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @DiscriminatorColumn(name = "post_type", discriminatorType = DiscriminatorType.STRING)
-@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "postId")
+@JsonIdentityInfo(generator = JSOGGenerator.class)
 @NoArgsConstructor
 public class Post {

springapp/src/main/java/mk/profesori/springapp/Model/_Thread.java

@@ -27 +27 @@
     private Subject targetSubject;
 
-    // TODO
+    // TODO threadovi
     /*
      * public _Thread(String title, String content, List<String> tags, Section