From b646697e56820a3330cb89141830706a08cd5ee5 Mon Sep 17 00:00:00 2001 From: Petar Hristov Date: Wed, 2 Feb 2022 16:47:29 +0100 Subject: [PATCH 1/4] Fix: Login page text edited (coscine/issues#1941) --- src/LoginApp.vue | 12 +++-- yarn.lock-workspace | 118 ++++++++++++++++++++++++-------------------- 2 files changed, 74 insertions(+), 56 deletions(-) diff --git a/src/LoginApp.vue b/src/LoginApp.vue index ca4ae36..4cf6e34 100644 --- a/src/LoginApp.vue +++ b/src/LoginApp.vue @@ -83,9 +83,7 @@

{{ $t("description_help") }} - Servicedesk + {{ $t("coscineHelpPage") }}

@@ -249,6 +247,14 @@ export default Vue.extend({ this.$root.$i18n.locale = "en"; } }, + getCoscineHelpPageUrl() { + if (this.$root.$i18n.locale === "en") { + return "https://help.itc.rwth-aachen.de/en/service/b2b7729fd93f4c7080b475776f6b5d87/"; + } + else if (this.$root.$i18n.locale === "de") { + return "https://help.itc.rwth-aachen.de/service/b2b7729fd93f4c7080b475776f6b5d87/"; + } + } }, created() { this.retrieveNotices(); diff --git a/yarn.lock-workspace b/yarn.lock-workspace index c04b8e4..062eec5 100644 --- a/yarn.lock-workspace +++ b/yarn.lock-workspace @@ -96,7 +96,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.1.6, @babel/core@npm:^7.10.3": +"@babel/core@npm:^7.1.6, @babel/core@npm:^7.10.3, @babel/core@npm:^7.12.16": version: 7.16.12 resolution: "@babel/core@npm:7.16.12" dependencies: @@ -119,30 +119,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.12.16": - version: 7.16.7 - resolution: "@babel/core@npm:7.16.7" - dependencies: - "@babel/code-frame": ^7.16.7 - "@babel/generator": ^7.16.7 - "@babel/helper-compilation-targets": ^7.16.7 - "@babel/helper-module-transforms": ^7.16.7 - "@babel/helpers": ^7.16.7 - "@babel/parser": ^7.16.7 - "@babel/template": ^7.16.7 - "@babel/traverse": ^7.16.7 - "@babel/types": ^7.16.7 - convert-source-map: ^1.7.0 - debug: ^4.1.0 - gensync: ^1.0.0-beta.2 - json5: ^2.1.2 - semver: ^6.3.0 - source-map: ^0.5.0 - checksum: 3206e077e76db189726c4da19a5296eae11c6c1f5abea7013e74f18708bb91616914717ff8d8ca466cc0ba9d2d2147e9a84c3c357b9ad4cba601da14107838ed - languageName: node - linkType: hard - -"@babel/generator@npm:^7.16.7, @babel/generator@npm:^7.16.8": +"@babel/generator@npm:^7.16.8": version: 7.16.8 resolution: "@babel/generator@npm:7.16.8" dependencies: @@ -418,7 +395,18 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.16.7": +"@babel/highlight@npm:^7.10.4": + version: 7.16.10 + resolution: "@babel/highlight@npm:7.16.10" + dependencies: + "@babel/helper-validator-identifier": ^7.16.7 + chalk: ^2.0.0 + js-tokens: ^4.0.0 + checksum: 1f1bdd752a90844f4efc22166a46303fb651ba0fd75a06daba3ebae2575ab3edc1da9827c279872a3aaf305f50a18473c5fa1966752726a2b253065fd4c0745e + languageName: node + linkType: hard + +"@babel/highlight@npm:^7.16.7": version: 7.16.7 resolution: "@babel/highlight@npm:7.16.7" dependencies: @@ -2648,9 +2636,9 @@ __metadata: linkType: hard "@types/node@npm:^14.14.20": - version: 14.18.9 - resolution: "@types/node@npm:14.18.9" - checksum: a85dae901b5c3b318747e66f2228c0f0778bcd73430a01d7c42814c04ba1070f2817b865d0c5f0c1813b89afeebb34d19cf2662252bae9dc0c18d3ad23fc98c3 + version: 14.18.10 + resolution: "@types/node@npm:14.18.10" + checksum: e722eec37be85dd7dddc4cfd26c501c66f1f2a7e0f603f57ff925348e65a5db603b06363fa27489cbecff44f0ae59812f22509923c4c45ffa5958604cc002401 languageName: node linkType: hard @@ -4383,14 +4371,14 @@ __metadata: linkType: hard "babel-plugin-polyfill-corejs3@npm:^0.5.0": - version: 0.5.1 - resolution: "babel-plugin-polyfill-corejs3@npm:0.5.1" + version: 0.5.2 + resolution: "babel-plugin-polyfill-corejs3@npm:0.5.2" dependencies: "@babel/helper-define-polyfill-provider": ^0.3.1 - core-js-compat: ^3.20.0 + core-js-compat: ^3.21.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: a8945755a1c718c0a18d3137efd962b0555caab4f9186f257e47e95ea077262dfedc4ab6bbbc5d8c09e0455a49fc1d3a97cc24a49d33ca8a093344b9f1ae73e8 + checksum: 2f3184c73f80f00ac876a5ebcad945fd8d2ae70e5f85b7ab6cc3bc69bc74025f4f7070de7abbb2a7274c78e130bd34fc13f4c85342da28205930364a1ef0aa21 languageName: node linkType: hard @@ -5170,7 +5158,14 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001286": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109": + version: 1.0.30001305 + resolution: "caniuse-lite@npm:1.0.30001305" + checksum: dc27fb43e0f4af157d561dcb2ab83b732c59b58b14bfcfa5136ff7fa0c76ad200b5d9bdadb6737982812387d3f247eb5e7afb87cbdd331ccf717da6b544c3f5c + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.30001286": version: 1.0.30001300 resolution: "caniuse-lite@npm:1.0.30001300" checksum: f8c981c0658e2ea67b5e106538a9f3b15d528a6679f2b6e7cb3f508a99e4f9f3f69c73d1b243c77e5ccb3bcef964a801a26a2ba6a13416b42baf314577e3172a @@ -6222,20 +6217,20 @@ __metadata: languageName: node linkType: hard -"core-js-compat@npm:^3.20.0, core-js-compat@npm:^3.20.2": - version: 3.20.3 - resolution: "core-js-compat@npm:3.20.3" +"core-js-compat@npm:^3.20.2, core-js-compat@npm:^3.21.0": + version: 3.21.0 + resolution: "core-js-compat@npm:3.21.0" dependencies: browserslist: ^4.19.1 semver: 7.0.0 - checksum: ebb7af23e798e87b9a5fc00cb304089160b5e259db7002a1026d81d928a74a32cd9c4adda4959526fa75382f074e635fedd6590d16bda60df751734d033988e6 + checksum: 7914d2f8a2f7c1b400e1c04c7560f4c96028bf23cec3cea6063ba594e38023cccbd38ad88af41c5d6b65450e97a989eb37598f609e3f7fbc6ebc1856d4195cbb languageName: node linkType: hard "core-js-pure@npm:^3.10.2": - version: 3.20.3 - resolution: "core-js-pure@npm:3.20.3" - checksum: a8ec44390849bcf0502f20e6349fa087944bb88ac83d796d7fd5ace837d242308aae54b247a6a56bec463e5ab9be08dfad48d389673c34e8e31cc0a661a17a95 + version: 3.21.0 + resolution: "core-js-pure@npm:3.21.0" + checksum: 0b9b72fb241b106997a14fe8099bf62d38f9e5e0e6b46f8ae71f3b05822508a27f34e629f3d7766042a33ae3438938aa401aa1a5d2dbc296affaefed5fe06d68 languageName: node linkType: hard @@ -6247,9 +6242,9 @@ __metadata: linkType: hard "core-js@npm:^3.8.1, core-js@npm:^3.8.2": - version: 3.20.3 - resolution: "core-js@npm:3.20.3" - checksum: 2106cdfb1330abf9e27d577666fc0421feafe8c39bb5af90a63af16e9706c767a7e3a82edc21ce3ed6b9d806f3200d1cf6cc3d0597a8c0af12dbec287c781d65 + version: 3.21.0 + resolution: "core-js@npm:3.21.0" + checksum: 87df49aa2c5d0a521c52102b6669842dd30b334742e86dd4e0173c51230bc48d610060ab6de0f149766d188325b8c1b84598f901cf455674fe6c03ccc5c8026f languageName: node linkType: hard @@ -8578,7 +8573,14 @@ __metadata: languageName: node linkType: hard -"flatted@npm:^3.0.5, flatted@npm:^3.1.0": +"flatted@npm:^3.0.5": + version: 3.2.5 + resolution: "flatted@npm:3.2.5" + checksum: 3c436e9695ccca29620b4be5671dd72e5dd0a7500e0856611b7ca9bd8169f177f408c3b9abfa78dfe1493ee2d873e2c119080a8a9bee4e1a186a9e60ca6c89f1 + languageName: node + linkType: hard + +"flatted@npm:^3.1.0": version: 3.2.4 resolution: "flatted@npm:3.2.4" checksum: 7d33846428ab337ec81ef9b8b9103894c1c81f5f67feb32bd4ed106fbc47da60d56edb42efd36c9f1f30a010272aeccd34ec1ffacfe9dfdff19673b1d4df481b @@ -14829,7 +14831,17 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2": +"postcss-selector-parser@npm:^6.0.0": + version: 6.0.9 + resolution: "postcss-selector-parser@npm:6.0.9" + dependencies: + cssesc: ^3.0.0 + util-deprecate: ^1.0.2 + checksum: f8161ab4d3e5c76b8467189c6d164ba0f6b6e74677435f29e34caa1df01e052b582b4ae4f7468b2243c4befdd8bdcdb7685542d1b2fca8deae21b3e849c78802 + languageName: node + linkType: hard + +"postcss-selector-parser@npm:^6.0.2": version: 6.0.8 resolution: "postcss-selector-parser@npm:6.0.8" dependencies: @@ -15807,7 +15819,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.14.2, resolve@npm:^1.17.0": +"resolve@npm:^1.1.6, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.3.2": version: 1.22.0 resolution: "resolve@npm:1.22.0" dependencies: @@ -15820,7 +15832,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0, resolve@npm:^1.3.2": +"resolve@npm:^1.10.0": version: 1.21.0 resolution: "resolve@npm:1.21.0" dependencies: @@ -15833,7 +15845,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin": +"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.3.2#~builtin": version: 1.22.0 resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin::version=1.22.0&hash=07638b" dependencies: @@ -15846,7 +15858,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.3.2#~builtin": +"resolve@patch:resolve@^1.10.0#~builtin": version: 1.21.0 resolution: "resolve@patch:resolve@npm%3A1.21.0#~builtin::version=1.21.0&hash=07638b" dependencies: @@ -18498,9 +18510,9 @@ __metadata: linkType: hard "vue-i18n@npm:^8.22.0": - version: 8.26.8 - resolution: "vue-i18n@npm:8.26.8" - checksum: 5987efca59d4eba40c3e7024fe99e8456aeb948fbf201c01d3d7c4fddb467c5399f398056fd76266e3bfc591fae4b01e2b99b831678ac12b3e8ec36c6d67ad83 + version: 8.27.0 + resolution: "vue-i18n@npm:8.27.0" + checksum: 6d5af73e3ef219fa2948f508b2fcbee5d669459293f2fab2a08bebaad80f93b6190b0fcae7b5f7b1aa7eab61c896e6b2d4a7e52483282d64f9f5e1d9d0d3af10 languageName: node linkType: hard -- GitLab From 68b439990529116c4a3326c22ffef7cf3b7b936d Mon Sep 17 00:00:00 2001 From: CoscineBot Date: Wed, 2 Feb 2022 15:49:40 +0000 Subject: [PATCH 2/4] Chore: 1.20.2 ## [1.20.2](https://git.rwth-aachen.de/coscine/frontend/apps/login/compare/v1.20.1...v1.20.2) (2022-02-02) ### Fix * Login page text edited (coscine/issues#1941) ([b646697](https://git.rwth-aachen.de/coscine/frontend/apps/login/commit/b646697e56820a3330cb89141830706a08cd5ee5)), closes [coscine/issues#1941](https://git.rwth-aachen.de/coscine/issues/issues/1941) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cff7e48..2e80211 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coscine/login", - "version": "1.20.1", + "version": "1.20.2", "private": true, "directories": { "doc": "docs" -- GitLab From 3e0a5623d99637827751b49cfd494b4d2305fc47 Mon Sep 17 00:00:00 2001 From: Ilona Lang <29380-ilona.lang@users.noreply.git.rwth-aachen.de> Date: Tue, 8 Feb 2022 11:40:05 +0100 Subject: [PATCH 3/4] Update: changed Servicedesk to IT-ServiceDesk as wished by the marketing team --- src/LoginApp.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LoginApp.vue b/src/LoginApp.vue index 4cf6e34..f014236 100644 --- a/src/LoginApp.vue +++ b/src/LoginApp.vue @@ -32,7 +32,7 @@ {{ $t("alert_text1") }} ServicedeskIT-ServiceDesk {{ $t("alert_text2") }}

-- GitLab From 191d2b4acb56fb726ab565ab9fa8b5cf4e561135 Mon Sep 17 00:00:00 2001 From: CoscineBot Date: Tue, 8 Feb 2022 10:42:10 +0000 Subject: [PATCH 4/4] Chore: 1.21.0 # [1.21.0](https://git.rwth-aachen.de/coscine/frontend/apps/login/compare/v1.20.2...v1.21.0) (2022-02-08) ### Update * changed Servicedesk to IT-ServiceDesk as wished by the marketing team ([3e0a562](https://git.rwth-aachen.de/coscine/frontend/apps/login/commit/3e0a5623d99637827751b49cfd494b4d2305fc47)) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2e80211..07c0b3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coscine/login", - "version": "1.20.2", + "version": "1.21.0", "private": true, "directories": { "doc": "docs" -- GitLab