Changes in / [d654c74:74b8c52]

Location:

reactapp

Files:

• package-lock.json (modified) (3 diffs)
• package.json (modified) (1 diff)
• src/App.js (modified) (2 diffs)
• src/Components/Main.style.js (modified) (1 diff)
• src/Components/ProfessorCard.style.js (modified) (1 diff)
• src/Components/Search.js (modified) (1 diff)
• src/Components/Search.style.js (deleted)
• src/Pages/Professor.js (modified) (2 diffs)
• src/Util/transliterate.js (deleted)
• src/searchicon.png (deleted)

reactapp/package-lock.json

@@ -24 +24 @@
         "react-scripts": "5.0.1",
         "styled-components": "^5.3.5",
-        "transliteration": "^2.3.5",
         "web-vitals": "^2.1.4"
       }
@@ -15706 +15705 @@
       }
     },
-    "node_modules/transliteration": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/transliteration/-/transliteration-2.3.5.tgz",
-      "integrity": "sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw==",
-      "dependencies": {
-        "yargs": "^17.5.1"
-      },
-      "bin": {
-        "slugify": "dist/bin/slugify",
-        "transliterate": "dist/bin/transliterate"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/transliteration/node_modules/yargs": {
-      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/transliteration/node_modules/yargs-parser": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/tryer": {
       "version": "1.0.1",
@@ -28062 +28021 @@
       }
     },
-    "transliteration": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/transliteration/-/transliteration-2.3.5.tgz",
-      "integrity": "sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw==",
-      "requires": {
-        "yargs": "^17.5.1"
-      },
-      "dependencies": {
-        "yargs": {
-          "version": "17.5.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-          "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.0.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "21.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-          "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
-        }
-      }
-    },
     "tryer": {
       "version": "1.0.1",

reactapp/package.json

@@ -19 +19 @@
     "react-scripts": "5.0.1",
     "styled-components": "^5.3.5",
-    "transliteration": "^2.3.5",
     "web-vitals": "^2.1.4"
   },

reactapp/src/App.js

@@ -1 +1 @@
 import { Outlet } from "react-router-dom";
 import { MainWrapper, MainTitle } from "./Components/Main.style";
-import Search from "./Components/Search.js";
 
 export default function App() {
@@ -16 +15 @@
         }
       </style>
-      <MainTitle>profesori.mk</MainTitle> <Search />
+      <MainTitle>profesori.mk</MainTitle>
       <Outlet />
     </MainWrapper>

reactapp/src/Components/Main.style.js

@@ -17 +17 @@
   text-decoration: underline 3px;
   margin-bottom: 30px;
-  width: fit-content;
-  float: left;
 `;

reactapp/src/Components/ProfessorCard.style.js

@@ -6 +6 @@
   padding: 10px;
   margin-bottom: 30px;
-  margin-top: 140px;
 `;
 

reactapp/src/Components/Search.js

@@ -1 @@
-import React, { useEffect, useState } from "react";
-import JSOG from "jsog";
-import { transliterate } from "../Util/transliterate";
-import {
-  SearchDropdownResultSmall,
-  SearchDropdownTextSmall,
-  SearchDropdownSmall,
-  SearchDropdownResultLinkSmall,
-  SearchSmall,
-} from "./Search.style";
-function Search() {
-  const [query, setQuery] = useState("");
-  const [professors, setProfessors] = useState([]);
-
-  useEffect(() => {
-    const url = `http://192.168.0.17:8080/public/professors/nameContains/${transliterate(
-      query
-    )}`;
-
-    const fetchData = async () => {
-      try {
-        const response = await fetch(url);
-        var cyclicGraph = await response.json();
-        var jsogStructure = JSOG.encode(cyclicGraph); // has { '@ref': 'ID' } links instead of cycles
-        cyclicGraph = JSOG.decode(jsogStructure);
-        setProfessors(cyclicGraph);
-        //setLoaded(true);
-      } catch (error) {
-        console.log("Error", error);
-      }
-    };
-
-    if (query.length > 2) fetchData();
-  }, [query]);
-
-  return (
-    <div
-      style={{
-        position: "relative",
-        width: "fit-content",
-        float: "right",
-      }}
-    >
-      <SearchSmall
-        placeholder="Пребарувај..."
-        onChange={(e) => setQuery(e.target.value)}
-      />
-      <SearchDropdownSmall
-        display={query.length > 2 && professors.length > 0 ? "block" : "none"}
-      >
-        {query.length > 2 &&
-          professors.slice(0, 7).map((professor) => (
-            <SearchDropdownResultSmall key={professor.professorId}>
-              <SearchDropdownResultLinkSmall
-                href={"/professor/" + professor.professorId}
-              >
-                <SearchDropdownTextSmall weight="bold" size="medium">
-                  {professor.professorName}
-                </SearchDropdownTextSmall>
-                <SearchDropdownTextSmall weight="normal" size="smaller">
-                  {professor.faculty.facultyName}
-                </SearchDropdownTextSmall>
-              </SearchDropdownResultLinkSmall>
-            </SearchDropdownResultSmall>
-          ))}
-      </SearchDropdownSmall>
-    </div>
-  );
-}
-
-export default Search;

reactapp/src/Pages/Professor.js

@@ -3 +3 @@
 import JSOG from "jsog";
 import OpinionTree from "../Components/OpinionTree";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import {
+  solid,
+  regular,
+  brands,
+} from "@fortawesome/fontawesome-svg-core/import.macro";
 
 import {
@@ -64 +70 @@
     return (
       <div>
-        <p style={{ marginTop: "140px" }}>се вчитува...</p>
+        <p>loading</p>
         <Outlet />
       </div>