Skip to content
Snippets Groups Projects
Commit 3f60c9bd authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Merge branch 'master' into provider-component

parents fb4ff75c fa68c761
No related branches found
No related tags found
No related merge requests found
Pipeline #14716 passed
Showing
with 65 additions and 52 deletions
node_modules node_modules
demo/dist demo/dist
.idea .idea
yarn-error.log
\ No newline at end of file
...@@ -23,8 +23,8 @@ publish: ...@@ -23,8 +23,8 @@ publish:
- publish - publish
- master - master
script: script:
- sudo npm install --global can-npm-publish - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > ~/.npmrc
- yarn config set registry https://registry.npmjs.org/
- yarn config set cache-folder "$CI_PROJECT_DIR/_yarn_cache" - yarn config set cache-folder "$CI_PROJECT_DIR/_yarn_cache"
- yarn install - yarn install
- yarn run build
- yarn run publish - yarn run publish
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
\ No newline at end of file
-----BEGIN CERTIFICATE-----
MIIB+zCCAWSgAwIBAgIJK4ZWtXTSz2GzMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
BAMTEWRicC1kZXYubG9jYWxob3N0MB4XDTIwMTAyODE0MzAxNVoXDTQ4MDMxNDE0
MzAxNVowHDEaMBgGA1UEAxMRZGJwLWRldi5sb2NhbGhvc3QwgZ8wDQYJKoZIhvcN
AQEBBQADgY0AMIGJAoGBAL7Eb+sioAPQxMfHAVY7pzkeMPMsf3oKA9BepNjIXv2z
FkWMwpH/+UoKyYwYG0lE+aTS26nUgVVXQMtWReUEBKtxFVzQpcbqNy22vS88Jigs
zIuricui2o9nK46hlVMXI5yDz2lIElFTifxYqrjrpVki+khILldYmlRyoTowrraX
AgMBAAGjRTBDMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgL0MCYGA1UdEQQfMB2G
G2h0dHA6Ly9leGFtcGxlLm9yZy93ZWJpZCNtZTANBgkqhkiG9w0BAQsFAAOBgQCB
YmWmKGradZOEndfQi/GELG3yqWdxy8wXPHm86V1unvMEkaYaj3svRyYjwob5YaJ5
GBboxWfYTo1YlzqK37RgythSCylmeEjpMr/dx8o+XdtTnSASNPoGvh5XGReWZKbw
Z82efBk4FFmIgDFtcZJ/QD7XfAATH5O7o+NS+VPmtg==
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
MIICXQIBAAKBgQC+xG/rIqAD0MTHxwFWO6c5HjDzLH96CgPQXqTYyF79sxZFjMKR
//lKCsmMGBtJRPmk0tup1IFVV0DLVkXlBASrcRVc0KXG6jcttr0vPCYoLMyLq4nL
otqPZyuOoZVTFyOcg89pSBJRU4n8WKq466VZIvpISC5XWJpUcqE6MK62lwIDAQAB
AoGBAJ1BQSELwexjRFOK8MctFYQ4JxHONKddahdybWFmiyeHYWyjxCCmadFnYw1h
Md0MRt5gE0PEMXkwG/GChMtsrItaj9XEK41vlxo0V80kj/QhAUnX00T1RpajX4mI
pm99ioR8KHyL3akPm5pvUrb+Wl3SvoLvxwfQn2sz5OInrrTBAkEA4p4n3USNqXHa
NMQmbiGjDPp1qGyOpZkJsIjuIUnyZTSQ8Uxj8vDhkrWmqBUwjLchEXZabkugMsWp
Y8i6Yer4bQJBANeAV2QdePaZYY4+7oNZvIFCW/L6h11DSRZm+QSY5q9O+8U/nXqc
uz4/m5SLfqk50+0j1zCJU+dIzbDxyzmgUJMCQQDIzgvU7WH5u4D3MLg87mFkpqqL
S2Y7JpiHbU5VAQlg1Gt65Y3LP9ciAQRj/CLBDaSnrJAFG84gLzYhzUQab/MhAkBZ
4/4QE78mVfp8hEGnZqIb5NtH8jrOq0dsYc2TnlfzXmXk9FEzGPd90riJ8NoHqsh8
zYtwgogOHK84FNPpmLajAkAKbxZk94jR7Rehyzr8n/ptsILJJeyiDoixXrTMerIS
H/Dvgoby1xgpIwYL99HzxtS9HjL+kSZq4cTY7uGVXbsk
-----END RSA PRIVATE KEY-----
.cert
\ No newline at end of file
...@@ -3272,13 +3272,20 @@ i18next-scanner@^3.0.0: ...@@ -3272,13 +3272,20 @@ i18next-scanner@^3.0.0:
vinyl "^2.2.0" vinyl "^2.2.0"
vinyl-fs "^3.0.1" vinyl-fs "^3.0.1"
i18next@*, i18next@^19.5.1, i18next@^19.8.3: i18next@*, i18next@^19.5.1:
version "19.8.3" version "19.8.3"
resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.3.tgz#10df7222db8c23389b13bceb9ba67a5e20a0241e" resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.3.tgz#10df7222db8c23389b13bceb9ba67a5e20a0241e"
integrity sha512-eVrqAw2gGGYYJaJMYw4VM1FNFawLD4b84IsoTZMVXeWHaxAM2gyTa34j2Sip15UkBz/LrSxdFJj0Jhlrz7EvHA== integrity sha512-eVrqAw2gGGYYJaJMYw4VM1FNFawLD4b84IsoTZMVXeWHaxAM2gyTa34j2Sip15UkBz/LrSxdFJj0Jhlrz7EvHA==
dependencies: dependencies:
"@babel/runtime" "^7.12.0" "@babel/runtime" "^7.12.0"
i18next@^19.8.4:
version "19.8.4"
resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.4.tgz#447718f2a26319b8debdbcc6fbc1a9761be7316b"
integrity sha512-FfVPNWv+felJObeZ6DSXZkj9QM1Ivvh7NcFCgA8XPtJWHz0iXVa9BUy+QY8EPrCLE+vWgDfV/sc96BgXVo6HAA==
dependencies:
"@babel/runtime" "^7.12.0"
iconv-lite@0.4.24, iconv-lite@^0.4.4: iconv-lite@0.4.24, iconv-lite@^0.4.4:
version "0.4.24" version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
...@@ -5483,13 +5490,20 @@ rollup@^0.34.7: ...@@ -5483,13 +5490,20 @@ rollup@^0.34.7:
dependencies: dependencies:
source-map-support "^0.4.0" source-map-support "^0.4.0"
rollup@^2.18.0, rollup@^2.18.1, rollup@^2.19.0: rollup@^2.18.1:
version "2.33.2" version "2.33.2"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.2.tgz#c4c76cd405a7605e6ebe90976398c46d4c2ea166" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.2.tgz#c4c76cd405a7605e6ebe90976398c46d4c2ea166"
integrity sha512-QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw== integrity sha512-QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw==
optionalDependencies: optionalDependencies:
fsevents "~2.1.2" fsevents "~2.1.2"
rollup@^2.33.3:
version "2.34.0"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.0.tgz#ecc7f1d4ce2cb88bb51bec2f56b984f3c35b8271"
integrity sha512-dW5iLvttZzdVehjEuNJ1bWvuMEJjOWGmnuFS82WeKHTGXDkRHQeq/ExdifkSyJv9dLcR86ysKRmrIDyR6O0X8g==
optionalDependencies:
fsevents "~2.1.2"
run-parallel@^1.1.9: run-parallel@^1.1.9:
version "1.1.10" version "1.1.10"
resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
], ],
"scripts": { "scripts": {
"test": "lerna run test", "test": "lerna run test",
"publish": "lerna run publish" "build": "lerna run build",
"publish": "lerna publish from-package --yes"
}, },
"author": "", "author": "",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
......
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
\ No newline at end of file
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
"version": "0.1.4", "version": "0.1.4",
"main": "src/index.js", "main": "src/index.js",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"publishConfig": {
"registry": "https://registry.npmjs.org",
"access": "public"
},
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^16.0.0", "@rollup/plugin-commonjs": "^16.0.0",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
...@@ -45,7 +49,6 @@ ...@@ -45,7 +49,6 @@
"watch": "npm run watch-local", "watch": "npm run watch-local",
"watch-local": "rollup -c --watch", "watch-local": "rollup -c --watch",
"test": "npm run build-test && karma start --singleRun", "test": "npm run build-test && karma start --singleRun",
"publish": "can-npm-publish --verbose 2>&1 && npm run build && npm publish --access public 2>&1 || true",
"lint": "eslint ." "lint": "eslint ."
} }
} }
...@@ -56,6 +56,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { ...@@ -56,6 +56,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
this.basePath = '/'; this.basePath = '/';
this.keycloakConfig = null; this.keycloakConfig = null;
this.noWelcomePage = false; this.noWelcomePage = false;
this.menuHeight = -1;
this._updateAuth = this._updateAuth.bind(this); this._updateAuth = this._updateAuth.bind(this);
this._loginStatus = 'unknown'; this._loginStatus = 'unknown';
...@@ -363,7 +364,6 @@ export class AppShell extends ScopedElementsMixin(LitElement) { ...@@ -363,7 +364,6 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
this.updatePageTitle(); this.updatePageTitle();
this.subtitle = this.activeMetaDataText("short_name"); this.subtitle = this.activeMetaDataText("short_name");
this.description = this.activeMetaDataText("description"); this.description = this.activeMetaDataText("description");
}; };
// If it is empty assume the element is already registered through other means // If it is empty assume the element is already registered through other means
...@@ -399,13 +399,31 @@ export class AppShell extends ScopedElementsMixin(LitElement) { ...@@ -399,13 +399,31 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
toggleMenu() { toggleMenu() {
const menu = this.shadowRoot.querySelector("ul.menu"); const menu = this.shadowRoot.querySelector("ul.menu");
const subtitle = this.shadowRoot.querySelector("h2.subtitle");
if (menu === null) { if (menu === null || subtitle === null) {
return; return;
} }
menu.classList.toggle('hidden'); menu.classList.toggle('hidden');
if (this.menuHeight === -1) {
this.menuHeight = menu.clientHeight;
}
let topValue = subtitle.getBoundingClientRect().bottom;
let isMenuOverflow = this.menuHeight + topValue >= window.innerHeight ? true : false;
if (isMenuOverflow && !menu.classList.contains('hidden')) {
menu.setAttribute('style', 'position: fixed;top: ' + topValue + 'px;bottom: 0;border-bottom: 0;overflow-y: auto;');
menu.scrollTop = 0;
document.body.setAttribute('style', 'overflow:hidden;');
} else if (isMenuOverflow && menu.classList.contains('hidden')) {
document.body.removeAttribute('style', 'overflow:hidden;');
menu.removeAttribute('style');
}
const chevron = this.shadowRoot.querySelector("#menu-chevron-icon"); const chevron = this.shadowRoot.querySelector("#menu-chevron-icon");
if (chevron !== null) { if (chevron !== null) {
chevron.name = menu.classList.contains('hidden') ? 'chevron-down' : 'chevron-up'; chevron.name = menu.classList.contains('hidden') ? 'chevron-down' : 'chevron-up';
...@@ -635,8 +653,6 @@ export class AppShell extends ScopedElementsMixin(LitElement) { ...@@ -635,8 +653,6 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
position: absolute; position: absolute;
background-color: white; background-color: white;
z-index: 10; z-index: 10;
overflow-y: scroll;
white-space: nowrap;
} }
.menu li { .menu li {
......
node_modules
.idea
npm-debug.log
package-lock.json
index.html
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
\ No newline at end of file
{ {
"name": "@dbp-toolkit/auth", "name": "@dbp-toolkit/auth",
"homepage": "https://gitlab.tugraz.at/dbp/web-components/toolkit/-/tree/master/packages/auth", "homepage": "https://gitlab.tugraz.at/dbp/web-components/toolkit/-/tree/master/packages/auth",
"version": "0.1.0", "version": "0.1.1",
"main": "src/index.js", "main": "src/index.js",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "publishConfig": {
"registry": "https://registry.npmjs.org",
"access": "public"
},
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^16.0.0", "@rollup/plugin-commonjs": "^16.0.0",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
......
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
\ No newline at end of file
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
"main": "src/index.js", "main": "src/index.js",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"publishConfig": {
"registry": "https://registry.npmjs.org",
"access": "public"
},
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^16.0.0", "@rollup/plugin-commonjs": "^16.0.0",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
...@@ -45,7 +49,6 @@ ...@@ -45,7 +49,6 @@
"watch": "npm run watch-local", "watch": "npm run watch-local",
"watch-local": "rollup -c --watch", "watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development", "watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun", "test": "npm run build-test && karma start --singleRun"
"publish": "can-npm-publish --verbose 2>&1 && npm run build && npm publish --access public 2>&1 || true"
} }
} }
{ {
"check-in-place-select": { "check-in-place-select": {
"placeholder": "Bitte wählen Sie einen Ort aus", "placeholder": "Z.B. \"P1\", \"Rechbauerstraße\", \"PZ2EG048\"",
"error-summary": "Ein Fehler ist aufgetreten", "error-summary": "Ein Fehler ist aufgetreten",
"login-required": "Anmeldung erforderlich" "login-required": "Anmeldung erforderlich"
} }
......
{ {
"check-in-place-select": { "check-in-place-select": {
"placeholder": "Please select a location", "placeholder": "E.g. \"P1\", \"Rechbauerstraße\", \"PZ2EG048\"",
"error-summary": "An error occurred", "error-summary": "An error occurred",
"login-required": "Login required" "login-required": "Login required"
} }
......
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
\ No newline at end of file
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
"build-test": "rollup -c --environment BUILD:test", "build-test": "rollup -c --environment BUILD:test",
"test": "npm run build-test && karma start --singleRun", "test": "npm run build-test && karma start --singleRun",
"watch": "rollup -c --watch", "watch": "rollup -c --watch",
"lint": "eslint .", "lint": "eslint ."
"publish": "can-npm-publish --verbose 2>&1 && npm run build && npm publish --access public 2>&1 || true"
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.3.2", "@open-wc/scoped-elements": "^1.3.2",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment