Gitlab Community Edition Instance

Skip to content
Snippets Groups Projects
Commit 2efe22e9 authored by Michelle Weidling's avatar Michelle Weidling :herb:
Browse files

Merge branch 'issue/rename-qviewer-to-tido' into 'develop'

rename-qviewer-to-tido

See merge request !160
parents 01b51ba3 e8d2c2f6
No related branches found
No related tags found
1 merge request!160rename-qviewer-to-tido
Pipeline #206809 passed
......@@ -75,11 +75,11 @@ load_frontend-all:
- unzip frontend.zip
- bash ci-scripts/set-entrypoint.sh
- mkdir -p docker/frontend
- cp Qviewer/dist/* docker/frontend/
- cp tido/dist/* docker/frontend/
- mkdir docker/frontend/syriac && mkdir docker/frontend/arabic-karshuni
- cp Qviewer/dist/* docker/frontend/syriac
- cp tido/dist/* docker/frontend/syriac
- sed -i 's/textapi\/ahikar\/arabic-karshuni/textapi\/ahikar\/syriac/' docker/frontend/syriac/index.html
- cp Qviewer/dist/* docker/frontend/arabic-karshuni
- cp tido/dist/* docker/frontend/arabic-karshuni
- bash ci-scripts/update-css.sh
artifacts:
paths:
......
......@@ -610,7 +610,7 @@ We didn't before and that caused an error while assigning IDs to elements.
### Added
- the AnnotationAPI which is compliant to the W3C Annotation Model.
With this API, we can expose annotations to the QViewer which can then be serialized in different ways.
With this API, we can expose annotations to TIDO which can then be serialized in different ways.
### Changed
......
......@@ -71,7 +71,7 @@ ant -f exist-app/build.xml xar
GITLAB_TOKEN=""
curl --header "PRIVATE-TOKEN: $GITLAB_TOKEN" "https://gitlab.gwdg.de/api/v4/projects/9882/jobs/artifacts/develop/download?job=build" --output frontend.zip
unzip frontend.zip -d docker/frontend
mv docker/frontend/Qviewer/dist/* docker/frontend && rm -rf docker/frontend/Qviewer
mv docker/frontend/tido/dist/* docker/frontend && rm -rf docker/frontend/tido
```
**Note:** You have to have at least a `Developer` role in the repository in order to do this.
......@@ -129,7 +129,7 @@ The corresponding frontend for the Ahiqar backend is [Ahiqar's version of the TI
In order to connect the back end with the viewer, the former simply has to expose a REST API that complies to the specification of the [SUB's generic TextAPI](https://subugoe.pages.gwdg.de/emo/text-api/).
The specification of the project specific API can be found at the [API's documentation page](https://subugoe.pages.gwdg.de/ahiqar/api-documentation/).
The frontend takes care of the data transfer as described in [TIDO's README](https://gitlab.gwdg.de/subugoe/emo/Qviewer/-/blob/develop/README.md#connecting-the-viewer-with-a-backend).
The frontend takes care of the data transfer as described in [TIDO's README](https://gitlab.gwdg.de/subugoe/emo/tido/-/blob/develop/README.md#connecting-the-viewer-with-a-backend).
## Tests
......
#!/bin/bash
# this script sets the entrypoint for the Qviewer that depends on the
# this script sets the entrypoint for TIDO that depends on the
# branch it is build from.
......@@ -7,15 +7,15 @@ echo CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
case ${CI_COMMIT_REF_NAME} in
"main")
sed -i "s ahikar.*\.sub ahikar.sub g" Qviewer/dist/index.html
sed -i "s ahikar.*\.sub ahikar.sub g" tido/dist/index.html
echo "set entrypoint for production"
;;
"develop")
sed -i "s ahikar.*\.sub ahikar-dev.sub g" Qviewer/dist/index.html
sed -i "s ahikar.*\.sub ahikar-dev.sub g" tido/dist/index.html
echo "set entrypoint for develop aka staging"
;;
*)
sed -i "s ahikar.*\.sub ahikar-test.sub g" Qviewer/dist/index.html
sed -i "s ahikar.*\.sub ahikar-test.sub g" tido/dist/index.html
echo "set entrypoint for testing"
;;
esac
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment