From d4544963b8e2d67e24081dd731c2bb0e85086fbb Mon Sep 17 00:00:00 2001 From: Oesterling Nils Date: Mon, 5 Aug 2024 14:33:15 +0200 Subject: [PATCH 01/13] new container div integrated for contact and disclaimer-link in side-panel --- ui/src/elements/ngm-side-bar.ts | 96 ++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 44 deletions(-) diff --git a/ui/src/elements/ngm-side-bar.ts b/ui/src/elements/ngm-side-bar.ts index 17a804ff9..60ec1810b 100644 --- a/ui/src/elements/ngm-side-bar.ts +++ b/ui/src/elements/ngm-side-bar.ts @@ -1,13 +1,13 @@ -import {html} from 'lit'; -import {LitElementI18n} from '../i18n.js'; +import { html } from 'lit'; +import { LitElementI18n } from '../i18n.js'; import '../toolbox/ngm-toolbox'; import '../layers/ngm-layers'; import '../layers/ngm-layers-sort'; import '../layers/ngm-catalog'; import './dashboard/ngm-dashboard'; import LayersActions from '../layers/LayersActions'; -import {DEFAULT_LAYER_OPACITY, LayerType} from '../constants'; -import defaultLayerTree, {LayerConfig} from '../layertree'; +import { DEFAULT_LAYER_OPACITY, LayerType } from '../constants'; +import defaultLayerTree, { LayerConfig } from '../layertree'; import { addAssetId, getAssetIds, @@ -19,11 +19,11 @@ import { setCesiumToolbarParam, syncLayersParam } from '../permalink'; -import {createCesiumObject} from '../layers/helpers'; +import { createCesiumObject } from '../layers/helpers'; import i18next from 'i18next'; import 'fomantic-ui-css/components/accordion.js'; import './ngm-map-configuration'; -import type {Cartesian2, Viewer} from 'cesium'; +import type { Cartesian2, Viewer } from 'cesium'; import { BoundingSphere, Cartesian3, @@ -34,19 +34,19 @@ import { ScreenSpaceEventHandler, ScreenSpaceEventType, } from 'cesium'; -import {showSnackbarError, showSnackbarInfo} from '../notifications'; +import { showSnackbarError, showSnackbarInfo } from '../notifications'; import auth from '../store/auth'; import './ngm-share-link'; import '../layers/ngm-layers-upload'; import MainStore from '../store/main'; -import {classMap} from 'lit/directives/class-map.js'; +import { classMap } from 'lit/directives/class-map.js'; import $ from '../jquery'; -import {customElement, property, query, state} from 'lit/decorators.js'; +import { customElement, property, query, state } from 'lit/decorators.js'; import type QueryManager from '../query/QueryManager'; import DashboardStore from '../store/dashboard'; -import {getAssets} from '../api-ion'; -import {parseKml, renderWithDelay} from '../cesiumutils'; +import { getAssets } from '../api-ion'; +import { parseKml, renderWithDelay } from '../cesiumutils'; type SearchLayer = { layer: string @@ -58,11 +58,11 @@ type SearchLayer = { @customElement('ngm-side-bar') export class SideBar extends LitElementI18n { - @property({type: Object}) + @property({ type: Object }) accessor queryManager: QueryManager | null = null; - @property({type: Boolean}) + @property({ type: Boolean }) accessor mobileView = false; - @property({type: Boolean}) + @property({ type: Boolean }) accessor displayUndergroundHint = true; @state() accessor catalogLayers: LayerConfig[] | undefined; @@ -175,22 +175,22 @@ export class SideBar extends LitElementI18n { .filter(config => config.visible && !config.noQuery); const shareBtn = html` -
this.togglePanel('share')}>
`; const settingsBtn = html` -
this.togglePanel('settings')}>
`; const dataMobileHeader = html`
this.hideDataDisplayed = true} - class="ngm-data-catalog-label ${classMap({active: this.hideDataDisplayed})}"> + class="ngm-data-catalog-label ${classMap({ active: this.hideDataDisplayed })}"> ${i18next.t('lyr_geocatalog_label')}
this.hideDataDisplayed = false} - class="ngm-data-catalog-label ${classMap({active: !this.hideDataDisplayed})}"> + class="ngm-data-catalog-label ${classMap({ active: !this.hideDataDisplayed })}"> ${i18next.t('dtd_displayed_data_label')}
`; @@ -204,15 +204,15 @@ export class SideBar extends LitElementI18n {
-
this.togglePanel('dashboard')}>
-
this.togglePanel('data')}>
-
this.togglePanel('tools', false)}>
@@ -221,9 +221,9 @@ export class SideBar extends LitElementI18n { class="ngm-mob-menu-toggle" @click=${() => this.mobileShowAll = !this.mobileShowAll}>
+ 'ngm-view-all-icon': !this.mobileShowAll, + 'ngm-view-less-icon': this.mobileShowAll + })}">
@@ -241,7 +241,7 @@ export class SideBar extends LitElementI18n { ${this.mobileView ? dataMobileHeader : i18next.t('lyr_geocatalog_label')}
this.activePanel = ''}>
-
this.hideDataDisplayed = !this.hideDataDisplayed}> ${i18next.t('dtd_configure_data_btn')}
@@ -266,15 +266,23 @@ export class SideBar extends LitElementI18n {
this.activePanel = ''}>
- -
( this.querySelector('.ngm-debug-tools-toggle > input')).click()}> - - - - + + +
+ +
(this.querySelector('.ngm-debug-tools-toggle > input')).click()}> + + + +
+ ${i18next.t('contact_mailto_text')} + ${i18next.t('disclaimer_text')} +
+ +
-
@@ -285,25 +293,25 @@ export class SideBar extends LitElementI18n {
-
${this.layerOrderChangeActive ? i18next.t('dtd_finish_ordering_label') : i18next.t('dtd_change_order_label')}
${this.layerOrderChangeActive ? - html` + html` this.onLayersOrderChange(evt.detail)}> ` : - html` + html` this.onRemoveDisplayedLayer(evt)} @layerChanged=${evt => this.onLayerChanged(evt)}> ` - } + }
${i18next.t('dtd_user_content_label')}
fl.layer === urlLayer.layer); if (!layer) { // Layers from the search are not present in the flat layers. - layer = this.createSearchLayer({layer: urlLayer.layer, label: urlLayer.layer}); // the proper label will be taken from getCapabilities + layer = this.createSearchLayer({ layer: urlLayer.layer, label: urlLayer.layer }); // the proper label will be taken from getCapabilities } else { await (layer.promise || this.addLayer(layer)); layer.add && layer.add(); @@ -458,7 +466,7 @@ export class SideBar extends LitElementI18n { for (let i = 0; i < panelElement.childElementCount; i++) { const element = panelElement.children.item(i); if (element && element.classList.contains('accordion')) { - $(element).accordion({duration: 150}); + $(element).accordion({ duration: 150 }); } } this.accordionInited = true; @@ -515,13 +523,13 @@ export class SideBar extends LitElementI18n { && config.visible && [LayerType.tiles3d, LayerType.earthquakes].includes(config.type!) && !this.viewer?.scene.cameraUnderground) { - showSnackbarInfo(i18next.t('lyr_subsurface_hint'), {displayTime: 20000}); + showSnackbarInfo(i18next.t('lyr_subsurface_hint'), { displayTime: 20000 }); this.displayUndergroundHint = false; } } async onRemoveDisplayedLayer(evt) { - const {config, idx} = evt.detail; + const { config, idx } = evt.detail; this.activeLayers.splice(idx, 1); await this.removeLayer(config); } @@ -713,7 +721,7 @@ export class SideBar extends LitElementI18n { // done like this to have correct rerender of component const promise = Promise.resolve(dataSource); const config: LayerConfig = { - load() {return promise;}, + load() { return promise; }, label: name, layer, promise: promise, @@ -731,7 +739,7 @@ export class SideBar extends LitElementI18n { const active = event.target.checked; this.debugToolsActive = active; setCesiumToolbarParam(active); - this.dispatchEvent(new CustomEvent('toggleDebugTools', {detail: {active}})); + this.dispatchEvent(new CustomEvent('toggleDebugTools', { detail: { active } })); } createRenderRoot() { From 14048af91e41d80999d2f303e688a4993ac1e26b Mon Sep 17 00:00:00 2001 From: Oesterling Nils Date: Mon, 5 Aug 2024 14:33:41 +0200 Subject: [PATCH 02/13] new css class integrated for new container div --- ui/src/style/ngm-side-bar.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui/src/style/ngm-side-bar.css b/ui/src/style/ngm-side-bar.css index aacdd15ff..e03a52611 100644 --- a/ui/src/style/ngm-side-bar.css +++ b/ui/src/style/ngm-side-bar.css @@ -76,6 +76,14 @@ ngm-side-bar { overflow-y: auto; } +/* New css class start */ +.inner-toolbar-settings { + display: flex; + flex-direction: column; + justify-content: space-between; +} +/* New css class end*/ + .ngm-side-bar-panel.ngm-large-panel { width: calc(100vw - 144px); } From 81f62348c7344439fefe38fac0c07db132700057 Mon Sep 17 00:00:00 2001 From: Oesterling Nils Date: Mon, 5 Aug 2024 14:34:11 +0200 Subject: [PATCH 03/13] disabled contact and disclaimer link --- ui/src/ngm-app.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/ngm-app.ts b/ui/src/ngm-app.ts index 4dd913e0f..e32f9d038 100644 --- a/ui/src/ngm-app.ts +++ b/ui/src/ngm-app.ts @@ -514,10 +514,10 @@ export class NgmApp extends LitElementI18n { @toggleProjectSelector=${() => this.showProjectSelector = !this.showProjectSelector}>
- ${i18next.t('contact_mailto_text')} ${i18next.t('disclaimer_text')} + href="${i18next.t('disclaimer_href')}">${i18next.t('disclaimer_text')} --> ${this.showCesiumToolbar ? html` ` : ''} From 3a5756b4479ad7611acd7ce1629bc21412488788 Mon Sep 17 00:00:00 2001 From: vladyslavtk Date: Tue, 6 Aug 2024 18:19:50 +0300 Subject: [PATCH 04/13] lint fix --- ui/src/elements/ngm-side-bar.ts | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/ui/src/elements/ngm-side-bar.ts b/ui/src/elements/ngm-side-bar.ts index 60ec1810b..dafbbe561 100644 --- a/ui/src/elements/ngm-side-bar.ts +++ b/ui/src/elements/ngm-side-bar.ts @@ -1,13 +1,13 @@ -import { html } from 'lit'; -import { LitElementI18n } from '../i18n.js'; +import {html} from 'lit'; +import {LitElementI18n} from '../i18n.js'; import '../toolbox/ngm-toolbox'; import '../layers/ngm-layers'; import '../layers/ngm-layers-sort'; import '../layers/ngm-catalog'; import './dashboard/ngm-dashboard'; import LayersActions from '../layers/LayersActions'; -import { DEFAULT_LAYER_OPACITY, LayerType } from '../constants'; -import defaultLayerTree, { LayerConfig } from '../layertree'; +import {DEFAULT_LAYER_OPACITY, LayerType} from '../constants'; +import defaultLayerTree, {LayerConfig} from '../layertree'; import { addAssetId, getAssetIds, @@ -19,11 +19,11 @@ import { setCesiumToolbarParam, syncLayersParam } from '../permalink'; -import { createCesiumObject } from '../layers/helpers'; +import {createCesiumObject} from '../layers/helpers'; import i18next from 'i18next'; import 'fomantic-ui-css/components/accordion.js'; import './ngm-map-configuration'; -import type { Cartesian2, Viewer } from 'cesium'; +import type {Cartesian2, Viewer} from 'cesium'; import { BoundingSphere, Cartesian3, @@ -34,19 +34,19 @@ import { ScreenSpaceEventHandler, ScreenSpaceEventType, } from 'cesium'; -import { showSnackbarError, showSnackbarInfo } from '../notifications'; +import {showSnackbarError, showSnackbarInfo} from '../notifications'; import auth from '../store/auth'; import './ngm-share-link'; import '../layers/ngm-layers-upload'; import MainStore from '../store/main'; -import { classMap } from 'lit/directives/class-map.js'; +import {classMap} from 'lit/directives/class-map.js'; import $ from '../jquery'; -import { customElement, property, query, state } from 'lit/decorators.js'; +import {customElement, property, query, state} from 'lit/decorators.js'; import type QueryManager from '../query/QueryManager'; import DashboardStore from '../store/dashboard'; -import { getAssets } from '../api-ion'; -import { parseKml, renderWithDelay } from '../cesiumutils'; +import {getAssets} from '../api-ion'; +import {parseKml, renderWithDelay} from '../cesiumutils'; type SearchLayer = { layer: string @@ -58,11 +58,11 @@ type SearchLayer = { @customElement('ngm-side-bar') export class SideBar extends LitElementI18n { - @property({ type: Object }) + @property({type: Object}) accessor queryManager: QueryManager | null = null; - @property({ type: Boolean }) + @property({type: Boolean}) accessor mobileView = false; - @property({ type: Boolean }) + @property({type: Boolean}) accessor displayUndergroundHint = true; @state() accessor catalogLayers: LayerConfig[] | undefined; @@ -175,22 +175,22 @@ export class SideBar extends LitElementI18n { .filter(config => config.visible && !config.noQuery); const shareBtn = html` - `; const settingsBtn = html` -
this.togglePanel('settings')}>
`; const dataMobileHeader = html`
this.hideDataDisplayed = true} - class="ngm-data-catalog-label ${classMap({ active: this.hideDataDisplayed })}"> + class="ngm-data-catalog-label ${classMap({active: this.hideDataDisplayed})}"> ${i18next.t('lyr_geocatalog_label')}
this.hideDataDisplayed = false} - class="ngm-data-catalog-label ${classMap({ active: !this.hideDataDisplayed })}"> + class="ngm-data-catalog-label ${classMap({active: !this.hideDataDisplayed})}"> ${i18next.t('dtd_displayed_data_label')}
`; @@ -204,15 +204,15 @@ export class SideBar extends LitElementI18n {
-
this.togglePanel('dashboard')}>
-
this.togglePanel('data')}>
-
this.togglePanel('tools', false)}>
@@ -241,7 +241,7 @@ export class SideBar extends LitElementI18n { ${this.mobileView ? dataMobileHeader : i18next.t('lyr_geocatalog_label')}
this.activePanel = ''}>
-
this.hideDataDisplayed = !this.hideDataDisplayed}> ${i18next.t('dtd_configure_data_btn')}
@@ -270,7 +270,7 @@ export class SideBar extends LitElementI18n {
-
(this.querySelector('.ngm-debug-tools-toggle > input')).click()}> +
( this.querySelector('.ngm-debug-tools-toggle > input')).click()}> @@ -293,7 +293,7 @@ export class SideBar extends LitElementI18n {
-
${this.layerOrderChangeActive ? i18next.t('dtd_finish_ordering_label') : i18next.t('dtd_change_order_label')}
@@ -375,7 +375,7 @@ export class SideBar extends LitElementI18n { let layer = flatLayers.find(fl => fl.layer === urlLayer.layer); if (!layer) { // Layers from the search are not present in the flat layers. - layer = this.createSearchLayer({ layer: urlLayer.layer, label: urlLayer.layer }); // the proper label will be taken from getCapabilities + layer = this.createSearchLayer({layer: urlLayer.layer, label: urlLayer.layer}); // the proper label will be taken from getCapabilities } else { await (layer.promise || this.addLayer(layer)); layer.add && layer.add(); @@ -466,7 +466,7 @@ export class SideBar extends LitElementI18n { for (let i = 0; i < panelElement.childElementCount; i++) { const element = panelElement.children.item(i); if (element && element.classList.contains('accordion')) { - $(element).accordion({ duration: 150 }); + $(element).accordion({duration: 150}); } } this.accordionInited = true; @@ -523,13 +523,13 @@ export class SideBar extends LitElementI18n { && config.visible && [LayerType.tiles3d, LayerType.earthquakes].includes(config.type!) && !this.viewer?.scene.cameraUnderground) { - showSnackbarInfo(i18next.t('lyr_subsurface_hint'), { displayTime: 20000 }); + showSnackbarInfo(i18next.t('lyr_subsurface_hint'), {displayTime: 20000}); this.displayUndergroundHint = false; } } async onRemoveDisplayedLayer(evt) { - const { config, idx } = evt.detail; + const {config, idx} = evt.detail; this.activeLayers.splice(idx, 1); await this.removeLayer(config); } @@ -739,7 +739,7 @@ export class SideBar extends LitElementI18n { const active = event.target.checked; this.debugToolsActive = active; setCesiumToolbarParam(active); - this.dispatchEvent(new CustomEvent('toggleDebugTools', { detail: { active } })); + this.dispatchEvent(new CustomEvent('toggleDebugTools', {detail: {active}})); } createRenderRoot() { From 98376c671a592e70352a3020b393d825a3ede66d Mon Sep 17 00:00:00 2001 From: oeni2023 <141681986+oeni2023@users.noreply.github.com> Date: Mon, 12 Aug 2024 22:53:02 +0200 Subject: [PATCH 05/13] gap property integrated in ngm-side-bar.css for .inner-toolbar.settings class --- ui/src/style/ngm-side-bar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/style/ngm-side-bar.css b/ui/src/style/ngm-side-bar.css index e03a52611..146c615a3 100644 --- a/ui/src/style/ngm-side-bar.css +++ b/ui/src/style/ngm-side-bar.css @@ -81,6 +81,7 @@ ngm-side-bar { display: flex; flex-direction: column; justify-content: space-between; + gap: 10px; } /* New css class end*/ From 990ba751dd7129c5b008a60d0050778715c88634 Mon Sep 17 00:00:00 2001 From: oeni2023 <141681986+oeni2023@users.noreply.github.com> Date: Mon, 12 Aug 2024 22:53:57 +0200 Subject: [PATCH 06/13] color, fontsize shodow changed for contact and disclaimer links --- ui/src/style/index.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/style/index.css b/ui/src/style/index.css index 40ab2330a..025332d47 100644 --- a/ui/src/style/index.css +++ b/ui/src/style/index.css @@ -513,9 +513,9 @@ ngm-voxel-filter .ngm-action-btn.ui.button { position: absolute; z-index: 2; left: 5px; - font-size: 12px; - color: #fff; - text-shadow: 0 0 2px #000; + /* font-size: 12px; */ + color: #000000;/* #fff;*/ + /* text-shadow: 0 0 2px #000; */ } .contact-mailto-link { bottom: 60px; From 7e373527dad1ce0bc5ff108eb5c6db587366c9a8 Mon Sep 17 00:00:00 2001 From: oeni2023 <141681986+oeni2023@users.noreply.github.com> Date: Mon, 12 Aug 2024 23:04:31 +0200 Subject: [PATCH 07/13] color, fontsize shodow changed for contact and disclaimer links --- ui/src/style/index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/style/index.css b/ui/src/style/index.css index 025332d47..f87d808a3 100644 --- a/ui/src/style/index.css +++ b/ui/src/style/index.css @@ -514,7 +514,7 @@ ngm-voxel-filter .ngm-action-btn.ui.button { z-index: 2; left: 5px; /* font-size: 12px; */ - color: #000000;/* #fff;*/ + color: #357183;/* #fff;*/ /* text-shadow: 0 0 2px #000; */ } .contact-mailto-link { From f8863fce6ea5cfe8405a8862a5153373a268de9c Mon Sep 17 00:00:00 2001 From: oeni2023 <141681986+oeni2023@users.noreply.github.com> Date: Tue, 13 Aug 2024 21:31:42 +0200 Subject: [PATCH 08/13] login text disabled --- ui/src/elements/ngm-auth.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/elements/ngm-auth.ts b/ui/src/elements/ngm-auth.ts index 74b78754e..32e04b838 100644 --- a/ui/src/elements/ngm-auth.ts +++ b/ui/src/elements/ngm-auth.ts @@ -63,7 +63,7 @@ export class NgmAuth extends LitElementI18n {
- ${!this.user ? i18next.t('lsb_login') : i18next.t('lsb_logout')} +
`; } From 10fe2e90529e4ddffc43783ddd0ddc38c48d954c Mon Sep 17 00:00:00 2001 From: oeni2023 <141681986+oeni2023@users.noreply.github.com> Date: Thu, 15 Aug 2024 19:47:30 +0200 Subject: [PATCH 09/13] remove comments and add margin to .inner-toolbar-settings --- ui/src/elements/ngm-side-bar.ts | 4 ---- ui/src/ngm-app.ts | 4 ---- ui/src/style/index.css | 4 +--- ui/src/style/ngm-side-bar.css | 3 +-- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ui/src/elements/ngm-side-bar.ts b/ui/src/elements/ngm-side-bar.ts index dafbbe561..b8fad1406 100644 --- a/ui/src/elements/ngm-side-bar.ts +++ b/ui/src/elements/ngm-side-bar.ts @@ -266,8 +266,6 @@ export class SideBar extends LitElementI18n {
this.activePanel = ''}>
- -
( this.querySelector('.ngm-debug-tools-toggle > input')).click()}> @@ -280,8 +278,6 @@ export class SideBar extends LitElementI18n { ${i18next.t('disclaimer_text')}
- -
this.showProjectSelector = !this.showProjectSelector}>
-
${this.showCesiumToolbar ? html` ` : ''} diff --git a/ui/src/style/index.css b/ui/src/style/index.css index f87d808a3..fa29f19ce 100644 --- a/ui/src/style/index.css +++ b/ui/src/style/index.css @@ -513,9 +513,7 @@ ngm-voxel-filter .ngm-action-btn.ui.button { position: absolute; z-index: 2; left: 5px; - /* font-size: 12px; */ - color: #357183;/* #fff;*/ - /* text-shadow: 0 0 2px #000; */ + color: #357183; } .contact-mailto-link { bottom: 60px; diff --git a/ui/src/style/ngm-side-bar.css b/ui/src/style/ngm-side-bar.css index 146c615a3..13e9f6ed8 100644 --- a/ui/src/style/ngm-side-bar.css +++ b/ui/src/style/ngm-side-bar.css @@ -76,14 +76,13 @@ ngm-side-bar { overflow-y: auto; } -/* New css class start */ .inner-toolbar-settings { display: flex; flex-direction: column; justify-content: space-between; gap: 10px; + margin-top: 14px; } -/* New css class end*/ .ngm-side-bar-panel.ngm-large-panel { width: calc(100vw - 144px); From 02bff0ad945a92f5330544a78c7b8ff903616af9 Mon Sep 17 00:00:00 2001 From: oeni2023 <141681986+oeni2023@users.noreply.github.com> Date: Thu, 15 Aug 2024 20:59:15 +0200 Subject: [PATCH 10/13] Installation description modified in readme.md --- README.md | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 160c36ffd..24650c01e 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,43 @@ You are welcome to use and adapt this software for your own uses; see [LICENSE]( ## Your own version: getting started +Clone the repository ```bash git clone https://github.com/swissgeol/ngm.git -cd ngm +``` + +### Linux and Mac OS X + +> **Install** *node.js and npm* +> See instructions at [https://nodejs.org/en/download/package-manager](https://nodejs.org/en/download/package-manager) + +#### Start frontend + +From the root directory change to the ```ui```-dirrectory +```bash +cd ui +``` +Install dependencies +```bash +npm install +``` +start development server +```bash +npm start +``` + +open http://localhost:8000 + +#### Start backend api + +> **Install** *Docker* +> See instructions at [https://docs.docker.com/get-docker/](https://docs.docker.com/get-docker/) + +> **Install** *rust and cargo* +> See instructions at [https://doc.rust-lang.org/cargo/getting-started/installation.html](https://doc.rust-lang.org/cargo/getting-started/installation.html) + +Start the api and application +```bash make run ``` From 25ac49284c385356822e975a2ee1d88141fe22fc Mon Sep 17 00:00:00 2001 From: oeni2023 <141681986+oeni2023@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:48:05 +0200 Subject: [PATCH 11/13] Label of login button removed --- ui/src/elements/ngm-auth.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/src/elements/ngm-auth.ts b/ui/src/elements/ngm-auth.ts index 32e04b838..69be5917f 100644 --- a/ui/src/elements/ngm-auth.ts +++ b/ui/src/elements/ngm-auth.ts @@ -62,8 +62,7 @@ export class NgmAuth extends LitElementI18n { return html`
-
- +
`; } From ca24391c7b72f44e41a31680a993df079ae3c2c1 Mon Sep 17 00:00:00 2001 From: vladyslavtk Date: Mon, 19 Aug 2024 11:33:06 +0300 Subject: [PATCH 12/13] lint fix --- ui/src/elements/ngm-auth.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/src/elements/ngm-auth.ts b/ui/src/elements/ngm-auth.ts index 69be5917f..d509d83e3 100644 --- a/ui/src/elements/ngm-auth.ts +++ b/ui/src/elements/ngm-auth.ts @@ -1,7 +1,6 @@ import {html} from 'lit'; import type {AuthUser} from '../auth'; import Auth from '../auth'; -import i18next from 'i18next'; import {LitElementI18n} from '../i18n.js'; import auth from '../store/auth'; import {classMap} from 'lit/directives/class-map.js'; From 4a50406f4d5e6ac9db2cd95d94e83050d16bd5aa Mon Sep 17 00:00:00 2001 From: vladyslavtk Date: Mon, 19 Aug 2024 11:33:50 +0300 Subject: [PATCH 13/13] update locales --- ui/locales/app.de.json | 2 -- ui/locales/app.en.json | 2 -- ui/locales/app.fr.json | 2 -- ui/locales/app.it.json | 2 -- 4 files changed, 8 deletions(-) diff --git a/ui/locales/app.de.json b/ui/locales/app.de.json index 2b2de238d..35be1810e 100644 --- a/ui/locales/app.de.json +++ b/ui/locales/app.de.json @@ -94,8 +94,6 @@ "header_search_placeholder": "Suche...", "lsb_cesium_toolbar_label": "Cesium-Toolbar", "lsb_debug_tools": "Debugtools", - "lsb_login": "Login", - "lsb_logout": "Logout", "lsb_settings": "Einstellungen", "lsb_share": "Teilen", "lyr_3d_model_berne_label": "3D-Modell Stadt Bern", diff --git a/ui/locales/app.en.json b/ui/locales/app.en.json index 98a5e6e9b..ab172701f 100644 --- a/ui/locales/app.en.json +++ b/ui/locales/app.en.json @@ -94,8 +94,6 @@ "header_search_placeholder": "Search...", "lsb_cesium_toolbar_label": "Cesium Toolbar", "lsb_debug_tools": "Debug tools", - "lsb_login": "Login", - "lsb_logout": "Logout", "lsb_settings": "Settings", "lsb_share": "Share", "lyr_3d_model_berne_label": "City of Bern", diff --git a/ui/locales/app.fr.json b/ui/locales/app.fr.json index 63bec4087..4e7850eea 100644 --- a/ui/locales/app.fr.json +++ b/ui/locales/app.fr.json @@ -94,8 +94,6 @@ "header_search_placeholder": "Recherche...", "lsb_cesium_toolbar_label": "Cesium Toolbar", "lsb_debug_tools": "Debug tools", - "lsb_login": "Connexion", - "lsb_logout": "Déconnexion", "lsb_settings": "Paramètres", "lsb_share": "Partager", "lyr_3d_model_berne_label": "Modèle 3D Ville de Berne", diff --git a/ui/locales/app.it.json b/ui/locales/app.it.json index 8c4fc2237..9ccea9c95 100644 --- a/ui/locales/app.it.json +++ b/ui/locales/app.it.json @@ -94,8 +94,6 @@ "header_search_placeholder": "Ricercare...", "lsb_cesium_toolbar_label": "Cesium Toolbar", "lsb_debug_tools": "Debug tools", - "lsb_login": "Connessione", - "lsb_logout": "Diconnessione", "lsb_settings": "Impostazioni", "lsb_share": "Condividere", "lyr_3d_model_berne_label": "Modello 3D Città di Berna",