diff --git a/CHANGELOG.md b/CHANGELOG.md index 20ff8c2e..d7e471d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,26 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [0.9.1](https://git.odit.services/lfk/frontend/compare/0.9.0...0.9.1) + +- Merge pull request 'Org selfservice Link feature/112-org_registration_links' (#114) from feature/112-org_registration_links into dev [`a5d25e7`](https://git.odit.services/lfk/frontend/commit/a5d25e7d92c7c37e90dbb4ba74b787873f920c6b) +- Added checkbox to enable registration [`f9fe793`](https://git.odit.services/lfk/frontend/commit/f9fe79357317653b46c09eb95b0db13845cddcf9) +- Sorted translations [`c074c12`](https://git.odit.services/lfk/frontend/commit/c074c12be75f285612f7a732c106404d9fb4538a) +- You can now copy the selfservice links to your clipboard [`fcd55f8`](https://git.odit.services/lfk/frontend/commit/fcd55f89d72e6ceb9bb2bdd194cc3420145d6d0d) +- Formatting [`f185d55`](https://git.odit.services/lfk/frontend/commit/f185d559c0d6476f2f2b9ea74aaad3297411801d) +- Copy now 100% worX [`a3921b4`](https://git.odit.services/lfk/frontend/commit/a3921b45c70b410293db593a75d2fdd34c131733) +- Fixed changes in wrong file [`73d95bc`](https://git.odit.services/lfk/frontend/commit/73d95bc0042f8f586ba2f2345342e25da1d280c2) +- Added check if key exists [`c2d29ff`](https://git.odit.services/lfk/frontend/commit/c2d29ff233f6b3e9dd2555b7e0b845592da2ba35) +- Added check if key exists [`2316baa`](https://git.odit.services/lfk/frontend/commit/2316baa8984832382be9f3b4549ca62cf9ccb5a3) +- Added translations [`ddbc293`](https://git.odit.services/lfk/frontend/commit/ddbc293e9ca0525910bf3d995de970ee2c35c56a) +- new license file version [CI SKIP] [`ded9b58`](https://git.odit.services/lfk/frontend/commit/ded9b589fe087915176c5b54f3c55e412541bc8f) +- Merge pull request 'first merge to main 🚀' (#71) from dev into main [`9aa8e7e`](https://git.odit.services/lfk/frontend/commit/9aa8e7edffa7e51b00a5ab7a8f16828b7a469181) + #### [0.9.0](https://git.odit.services/lfk/frontend/compare/0.8.7...0.9.0) +> 26 March 2021 + +- 🚀RELEASE v0.9.0 [`67c3732`](https://git.odit.services/lfk/frontend/commit/67c3732fad5a7c64ae11dcbebaaa095e1a2b387c) - Merge pull request 'Runner cards feature/94-runnercard_mgnt' (#111) from feature/94-runnercard_mgnt into dev [`2932f45`](https://git.odit.services/lfk/frontend/commit/2932f4591e62187a4903511051d110e9679c0993) - Sorted translations 🌍 [`1665a1a`](https://git.odit.services/lfk/frontend/commit/1665a1a093862a13be78ec65dcdf64eb7d855593) - Added translations [`6b5945a`](https://git.odit.services/lfk/frontend/commit/6b5945add86a77630c500872545bb91724b2047f) diff --git a/index.template.html b/index.template.html index 0c6da9ee..17818433 100644 --- a/index.template.html +++ b/index.template.html @@ -14,7 +14,7 @@ - + diff --git a/package.json b/package.json index 2597a9b9..672bc239 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@odit/lfk-frontend", - "version": "0.9.0", + "version": "0.9.1", "scripts": { "i18n-order": "node order.js", "dev:all": "yarn prebuild && snowpack dev", diff --git a/src/components/orgs/OrgDetail.svelte b/src/components/orgs/OrgDetail.svelte index e5ac85b3..6fdcd8d6 100644 --- a/src/components/orgs/OrgDetail.svelte +++ b/src/components/orgs/OrgDetail.svelte @@ -12,6 +12,7 @@ import Select from "svelte-select"; import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte"; import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte"; + import { tick } from "svelte"; $: delete_triggered = false; $: address_valid_or_none = (isAddress1Valid && iszipcodevalid && iscityvalid) || @@ -20,6 +21,9 @@ let original = ""; let original_object = {}; let contacts = []; + let valueCopy = null; + let areaDom; + let copied = false; export let params; $: editable = {}; $: contact = {}; @@ -31,6 +35,7 @@ $: sponsoring_contracts_show = true; $: cards_show = true; $: generate_orgs = [original_object]; + $: registrationLink = `${config.baseurl}/selfservice/register/${editable.registrationKey}`; const getContactLabel = (option) => option.firstname + " " + (option.middlename || "") + " " + option.lastname; const promise = RunnerOrganizationService.runnerOrganizationControllerGetOne( @@ -98,6 +103,7 @@ postdata ) .then((resp) => { + editable.registrationKey = resp.registrationKey; original_object = Object.assign({}, editable); original = JSON.stringify(original_object); Toastify({ @@ -110,9 +116,46 @@ } else { } } + async function copy() { + if(!editable.registrationKey){ + Toastify({ + text: $_('you-have-to-save-your-changes-to-generate-a-link'), + duration: 500, + backgroundColor: + "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)", + }).showToast(); + return; + } + valueCopy = registrationLink; + await tick(); + areaDom.focus(); + areaDom.select(); + try { + const successful = document.execCommand("copy"); + if (!successful) { + throw new Error(); + } + Toastify({ + text: $_("copied-link-to-clipboard"), + duration: 500, + backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", + }).showToast(); + copied = true; + } catch (err) { + Toastify({ + text: $_("error-whyile-copying-to-clipboard"), + duration: 500, + backgroundColor: + "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)", + }).showToast(); + } + // we can notifi by event or storage about copy status + valueCopy = null; + } export let import_modal_open = false; +{#if valueCopy != null}{/if} { import_modal_open = false; @@ -275,99 +318,151 @@ on:select={(selectedValue) => (editable.contact = selectedValue.detail.value)} on:clear={() => (editable.contact = null)} /> - -
-
- +
+
+
+ +
+
+ +
-
- +
+ {#if editable.registrationEnabled} +
+
+

+ {#if editable.registrationKey} + {registrationLink} + {:else} + {$_('you-have-to-save-your-changes-to-generate-a-link')} + {/if} +

+
+ + +
+
+ {#if editable.registrationKey} +

+ {$_('click-to-copy-the-link-into-your-clipboard')} +

+ {/if} +
+ {/if} + +
+
+
+ +
+
+ +
+
+
+ {#if editable.address_checked === true} +
+ + + {#if !isAddress1Valid} + + {$_('address-is-required')} + + {/if} +
+
+ + +
+
+ + + {#if !iszipcodevalid} + + {$_('valid-zipcode-postal-code-is-required')} + + {/if} +
+
+ + + {#if !iscityvalid} + + {$_('valid-city-is-required')} + + {/if} +
+ {/if}
- {#if editable.address_checked === true} -
- - - {#if !isAddress1Valid} - - {$_('address-is-required')} - - {/if} -
-
- - -
-
- - - {#if !iszipcodevalid} - - {$_('valid-zipcode-postal-code-is-required')} - - {/if} -
-
- - - {#if !iscityvalid} - - {$_('valid-city-is-required')} - - {/if} -
- {/if} {:else} {#await promise} diff --git a/src/components/scanstations/CopyScanStationTokenModal.svelte b/src/components/scanstations/CopyScanStationTokenModal.svelte index 6fa4db58..96c0d8ad 100644 --- a/src/components/scanstations/CopyScanStationTokenModal.svelte +++ b/src/components/scanstations/CopyScanStationTokenModal.svelte @@ -23,14 +23,14 @@ throw new Error(); } Toastify({ - text: $_('copied-token-to-clipboard'), + text: $_("copied-token-to-clipboard"), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); copied = true; } catch (err) { Toastify({ - text: $_('error-whyile-copying-to-clipboard'), + text: $_("error-whyile-copying-to-clipboard"), duration: 500, backgroundColor: "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)", @@ -75,7 +75,9 @@ d="M4 5v11h16V5H4zM2 4a1 1 0 011-1h18a1 1 0 011 1v14H2V4zM1 19h22v2H1v-2z" />
-

{$_('token')}

+

+ {$_('token')} +

{$_('the-scanstations-api-token-will-only-get-displayed-once-you-wont-be-able-to-change-or-view-it-again')} @@ -106,7 +108,9 @@ d="M7 4V2h10v2h3l1 1v16a1 1 0 01-1 1H4a1 1 0 01-1-1V5l1-1h3zm0 2H5v14h14V6h-2v2H7V6zm2-2v2h6V4H9z" />

-

{$_('click-to-copy-token-to-clipboard')}

+

+ {$_('click-to-copy-token-to-clipboard')} +

diff --git a/src/locales/de.json b/src/locales/de.json index c33caf82..d5939410 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -53,6 +53,7 @@ "change-your-password-here": "Hier kannst du dein Passwort Ă€ndern", "changing-your-password": "Passwort wird geĂ€ndert", "city": "Stadt", + "click-to-copy-the-link-into-your-clipboard": "Klicke auf den Link, um ihn in deine Zwischenablage zu kopieren", "click-to-copy-token-to-clipboard": "Klicke auf den Token, um ihn in deine Zwischenablage zu kopieren", "close": "Schließen", "code": "Code", @@ -72,6 +73,7 @@ "contact-is-not-a-member-in-any-group": "Kontakt gehört zu keiner Gruppe", "contacts": "Kontakte", "contacts-are-being-loaded": "Kontakte werden geladen ...", + "copied-link-to-clipboard": "Link wurde in die Zwischenablage kopiert", "copied-token-to-clipboard": "Token wurde in die Zwischenablage kopiert", "count_organizations": "Organisationen (Anzahl)", "count_teams": "Teams (Anzahl)", @@ -340,6 +342,7 @@ "search-for-runner-by-name-or-id": "Suche eine LĂ€ufer:in (via Name oder Id)", "select-all": "Alle auswĂ€hlen", "select-language": "Sprache auswĂ€hlen", + "selfservice-registration": "Selfservice Registrierung", "send-a-mail-to-lfk-odit-services": "Sende eine Mail an lfk@odit.services", "set-the-user-active-inactive": "Den Benutzer auf (in)aktiv setzen", "settings": "Einstellungen", @@ -416,6 +419,7 @@ "you-can-provide-a-runner-but-you-dont-have-to": "Du kannst eine LĂ€ufer:in angeben, musst aber nicht.", "you-dont-have-any-scanstations-yet": "Es gibt noch keine Scannerstationen", "you-have-to-provide-an-organization": "Du musst eine Organisation angeben", + "you-have-to-save-your-changes-to-generate-a-link": "Du musst deine Änderungen speichern, um einen Link zu generieren.", "you-must-create-at-least-one-card-or-cancel": "Du musst mindestens eine Blankokarte erstellen (oder abbrechen).", "zip-postal-code": "Postleitzahl" } \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index 893d2990..fcb49b69 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -53,6 +53,7 @@ "change-your-password-here": "Change your password here", "changing-your-password": "Changing your password", "city": "City", + "click-to-copy-the-link-into-your-clipboard": "Click to copy the link into your clipboard", "click-to-copy-token-to-clipboard": "Click to copy the token to your clipboard", "close": "Close", "code": "Code", @@ -72,6 +73,7 @@ "contact-is-not-a-member-in-any-group": "Contact is not a member in any group", "contacts": "Contacts", "contacts-are-being-loaded": "contacts are being loaded...", + "copied-link-to-clipboard": "Copied link to clipboard", "copied-token-to-clipboard": "Copied token to clipboard", "count_organizations": "# Organizations", "count_teams": "# Teams", @@ -340,6 +342,7 @@ "search-for-runner-by-name-or-id": "Search for runner (by name or id)", "select-all": "select all", "select-language": "Select language", + "selfservice-registration": "Selfservice registration", "send-a-mail-to-lfk-odit-services": "send a mail to lfk@odit.services", "set-the-user-active-inactive": "set the user active/ inactive", "settings": "Settings", @@ -417,6 +420,7 @@ "you-can-provide-a-runner-but-you-dont-have-to": "You can provide a runner, but you don't have to.", "you-dont-have-any-scanstations-yet": "You don't have any scanstations yet", "you-have-to-provide-an-organization": "You have to provide an organization", + "you-have-to-save-your-changes-to-generate-a-link": "You have to save your changes to generate a link.", "you-must-create-at-least-one-card-or-cancel": "You must create at least one card (or cancel).", "zip-postal-code": "ZIP/ postal code" } \ No newline at end of file