Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 9 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
10 changes: 8 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
version: '3'
version: '3.9'

# Expose port to access s-pipes-editor-rest directly
x-access-db-server-development-port: &s-pipes-editor-rest-dev-port
ports:
- "127.0.0.1:${EDITOR_REST_PORT:-18115}:18115"

services:
s-pipes-editor-ui:
image: 'ghcr.io/kbss-cvut/s-pipes-editor-ui/s-pipes-editor-ui:latest'
container_name: s-pipes-editor-ui
ports:
- '3000:80'
- "127.0.0.1:${INTERNAL_HOST_PORT:-3000}:80"
depends_on:
- s-pipes-editor-rest
environment:
- SERVICE_URL=${SPIPES_EDITOR_REST:-http://s-pipes-editor-rest:18115}

s-pipes-editor-rest:
# <<: *s-pipes-editor-rest-dev-port
image: 'ghcr.io/kbss-cvut/s-pipes-editor/s-pipes-editor:latest'
container_name: s-pipes-editor-rest
expose:
Expand Down
5 changes: 5 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8,273 changes: 5,004 additions & 3,269 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
130 changes: 3 additions & 127 deletions public/index.html

Large diffs are not rendered by default.

121 changes: 121 additions & 0 deletions public/main.css

Large diffs are not rendered by default.

Loading
Loading