Merge branch 'master' into master

Author: lcahlander

pom.xml

@@ -14,7 +14,7 @@
 
   <groupId>org.exist-db</groupId>
   <artifactId>stanford-nlp</artifactId>
-  <version>0.8.0</version>
+  <version>0.9.0</version>
 
   <name>Stanford Natural Language Processing</name>
   <description>Integrates the Stanford CoreNLP annotation pipeline library into eXist-db.</description>

src/main/js/frontend/package-lock.json

@@ -1,26 +1,27 @@
 {
   "name": "stanford-npl",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "private": true,
   "homepage": ".",
   "proxy": "http://localhost:8080/",
   "dependencies": {
-    "@testing-library/jest-dom": "^5.11.4",
+    "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.0.3",
     "@types/node": "^17.0.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
+    "@types/react": "^17.0.37",
+    "@types/react-dom": "^17.0.11",
     "bootstrap": "^5.1.3",
     "react": "^17.0.2",
     "react-bootstrap": "^2.0.3",
     "react-bootstrap-icons": "^1.6.1",
     "react-dom": "^17.0.2",
-    "react-router": "^6.0.2",
+    "react-router": "^6.1.1",
     "react-router-dom": "^6.2.1",
     "react-scripts": "5.0.0",
-    "typescript": "^4.1.2",
+    "react-simple-tree-menu": "^1.1.18",
+    "typescript": "^4.5.4",
     "web-vitals": "^2.1.2"
   },
   "scripts": {

src/main/js/frontend/package.json

@@ -24,15 +24,14 @@ body {
 
 .SideBarList .toprow {
   width: 100%;
-  height: 80px;
+  height: 60px;
   list-style-type: none;
   margin: 0;
   display: flex;
   flex-direction: row;
   color:blacke;
   justify-content: center;
   align-items: center;
-      border-bottom: thin solid gray;
   font-family: "Trebuchet MS", "Lucida Grande", "Lucia Sans", Arial, sans-serif;
 }
 .toprow #icon {
@@ -46,37 +45,14 @@ body {
   text-align: center;
 }
 
-.SideBarList .row {
+.NLPContent {
+  height: 100%;
   width: 100%;
-  height: 60px;
-  list-style-type: none;
-  margin: 0;
-  display: flex;
-  flex-direction: row;
-  color: black;
-  justify-content: center;
-  align-items: center;
-  font-family: "Trebuchet MS", "Lucida Grande", "Lucia Sans", Arial, sans-serif;
-}
-
-.SideBarList .row:hover {
-  cursor: pointer;
   background-color: lightgray;
 }
-
-.row #icon {
-  flex: 30%;
-  display: grid;
-  place-items: center;
-}
-
-.row #title {
-  flex: 70%;
-}
-
-.MagellanContent {
+.LoadingContent {
   height: 100%;
   width: 100%;
-  background-color: lightgray;
+  background-color: lightgoldenrodyellow;
 }
 

src/main/js/frontend/src/App.css

@@ -1,16 +1,20 @@
 import React from 'react';
 import { HashRouter as Router, Route, Routes } from "react-router-dom";
 import Layout from "./Layout";
+import LoadingContent from "./LoadingContent";
 
 function App() {
   return (
-      <Router>
-          <Routes>
-              <Route path="/" element={<Layout />}>
+    <Router>
+        <Routes>
+            <Route path="/" element={<Layout />}>
+                <Route path="/loading" element={<LoadingContent/>}>
 
-              </Route>
-          </Routes>
-      </Router>
+                </Route>
+
+            </Route>
+        </Routes>
+    </Router>
   );
 }
 

src/main/js/frontend/src/App.tsx

@@ -2,16 +2,16 @@ import 'bootstrap/dist/css/bootstrap.min.css';
 import './App.css';
 import React from "react";
 import SideBar from "./SideBar";
-import MagellanContent from "./MagellanContent";
+import NLPContent from "./NLPContent";
 
 export default class Layout extends React.Component<any, any> {
 
     render() {
         return (
             <div className={'App'}>
                 <SideBar />
-                <MagellanContent />
+                <NLPContent />
             </div>
         );
     }
-}
+}