Merge pull request #46 from kbss-cvut/45-load-module-configuration-do…

…-not-complete

[#45] Initial try to fix module configuration not loading

Dockerfile

@@ -11,7 +11,7 @@ WORKDIR /app
 # will be cached unless changes to one of those two files
 # are made.
 COPY package.json package-lock.json ./
-RUN npm install
+RUN npm install --legacy-peer-deps
 
 # Copy the main application
 COPY ./ /app/

nginx.conf

@@ -34,6 +34,11 @@
          # what file to server as index
          index index.html index.htm;
 
+         # TODO not very systematic solution
+         location ~ ^/(main|s-forms)\.css$ {
+            root /var/www/public;
+         }
+
          location / {
              # First attempt to serve request as file, then
              # as directory, then fall back to redirecting to index.html

package.json

@@ -17,6 +17,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",
     "@frogcat/ttl2jsonld": "^0.0.6",
+    "@kbss-cvut/s-forms": "^0.7.2-beta-6cfd5af.0",
     "@tippyjs/react": "^4.2.5",
     "@triply/yasgui": "^4.2.14",
     "@webpack-cli/serve": "^2.0.5",
@@ -33,19 +34,18 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.4",
     "prop-types": "^15.7.2",
-    "react": "^16.13.1",
+    "react": "^18.2.0",
     "react-bootstrap": "^1.4.3",
     "react-cytoscapejs": "^1.2.1",
     "react-delay-render": "^0.1.2",
-    "react-dom": "^16.13.1",
+    "react-dom": "^18.2.0",
     "react-imported-component": "6.2.1",
     "react-json-pretty": "^2.2.0",
     "react-loadingg": "^1.7.2",
     "react-moment": "^1.1.1",
     "react-router-dom": "^5.1.2",
     "react-spring": "^8.0.27",
     "react-treebeard": "^3.2.4",
-    "s-forms": "https://kbss.felk.cvut.cz/dist/s-forms-0.2.7.tgz",
     "semantic-ui-react": "^0.88.2",
     "superagent": "^6.1.0",
     "toasted-notes": "^3.2.0",