🚀RELEASE v0.9.1

Merge pull request 'Org selfservice Link feature/112-org_registration_links' (#114 ) from feature/112-org_registration_links into dev
Reviewed-on: #114
2021-03-26 19:59:29 +01:00 · 2021-03-26 18:58:34 +00:00 · 2021-03-26 18:11:49 +01:00 · 2021-03-26 18:11:23 +01:00 · 2021-03-26 18:11:10 +01:00 · 2021-03-26 18:04:08 +01:00
8 changed files with 223 additions and 100 deletions
--- 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)
--- a/index.template.html
+++ b/index.template.html
@ -14,7 +14,7 @@
 </head>

 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.9.0-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.9.1-RELEASE_INFO</span>
  <noscript>You need to enable JavaScript to run this app.</noscript>
  <script src="/env.js"></script>
  <script defer type="module" src="/_dist_/index.js"></script>
--- 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",
--- a/public/licenses.json
+++ b/public/licenses.json
--- 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;
 </script>

+{#if valueCopy != null}<textarea bind:this={areaDom}>{valueCopy}</textarea>{/if}
 <ImportRunnerModal
  on:cancelDelete={(event) => {
    import_modal_open = false;
@ -132,9 +175,7 @@
        <GenerateSponsoringContracts
          bind:sponsoring_contracts_show
          bind:generate_orgs />
-        <GenerateRunnerCards
-          bind:cards_show
-          bind:generate_orgs />
+        <GenerateRunnerCards bind:cards_show bind:generate_orgs />
        {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')}
          <button
            on:click={() => {
@ -277,7 +318,56 @@
        on:select={(selectedValue) => (editable.contact = selectedValue.detail.value)}
        on:clear={() => (editable.contact = null)} />
    </div>
+    <div>
+      <div class="flex items-start mt-2">
+        <div class="flex items-center h-5">
+          <input
+            bind:checked={editable.registrationEnabled}
+            id="comments"
+            name="comments"
+            type="checkbox"
+            class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+        </div>
+        <div class="ml-3 text-sm">
+          <label
+            for="comments"
+            class="font-medium text-gray-700">{$_('selfservice-registration')}</label>
+        </div>
+      </div>
+      <div>
+        {#if editable.registrationEnabled}
+          <div class="text-sm w-full">
+            <div on:click={copy} class="inline-flex w-full">
+              <p
+                name="token"
+                class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 p-2">
+                {#if editable.registrationKey}
+                {registrationLink}
+                {:else}
+                {$_('you-have-to-save-your-changes-to-generate-a-link')}
+                {/if}
+              </p>
+              <div
+                class="bg-gray-200 border-gray-300 border-t border-b border-r text-black rounded-r-md sm:text-sm p-2 mt-1 cursor-pointer">
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  viewBox="0 0 24 24"
+                  width="24"
+                  height="24"><path fill="none" d="M0 0h24v24H0z" />
+                  <path
+                    fill="currentColor"
+                    d="M7 4V2h10v2h3l1 1v16a1 1 0 01-1 1H4a1 1 0 01-1-1V5l1-1h3zm0 2H5v14h14V6h-2v2H7V6zm2-2v2h6V4H9z" /></svg>
+              </div>
+            </div>
+            {#if editable.registrationKey}
+            <p class="text-gray-500 text-xs">
+              {$_('click-to-copy-the-link-into-your-clipboard')}
+            </p>
+            {/if}
+          </div>
+        {/if}
        <!--  -->
+        <div>
          <div class="flex items-start mt-2">
            <div class="flex items-center h-5">
              <input
@ -293,6 +383,7 @@
                class="font-medium text-gray-700">{$_('address')}</label>
            </div>
          </div>
+        </div>
        {#if editable.address_checked === true}
          <div class="col-span-6">
            <label
@ -370,6 +461,8 @@
            {/if}
          </div>
        {/if}
+      </div>
+    </div>
  </section>
 {:else}
  {#await promise}
--- 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" /></svg>
            </div>
            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">{$_('token')}</h3>
+              <h3 class="text-lg leading-6 font-medium text-gray-900">
+                {$_('token')}
+              </h3>
              <div class="mt-2 mb-6">
                <p class="text-sm text-gray-500">
                  {$_('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" /></svg>
                  </div>
                </div>
-                <p class="text-gray-500 text-xs">{$_('click-to-copy-token-to-clipboard')}</p>
+                <p class="text-gray-500 text-xs">
+                  {$_('click-to-copy-token-to-clipboard')}
+                </p>
              </div>
            </div>
          </div>
--- 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)",
@ -336,6 +338,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",
@ -412,6 +415,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"
 }
--- 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",
@ -336,6 +338,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",
@ -413,6 +416,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"
 }
Author	SHA1	Message	Date
Nicolai Ort	2ca63fd1f6	🚀RELEASE v0.9.1 All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-26 19:59:29 +01:00
Nicolai Ort	a5d25e7d92	Merge pull request 'Org selfservice Link feature/112-org_registration_links' (#114 ) from feature/112-org_registration_links into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #114	2021-03-26 18:58:34 +00:00
Nicolai Ort	c074c12be7	Sorted translations ref #112	2021-03-26 18:11:49 +01:00
Nicolai Ort	ddbc293e9c	Added translations ref #112	2021-03-26 18:11:23 +01:00
Nicolai Ort	a3921b45c7	Copy now 100% worX ref #112	2021-03-26 18:11:10 +01:00
Nicolai Ort	38e1c8c5a1	Merge branch 'feature/112-org_registration_links' of git.odit.services:lfk/frontend into feature/112-org_registration_links	2021-03-26 18:04:08 +01:00
Nicolai Ort	c2d29ff233	Added check if key exists ref #112	2021-03-26 18:04:05 +01:00
Nicolai Ort	2316baa898	Added check if key exists	2021-03-26 18:03:58 +01:00
Nicolai Ort	f185d559c0	Formatting ref #112	2021-03-26 18:01:34 +01:00
Nicolai Ort	73d95bc004	Fixed changes in wrong file ref #112	2021-03-26 18:01:17 +01:00
Nicolai Ort	fcd55f89d7	You can now copy the selfservice links to your clipboard ref #112	2021-03-26 17:59:46 +01:00
Nicolai Ort	f9fe793573	Added checkbox to enable registration ref #112	2021-03-26 17:37:54 +01:00
Nicolai Ort	bc36411993	Merge branch 'main' into dev All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-26 16:17:51 +00:00
Nicolai Ort	48506236bf	Merge branch 'dev' of git.odit.services:lfk/frontend into dev All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-26 17:15:51 +01:00
Nicolai Ort	ded9b589fe	new license file version [CI SKIP]	2021-03-26 16:16:10 +00:00
Philipp Dormann	9aa8e7edff	Merge pull request 'first merge to main 🚀' (#71 ) from dev into main Reviewed-on: #71 Reviewed-by: Nicolai Ort <info@nicolai-ort.com>	2021-02-19 17:03:02 +00:00