Merge branch 'dev' of git.odit.services:lfk/frontend into dev

new license file version [CI SKIP]
🚀RELEASE v0.11.0
2021-03-30 18:29:03 +02:00 · 2021-03-30 16:29:19 +00:00 · 2021-03-30 18:28:53 +02:00 · 2021-03-30 16:27:48 +00:00 · 2021-03-29 18:52:25 +02:00 · 2021-03-29 18:52:10 +02:00
7 changed files with 114 additions and 12 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,12 +2,28 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 #### [0.11.0](https://git.odit.services/lfk/frontend/compare/0.10.0...0.11.0)
 - Merge pull request 'Generate and print bulk blank cards feature/116-download_blanc_cards' (#117) from feature/116-download_blanc_cards into dev [`25d8b86`](https://git.odit.services/lfk/frontend/commit/25d8b86efd89c442d1bf308a8743134820acfd1f)
 - Added button (including translations [`0614c76`](https://git.odit.services/lfk/frontend/commit/0614c76e924b18b512bab59933a26fec07cf483d)
 - Added button (including translations [`97e338f`](https://git.odit.services/lfk/frontend/commit/97e338f9d4f388596d550990457254c7fa1a3492)
 - Sorted translations [`89bb9c2`](https://git.odit.services/lfk/frontend/commit/89bb9c215e356e0940678f5cabd9e38bc203040e)
 - Added function for generating cards with pdf [`c8d6390`](https://git.odit.services/lfk/frontend/commit/c8d639024a5f2f72d6e30d2ce990b08bd71a5471)
 - Fixed button styling [`08cb079`](https://git.odit.services/lfk/frontend/commit/08cb079e9798392e26515d559af2637e74deea97)
 - Now returning cards on creation with pdf [`1d999d4`](https://git.odit.services/lfk/frontend/commit/1d999d4910acb5efa21b3f9922cdb359babff404)
 - Added comment [`636f018`](https://git.odit.services/lfk/frontend/commit/636f018daa33b99468a257bfc33477e1e644d081)
 - Bumped lfk client js version [`2d18686`](https://git.odit.services/lfk/frontend/commit/2d18686ce782a434ca7bd34c07c36a35b9497273)
 - Bumped lfk-client-js [`7dfaa75`](https://git.odit.services/lfk/frontend/commit/7dfaa7579a22b13194fcdd1c02b4437958261472)
 #### [0.10.0](https://git.odit.services/lfk/frontend/compare/0.9.1...0.10.0)
 > 26 March 2021
 - Added translations [`79c447b`](https://git.odit.services/lfk/frontend/commit/79c447b4c65e55ebb5af71fb0b09174c36e2cecf)
 - Sorted translations 🌍 [`5bd3a46`](https://git.odit.services/lfk/frontend/commit/5bd3a463f00abaf2c98ab554f88e5542d01f364a)
 - Reset can now only be triggered if pw is strong enoug [`75d8f73`](https://git.odit.services/lfk/frontend/commit/75d8f7331b6ae78f3979bb62148188a16f83cb8d)
 - Module now exports functions that check if a password is strong enough and equal to a potential confirmation field [`b2509e9`](https://git.odit.services/lfk/frontend/commit/b2509e9e53ab6b51dfd55e26712e8928160cd64b)
 - 🚀RELEASE v0.10.0 [`f7fc196`](https://git.odit.services/lfk/frontend/commit/f7fc1967a50f302af1d8b668628be2f4ab2975a3)
 - Added more cirteria to the password strength component [`5fa9939`](https://git.odit.services/lfk/frontend/commit/5fa9939696a35d60d762feb0cebef61d31869218)
 - Now using pw strength component [`6aaf838`](https://git.odit.services/lfk/frontend/commit/6aaf8384512185a3a319ce6b3e2505e910468e64)
 - Added a password strength verification [`ad3bd31`](https://git.odit.services/lfk/frontend/commit/ad3bd312e9a5785f81029ea2b7e302ea1addd988)
--- 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.10.0-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.11.0-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.10.0",
+	"version": "0.11.0",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev:all": "yarn prebuild && snowpack dev",
@ -13,7 +13,7 @@
 	},
 	"license": "CC-BY-NC-SA-4.0",
 	"dependencies": {
-		"@odit/lfk-client-js": "0.8.0",
+		"@odit/lfk-client-js": "0.9.2",
 		"check-password-strength": "^2.0.2",
 		"csvtojson": "^2.0.10",
 		"gridjs": "3.3.0",
--- a/public/licenses.json
+++ b/public/licenses.json
--- a/src/components/cards/AddCardBulkModal.svelte
+++ b/src/components/cards/AddCardBulkModal.svelte
@ -22,19 +22,19 @@
      if (e.keyCode === 13) {
        if (createbtnenabled === true) {
          createbtnenabled = false;
-          submit();
+          submit_with_print();
        }
      }
    };
  })();
-  function submit() {
+  function submit_without_print() {
    if (processed_last_submit === true) {
      processed_last_submit = false;
      const toast = Toastify({
        text: $_("creating-blanco-cards"),
        duration: -1,
      }).showToast();
-      RunnerCardService.runnerCardControllerPostBlancoBulk(card_count)
+      RunnerCardService.runnerCardControllerPostBlancoBulk(card_count, false)
        .then((result) => {
          bulk_modal_open = false;
          //
@ -54,6 +54,80 @@
        });
    }
  }
  function submit_with_print() {
    if (processed_last_submit === true) {
      processed_last_submit = false;
      const toast = Toastify({
        text: $_("creating-blanco-cards"),
        duration: -1,
      }).showToast();
      RunnerCardService.runnerCardControllerPostBlancoBulk(card_count, true)
        .then((result) => {
          bulk_modal_open = false;
          //
          Toastify({
            text: $_("created-blanco-cards"),
            duration: 500,
            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
          }).showToast();
          current_cards = current_cards.concat(result);
          const toast = Toastify({
            text: $_("generating-pdf"),
            duration: -1,
          }).showToast();
          fetch(
            `${config.baseurl}/documents/cards?&download=true&key=${config.documentserver_key}`,
            {
              method: "POST",
              headers: {
                "Content-Type": "application/json",
              },
              body: JSON.stringify(result),
            }
          )
            .then((response) => {
              if (response.status != "200") {
                toast.hideToast();
                Toastify({
                  text: $_("pdf-generation-failed"),
                  duration: 3500,
                  backgroundColor:
                    "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
                }).showToast();
              } else {
                return response.blob();
              }
            })
            .then((blob) => {
              const url = window.URL.createObjectURL(blob);
              let a = document.createElement("a");
              a.href = url;
              a.download = "Bulkcards.pdf";
              document.body.appendChild(a);
              a.click();
              a.remove();
              toast.hideToast();
              Toastify({
                text: $_("pdf-successfully-generated"),
                duration: 3500,
                backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
              }).showToast();
            })
            .catch((err) => {
              console.error(err);
            });
        })
        .catch((err) => {
          //
        })
        .finally(() => {
          processed_last_submit = true;
          //
          toast.hideToast();
        });
    }
  }
 </script>
 {#if bulk_modal_open}
@ -75,14 +149,14 @@
        class="hidden sm:inline-block sm:align-middle sm:h-screen"
        aria-hidden="true">&#8203;</span>
      <div
-        class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-2xl sm:w-full"
        role="dialog"
        aria-modal="true"
        aria-labelledby="modal-headline">
        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
          <div class="sm:flex sm:items-start">
            <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w- rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
              <svg
                class="h-6 w-6 text-blue-600"
                fill="currentColor"
@ -138,17 +212,25 @@
          <button
            disabled={!createbtnenabled}
            class:opacity-50={!createbtnenabled}
-            on:click={submit}
+            on:click={submit_with_print}
            type="button"
            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
-            {$_('create')}
+            {$_('create-and-generate-pdf')}
          </button>
          <button
            disabled={!createbtnenabled}
            class:opacity-50={!createbtnenabled}
            on:click={submit_without_print}
            type="button"
            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-400 text-base font-medium text-white hover:bg-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
            {$_('create-without-pdf')}
          </button>
          <button
            on:click={() => {
              bulk_modal_open = false;
            }}
            type="button"
-            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+            class="mr-auto mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
            {$_('cancel')}
          </button>
        </div>
--- a/src/locales/de.json
+++ b/src/locales/de.json
@ -92,12 +92,14 @@
    "create-a-new-track": "Neuen Track erstellen",
    "create-a-new-user": "Neue Benutzer:in anlegen",
    "create-a-new-user-group": "Erstelle eine neue Gruppe",
    "create-and-generate-pdf": "Erstellen und PDF herunterladen",
    "create-bulk-blanco-cards": "Blankokarten erstellen",
    "create-bulk-cards": "Blankokarten erstellen",
    "create-organization": "Organisation erstellen",
    "create-team": "Team erstellen",
    "create-track": "Track erstellen",
    "create-user": "Benutzer anlegen",
    "create-without-pdf": "Ohne PDF erstellen",
    "created-blanco-cards": "Blankokarten wurden erstellt",
    "creating-blanco-cards": "Erstelle Blankokarten",
    "credits": "Credits",
--- a/src/locales/en.json
+++ b/src/locales/en.json
@ -92,12 +92,14 @@
    "create-a-new-track": "Create a new Track",
    "create-a-new-user": "Create a new User",
    "create-a-new-user-group": "Create a new user group",
    "create-and-generate-pdf": "Create and generate PDF",
    "create-bulk-blanco-cards": "Create bulk blanco cards",
    "create-bulk-cards": "Add blanco cards",
    "create-organization": "Create Organization",
    "create-team": "Create Team",
    "create-track": "Create Track",
    "create-user": "Create User",
    "create-without-pdf": "Create without PDF",
    "created-blanco-cards": "Created blanco cards",
    "creating-blanco-cards": "Creating blanco cards",
    "credits": "Credits",
Author	SHA1	Message	Date
Nicolai Ort	87370d24be	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-30 18:29:03 +02:00
Nicolai Ort	8f8b9988ad	new license file version [CI SKIP]	2021-03-30 16:29:19 +00:00
Nicolai Ort	f8ccf4f5d8	🚀RELEASE v0.11.0	2021-03-30 18:28:53 +02:00
Nicolai Ort	25d8b86efd	Merge pull request 'Generate and print bulk blank cards feature/116-download_blanc_cards' (#117 ) from feature/116-download_blanc_cards into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #117	2021-03-30 16:27:48 +00:00
Nicolai Ort	89bb9c215e	Sorted translations ref #116	2021-03-29 18:52:25 +02:00
Nicolai Ort	2d18686ce7	Bumped lfk client js version ref #116	2021-03-29 18:52:10 +02:00
Nicolai Ort	1d999d4910	Now returning cards on creation with pdf ref #116	2021-03-29 18:23:17 +02:00
Nicolai Ort	7dfaa7579a	Bumped lfk-client-js ref #116	2021-03-29 18:15:00 +02:00
Nicolai Ort	08cb079e97	Fixed button styling ref #116	2021-03-29 17:57:34 +02:00
Nicolai Ort	450aa83592	Merge branch 'feature/116-download_blanc_cards' of git.odit.services:lfk/frontend into feature/116-download_blanc_cards # Conflicts: # src/components/cards/AddCardBulkModal.svelte	2021-03-29 17:47:18 +02:00
Nicolai Ort	0614c76e92	Added button (including translations ref #116	2021-03-29 17:46:56 +02:00
Nicolai Ort	97e338f9d4	Added button (including translations ref #116	2021-03-29 17:46:51 +02:00
Nicolai Ort	636f018daa	Added comment ref #116	2021-03-29 17:44:59 +02:00
Nicolai Ort	c8d639024a	Added function for generating cards with pdf ref #116	2021-03-29 17:44:30 +02:00