Changeset 8d83180

Timestamp:

10/11/22 15:41:16 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

c68150f

Parents:

cae16b5

Message:

forums/page nav

Files:

• reactapp/src/App.js (modified) (4 diffs)
• reactapp/src/Components/Styled/EntityList.style.js (added)
• reactapp/src/Components/Styled/Main.style.js (modified) (1 diff)
• reactapp/src/Components/Styled/OpinionCard.style.js (modified) (1 diff)
• reactapp/src/Components/Styled/ProfessorCard.style.js (modified) (1 diff)
• reactapp/src/Components/Styled/SubjectsAccordion.style..js (added)
• reactapp/src/Components/SubjectsAccordion.js (added)
• reactapp/src/Pages/Faculty.js (added)
• reactapp/src/Pages/NotFound.js (added)
• reactapp/src/Pages/Professor.js (modified) (6 diffs)
• reactapp/src/Pages/Subject.js (added)
• reactapp/src/Pages/University.js (added)
• springapp/src/main/java/mk/profesori/springapp/Model/StudyProgramme.java (modified) (1 diff)
• springapp/src/main/java/mk/profesori/springapp/Model/_Thread.java (modified) (3 diffs)

reactapp/src/App.js

@@ -6 +6 @@
 import Home from "./Pages/Home";
 import UserDashboard from "./Pages/UserDashboard";
+import Subject from "./Pages/Subject";
+import University from "./Pages/University";
+import Faculty from "./Pages/Faculty";
 import { useEffect, useState, useMemo } from "react";
 import AuthApi from "./api/AuthApi";
@@ -11 +14 @@
 import axios from "./api/axios";
 import JSOG from "jsog";
+import NotFound from "./Pages/NotFound";
 
 export default function App() {
@@ -77 +81 @@
               />
             </Route>
+            <Route path="university/:universityId" element={<University />} />
+            <Route path="faculty/:facultyId" element={<Faculty />} />
+            <Route path="subject/:subjectId" element={<Subject />} />
             <Route path="search" element={<SearchResults />}></Route>
             <Route
@@ -87 +94 @@
             ></Route>
           </Route>
+          <Route path="*" element={<NotFound />} />
         </Routes>
       </BrowserRouter>

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

@@ -22 +22 @@
   color: black;
 `;
+
+export const CurrentPageNav = styled.div`
+  font-style: italic;
+  font-size: 14px;
+`;

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

@@ -8 +8 @@
   margin-bottom: 20px;
   padding: 10px;
-  border: 1px solid black;
+  box-shadow: 2px 2px 10px #aaaaaa;
 `;
 

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

@@ -2 +2 @@
 
 export const ProfessorCard = styled.div`
-  background-color: papayawhip;
+  background-color: cornsilk;
   width: auto;
   padding: 10px;
   margin-bottom: 30px;
-  margin-top: 140px;
+  margin-top: 40px;
 `;
 

reactapp/src/Pages/Professor.js

@@ -23 +23 @@
 import { useNavigate } from "react-router-dom";
 import axios from "../api/axios";
+import { CurrentPageNav } from "../Components/Styled/Main.style";
 
 function Professor(user, userLoaded) {
@@ -34 +35 @@
   const [postTitle, setPostTitle] = useState("");
   const [postContent, setPostContent] = useState("");
+  const [fetchError, setFetchError] = useState(false);
 
   useEffect(() => {
@@ -47 +49 @@
         setLoaded(true);
       } catch (error) {
-        console.log("Fetching error", error);
+        setFetchError(true);
       }
     };
@@ -95 +97 @@
     return (
       <div>
+        <CurrentPageNav>
+          &#187;{" "}
+          <a href={"/university/" + professor.faculty.university.universityId}>
+            {professor.faculty.university.universityName}
+          </a>{" "}
+          &#187;{" "}
+          <a href={"/faculty/" + professor.faculty.facultyId}>
+            {professor.faculty.facultyName}
+          </a>{" "}
+          &#187; <a href="#">{professor.professorName}</a>
+        </CurrentPageNav>
         <ProfessorCard>
           <ProfessorCardName>{professor.professorName}</ProfessorCardName>
@@ -168 +181 @@
       </div>
     );
-  } else {
+  } else if (!fetchError) {
     return (
       <div>
@@ -175 +188 @@
       </div>
     );
+  } else {
+    return (
+      <div style={{ marginTop: "140px" }}>
+        <h1 style={{ textAlign: "center" }}>Страницата не е пронајдена.</h1>
+      </div>
+    );
   }
 }

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

@@ -16 +16 @@
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.voodoodyne.jackson.jsog.JSOGGenerator;
 
 @Entity
 @Table(name = "study_programme")
-@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "studyProgrammeId")
+@JsonIdentityInfo(generator = JSOGGenerator.class)
 public class StudyProgramme {
 

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

@@ -1 +1 @@
 package mk.profesori.springapp.Model;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -15 +16 @@
 public class _Thread extends Post {
 
-    @Column(name = "tags")
+    @Column(name = "tags") // unused
     @ElementCollection
     private List<String> tags = new ArrayList<>();
@@ -27 +28 @@
     private Subject targetSubject;
 
-    // TODO threadovi
-    /*
-     * public _Thread(String title, String content, List<String> tags, Section
-     * parentSection, Subject targetSubject) {
-     * super(title, content);
-     * this.tags = tags;
-     * this.parentSection = parentSection;
-     * this.targetSubject = targetSubject;
-     * }
-     */
+    // konstruktor so parent (koga e reply)
+    public _Thread(String title, String content, CustomUserDetails author, LocalDateTime timePosted,
+            LocalDateTime timeLastEdited,
+            Post parent, List<Post> children, Section parentSection, Subject targetSubject) {
+        super(title, content, author, timePosted, timeLastEdited, parent, children);
+        this.parentSection = parentSection;
+        this.targetSubject = targetSubject;
+    }
+
+    // konstruktor bez parent (koga NE e reply)
+    public _Thread(String title, String content, CustomUserDetails author, LocalDateTime timePosted,
+            LocalDateTime timeLastEdited, List<Post> children, Section parentSection, Subject targetSubject) {
+        super(title, content, author, timePosted, timeLastEdited, children);
+        this.parentSection = parentSection;
+        this.targetSubject = targetSubject;
+    }
 
     // getters