From ac45b8a0a5327433c902cfadaf96ffc3e52978e1 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Thu, 5 Jan 2023 20:33:21 +0100 Subject: [PATCH] formatting fixes --- webclient/.dockerignore | 1 - webclient/README.md | 22 +++---- webclient/build.sh | 2 +- webclient/index.html | 2 +- webclient/src/App.vue | 2 +- webclient/src/assets/main.scss | 2 +- .../src/codegen/.swagger-codegen/VERSION | 2 +- .../src/components/DetailsFeedbackButton.vue | 10 +++- .../components/DetailsOverviewSections.vue | 17 ++++-- .../src/components/DetailsRoomfinderMap.vue | 60 ++++++++++++------- webclient/src/components/FeedbackModal.vue | 2 +- webclient/src/locales/de.yaml | 2 +- webclient/src/stores/details.ts | 4 +- webclient/src/views/DetailsView.vue | 10 +++- webclient/src/views/MainView.vue | 4 +- webclient/src/views/SearchView.vue | 3 +- webclient/tsconfig.config.json | 2 +- 17 files changed, 94 insertions(+), 53 deletions(-) diff --git a/webclient/.dockerignore b/webclient/.dockerignore index cc912f508..1992b6ab8 100644 --- a/webclient/.dockerignore +++ b/webclient/.dockerignore @@ -2,4 +2,3 @@ node_modules/* dist/* cdn/* .vscode/* - diff --git a/webclient/README.md b/webclient/README.md index f15089dbc..d0d85216b 100644 --- a/webclient/README.md +++ b/webclient/README.md @@ -30,15 +30,17 @@ npm install ## Run Ensure that _NavigaTUM-server_ is running in the background: - - either via following the [guide to local development](../server/README.md), or - - via [docker](https://docs.docker.com/) - *docker isolates the network, but we want these two containers to communicate to each other without being as brittle as IPs.* - *Naming the `navigatum-mieli-search` container `search` makes us able to connect to it via <`http://search:7700`> from the server* - ```bash - docker network create navigatum-net - docker run -it --rm -p 7700:7700 --name search --network navigatum-net ghcr.io/tum-dev/navigatum-mieli-search:main - docker run -it --rm -p 8080:8080 --network navigatum-net -e MIELI_SEARCH_ADDR=search ghcr.io/tum-dev/navigatum-server:main - ``` + +- either via following the [guide to local development](../server/README.md), or +- via [docker](https://docs.docker.com/) + _docker isolates the network, but we want these two containers to communicate to each other without being as brittle as IPs._ + _Naming the `navigatum-mieli-search` container `search` makes us able to connect to it via <`http://search:7700`> from the server_ + ```bash + docker network create navigatum-net + docker run -it --rm -p 7700:7700 --name search --network navigatum-net ghcr.io/tum-dev/navigatum-mieli-search:main + docker run -it --rm -p 8080:8080 --network navigatum-net -e MIELI_SEARCH_ADDR=search ghcr.io/tum-dev/navigatum-server:main + ``` + By default, the webclient will connect to the server on `http://localhost:8080`. If you want to connect to the public API instead, change `VITE_APP_URL` in [`env/.env`](./env/.env) to `https://nav.tum.de`. @@ -67,7 +69,7 @@ If you serve the release build with a webserver (such as Nginx) you need to sele ```plain -.html ↑ ↑ - │ └── The page language. Either "de" or "en" at the moment. + │ └── The page language. Either "de" or "en" at the moment. │ It should be selected based on the "lang" Cookie or else the "Accept-Language" header. └── The page theme. Either "light" or "dark" at the moment. It should be selected based on the "theme" Cookie ("light" by default). diff --git a/webclient/build.sh b/webclient/build.sh index 7931074cb..5c156f36e 100755 --- a/webclient/build.sh +++ b/webclient/build.sh @@ -24,4 +24,4 @@ done # compress data (only using gzip, because brotli on ngnix is a royal pain) -gzip --force --keep --recursive ../dist \ No newline at end of file +gzip --force --keep --recursive ../dist diff --git a/webclient/index.html b/webclient/index.html index 01ca5d4ef..6dc284b4e 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/webclient/src/App.vue b/webclient/src/App.vue index 416104e26..307405ca6 100644 --- a/webclient/src/App.vue +++ b/webclient/src/App.vue @@ -171,7 +171,7 @@ const global = useGlobalStore(); /* === Content === */ #content { - min-height: calc(100vh - 200px); + min-height: calc(100vh - 200px); } // 10px + 60px for header diff --git a/webclient/src/assets/main.scss b/webclient/src/assets/main.scss index 9148bf4ba..a16b8e03a 100644 --- a/webclient/src/assets/main.scss +++ b/webclient/src/assets/main.scss @@ -102,4 +102,4 @@ body { background: $toast-btn-bg; border-color: $light-color; } -} \ No newline at end of file +} diff --git a/webclient/src/codegen/.swagger-codegen/VERSION b/webclient/src/codegen/.swagger-codegen/VERSION index 3356a5d93..f4605dc50 100644 --- a/webclient/src/codegen/.swagger-codegen/VERSION +++ b/webclient/src/codegen/.swagger-codegen/VERSION @@ -1 +1 @@ -3.0.36 \ No newline at end of file +3.0.36 diff --git a/webclient/src/components/DetailsFeedbackButton.vue b/webclient/src/components/DetailsFeedbackButton.vue index b54b64be7..14fcc2614 100644 --- a/webclient/src/components/DetailsFeedbackButton.vue +++ b/webclient/src/components/DetailsFeedbackButton.vue @@ -89,9 +89,13 @@ function openFeedbackForm(addLocationPicker) { const body = _getFeedbackBody(currentEdits); const subject = _getFeedbackSubject(currentEdits); - window.setTimeout(()=>document - .getElementById("feedback-coordinate-picker") - .addEventListener("click", addLocationPicker),100) + window.setTimeout( + () => + document + .getElementById("feedback-coordinate-picker") + .addEventListener("click", addLocationPicker), + 100 + ); useGlobalStore().openFeedback(FeedbackCategory.Entry, subject, body); } diff --git a/webclient/src/components/DetailsOverviewSections.vue b/webclient/src/components/DetailsOverviewSections.vue index ed18cd428..d4cb76245 100644 --- a/webclient/src/components/DetailsOverviewSections.vue +++ b/webclient/src/components/DetailsOverviewSections.vue @@ -101,9 +101,16 @@ function updateRoomsOverview(setSelected = undefined) { -->
-