Skip to content
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
5 changes: 5 additions & 0 deletions .github/config/.env.test
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,8 @@ VAULT_URL=http://localhost:8200/v1
VAULT_ROLE=swiftbrowserui
VAULT_SECRET=swiftui
VAULT_KEY_NAME=human-readable-short-string-to-identify-the-whitelisted-key

VITE_TLS=False
# paths should be absolute or relative to vite.config.js
VITE_TLS_CERT=
VITE_TLS_KEY=
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- (GL #944) Replace buefy dialogs with c-modal from `csc-ui`
- (GL #944) Replace buefy notifications with c-toasts from `csc-ui`
- (GL #944) Replace buefy Autocomplete component with c-autocomplete from `csc-ui`
- (GH #982) Migrate from vue-cli to vite

### Fixed

- (GH #704) Fix lost folder structure in shared mode uploads
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
redis: docker run --env-file ${PWD}/.env -p ${SWIFT_UI_REDIS_PORT}:${SWIFT_UI_REDIS_PORT} redis:7-bullseye
db: docker run -v ${PWD}/.github/config/init-project-db.sh:/docker-entrypoint-initdb.d/init-user-db.sh --env-file ${PWD}/.env -p 5432:5432 postgres:14-bullseye
keystone: docker run --init --rm -p $KEYSTONE_PORT:5000 -p $SWIFT_PORT:8080 --env S6_LOGGING=0 --name keystone-swift keystone-swift
keystone: docker run --init --rm -p $KEYSTONE_PORT:5000 -p $SWIFT_PORT:8080 --env S6_LOGGING=0 --name keystone-swift ghcr.io/cscfi/docker-keystone-swift:latest

# Commands to run without trusted TLS
ui: gunicorn --reload --worker-class aiohttp.GunicornUVLoopWebWorker --workers 1 --log-level debug --graceful-timeout 60 --timeout 120 --bind ${HOST}:${UI_PORT} swift_browser_ui.ui.server:servinit
Expand Down
20 changes: 2 additions & 18 deletions devproxy/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -93,27 +93,11 @@ http {
proxy_pass http://app_server_front/ws;
}

location /libupload.js {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_buffering off;
proxy_pass http://app_server_front/static/libupload.js;
}

location /libupload.wasm {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_buffering off;
proxy_pass http://app_server_front/static/libupload.wasm;
}

location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_buffering off;
Expand Down
4 changes: 2 additions & 2 deletions swift_browser_ui_frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
"process": true
"import": "readonly"
},
"parserOptions": {
"ecmaVersion": 2018,
"ecmaVersion": 2021,
"sourceType": "module"
},
"plugins": ["vue"],
Expand Down
6 changes: 0 additions & 6 deletions swift_browser_ui_frontend/babel.config.js

This file was deleted.

3 changes: 2 additions & 1 deletion swift_browser_ui_frontend/build_wasm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ WASM_ROOT="${SCRIPT_ROOT}"/wasm/

docker run --rm -it --mount type=bind,source="${WASM_ROOT}",target=/src/ ghcr.io/cscfi/docker-emscripten-crypt4gh clean
docker run --rm -it --mount type=bind,source="${WASM_ROOT}",target=/src/ ghcr.io/cscfi/docker-emscripten-crypt4gh all
cp "${WASM_ROOT}"/src/libupload* "${SCRIPT_ROOT}"/public
cp "${WASM_ROOT}"/src/libupload* "${SCRIPT_ROOT}"/public/
cp "${WASM_ROOT}"/src/libupload* "${SCRIPT_ROOT}"/dist/
46 changes: 12 additions & 34 deletions swift_browser_ui_frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,34 @@
"version": "2.0.1",
"private": true,
"scripts": {
"serve": "./build_wasm.sh && vue-cli-service serve --mode development",
"build": "./build_wasm.sh && vue-cli-service build --mode production",
"serve": "./build_wasm.sh && vite serve --mode development",
"build": "./build_wasm.sh && vite build --mode production",
"test": "vue-cli-service test:unit --config=jest.config.js",
"lint": "vue-cli-service lint --mode production",
"build-devel": "./build_wasm.sh && vue-cli-service build --mode development",
"serve-prod": "./build_wasm.sh && vue-cli-service serve --mode production",
"lint": "pnpm exec eslint --ext .js,.vue --ignore-path .gitignore --fix src",
"build-devel": "./build_wasm.sh && vite build --mode development",
"serve-prod": "./build_wasm.sh && vite serve --mode production",
"build-wasm": "./build_wasm.sh",
"docker-build": "vue-cli-service build --mode production",
"docker-build-devel": "vue-cli-service build --mode development"
"docker-build": "vite build --mode production",
"docker-build-devel": "vite build --mode development"
},
"dependencies": {
"@babel/core": "^7.20.12",
"@babel/eslint-parser": "^7.19.1",
"@babel/preset-env": "^7.20.2",
"@mdi/js": "^7.1.96",
"@vue/cli-service": "^5.0.8",
"@vue/cli-plugin-babel": "^5.0.8",
"@vue/cli-plugin-eslint": "^5.0.8",
"@vue/cli-plugin-unit-jest": "^5.0.8",
"@vue/test-utils": "^1.3.3",
"@vue/vue2-jest": "^27.0.0",
"@vueuse/rxjs": "^9.12.0",
"babel-jest": "^27.5.1",
"bulma": "^0.9.4",
"cli-highlight": "^2.1.11",
"csc-ui": "github:hannyle/csc-ui",
"csc-ui-vue-directive": "^0.0.6",
"core-js": "^3.27.2",
"dexie": "^3.2.3",
"eslint": "^8.33.0",
"eslint-plugin-vue": "^9.9.0",
"eslint-utils": "^3.0.0",
"lodash": "^4.17.21",
"jest": "^27.5.1",
"node-sass": "^8.0.0",
"lodash": "^4.17.21",
"resumablejs": "^1.1.0",
"rxjs": "^7.8.0",
"sass-loader": "^13.2.0",
"sass": "^1.58.3",
"vite": "^4.1.3",
"vite-plugin-vue2": "^2.0.3",
"vue": "^2.7.14",
"vue-i18n": "^8.28.2",
"vue-router": "^3.6.5",
Expand All @@ -64,9 +54,6 @@
"eslint:recommended"
],
"rules": {},
"parserOptions": {
"parser": "babel-eslint"
},
"overrides": [
{
"files": [
Expand All @@ -78,14 +65,5 @@
}
}
]
},
"postcss": {
"plugins": {
"autoprefixer": {}
}
},
"browserslist": [
"> 3%",
"last 2 versions"
]
}
}
Loading