Merge branch 'experiment/tanstack' of https://git.odit.services/lfk/frontend into experiment/tanstack

ref #161

package.json

@@ -1,6 +1,7 @@
 {
 	"name": "@odit/lfk-frontend",
 	"version": "0.17.3",
+	"type": "module",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev": "vite",
@@ -10,18 +11,17 @@
 	},
 	"license": "CC-BY-NC-SA-4.0",
 	"devDependencies": {
-		"@sveltejs/vite-plugin-svelte": "1.0.0-next.6",
 		"@odit/license-exporter": "0.0.12",
+		"@sveltejs/vite-plugin-svelte": "2.0.4",
 		"@types/html-minifier": "4.0.2",
 		"auto-changelog": "2.4.0",
 		"autoprefixer": "10.4.14",
 		"html-minifier": "4.0.0",
 		"postcss": "8.4.21",
-		"release-it": "14.6.1",
+		"release-it": "15.10.1",
-		"svelte-preprocess": "4.7.0",
 		"svelte-select": "3.17.0",
-		"tailwindcss": "3.2.7",
+		"tailwindcss": "3.3.1",
-		"vite": "2.1.5"
+		"vite": "4.2.1"
 	},
 	"release-it": {
 		"git": {
@@ -41,21 +41,22 @@
 		}
 	},
 	"dependencies": {
-		"tinro": "0.6.12",
+		"@odit/lfk-client-js": "0.14.3",
-		"toastify-js": "1.12.0",
+		"@paralleldrive/cuid2": "^2.2.0",
-		"validator": "13.9.0",
+		"@tanstack/svelte-table": "^8.8.5",
-		"xlsx": "0.16.9",
+		"@tanstack/table-core": "^8.8.5",
-		"@odit/lfk-client-js": "0.14.0",
+		"@vincjo/datatables": "^1.5.2",
-		"@vincjo/datatables": "^1.4.0",
 		"check-password-strength": "2.0.7",
 		"csvtojson": "2.0.10",
 		"gridjs": "3.4.0",
 		"localforage": "1.10.0",
 		"marked": "2.0.3",
-		"svelte": "3.37.0",
+		"svelte": "3.58.0",
-		"svelte-focus-trap": "1.2.0",
+		"svelte-i18n": "3.6.0",
-		"svelte-i18n": "3.3.9",
+		"tinro": "0.6.12",
-		"@paralleldrive/cuid2": "^2.2.0"
+		"toastify-js": "1.12.0",
+		"validator": "13.9.0",
+		"xlsx": "0.18.5"
 	},
 	"volta": {
 		"node": "19.7.0"

src/components/cards/AddCardBulkModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { RunnerCardService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   export let bulk_modal_open;
@@ -133,7 +133,7 @@
 {#if bulk_modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       bulk_modal_open = false;

src/components/cards/AddCardModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import {
     RunnerCardService,
     RunnerService,
@@ -97,7 +97,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/cards/CardDetailModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { RunnerCardService, RunnerService } from "@odit/lfk-client-js";
   import Select from "svelte-select";
   import Toastify from "toastify-js";
@@ -13,9 +13,16 @@
   export let original_data = {};
   const getRunnerLabel = (option) =>
     option.firstname + " " + (option.middlename || "") + " " + option.lastname;
-  const filterRunners = (label, filterText, option) =>
+    const filterRunners = (label, filterText, option) => {
+    if (filterText.startsWith("#")) {
+      return option.value.id == parseInt(filterText.replace("#",""))
+    }
+    return (
       label.toLowerCase().includes(filterText.toLowerCase()) ||
-    option.value.toString().startsWith(filterText.toLowerCase());
+      option.value.toString().startsWith(filterText.toLowerCase())
+    );
+  };
+
   function focus(el) {
     el.focus();
   }
@@ -87,7 +94,7 @@
 {#if edit_modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       edit_modal_open = false;

src/components/cards/CardsOverview.svelte

@@ -72,7 +72,46 @@
     {#if current_cards.length === 0}
       <CardsEmptyState />
     {:else}
-      <div class="h-12">
+      <div class="h-12 mt-1">
+        {#if cards_show}
+          <button
+            type="button"
+            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
+            id="options-menu"
+            on:click={async () => {
+              const prom = [];
+              for (const card of generate_cards) {
+                prom.push(
+                  RunnerCardService.runnerCardControllerRemove(card.id, true)
+                );
+              }
+              await Promise.all(prom);
+              Toastify({
+                text: $_("cards-deleted"),
+                duration: 3500,
+                backgroundColor:
+                  "linear-gradient(to right, #00b09b, #96c93d)",
+              }).showToast();
+              //TODO: Delete cards from table
+            }}
+          >
+            {$_("delete-cards")}
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke-width="1.5"
+              stroke="currentColor"
+              class="w-5 h-5"
+            >
+              <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
+              />
+            </svg>
+          </button>
+        {/if}
         <GenerateRunnerCards bind:cards_show bind:generate_cards />
       </div>
       <Datatable {handler}>

src/components/contacts/AddContactModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import {
     GroupContactService,
     RunnerTeamService,
@@ -145,7 +145,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/donations/AddDonationModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import {
     DonationService,
     DonorService,
@@ -156,7 +156,7 @@ import { is_promise } from "svelte/internal";
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/donations/AddDonationPaymentModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { DonationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   export let payment_modal_open = false;
@@ -96,7 +96,7 @@
 {#if payment_modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       payment_modal_open = false;

src/components/donors/AddDonorModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import {
     DonorService
   } from "@odit/lfk-client-js";
@@ -134,7 +134,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/donors/ConfirmDonorDeletion.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { DonorService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import { createEventDispatcher } from "svelte";
@@ -32,7 +32,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={cancelDelete}>
     <div

src/components/general/About.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   export let modal_open;
   (function () {
     document.onkeydown = function (e) {
@@ -25,7 +25,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/general/Privacy.svelte

@@ -2,7 +2,7 @@
   import { _, getLocaleFromNavigator } from "svelte-i18n";
   import marked from "marked";
   import Footer from "./Footer.svelte";
-  import * as css from "../base/simple.css";
+  // import * as css from "../base/simple.css?inline";
   let html = "";
   async function load() {
     let md = await fetch("/privacy_" + getLocaleFromNavigator() + ".md");

src/components/groups/AddGroupModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import Toastify from "toastify-js";
   import { UserGroupService } from "@odit/lfk-client-js";
   export let modal_open;
@@ -69,7 +69,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/orgs/AddOrgModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { RunnerOrganizationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   export let modal_open;
@@ -89,7 +89,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/orgs/ConfirmOrgDeletion.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { RunnerOrganizationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import { createEventDispatcher } from "svelte";
@@ -32,7 +32,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={cancelDelete}>
     <div

src/components/runners/AddRunnerModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import {
     RunnerService,
     RunnerTeamService,
@@ -125,7 +125,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/runners/ImportRunnerModal.svelte

@@ -3,7 +3,7 @@
   import { read as readXlsx, utils as xlsx_utils } from "xlsx";
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import Toastify from "toastify-js";
   import {
     ImportService,
@@ -228,7 +228,7 @@
 {#if import_modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       cancelModal();

src/components/runners/RunnersOverview.svelte

@@ -1,22 +1,72 @@
 <script>
   import { _ } from "svelte-i18n";
+  let tablePageCount = [50, 100, 250, 500];
+  import { writable } from "svelte/store";
+  import {
+    createSvelteTable,
+    flexRender,
+    getCoreRowModel,
+    getFilteredRowModel,
+    getPaginationRowModel,
+    getSortedRowModel,
+  } from "@tanstack/svelte-table";
+
+  $: selected =
+    $table?.getSelectedRowModel().rows.map((row) => row.index) || [];
+
+  const columns = [
+    {
+      accessorKey: "id",
+      header: () => "id",
+      filterFn: `equalsString`,
+    },
+    {
+      accessorKey: "firstname",
+      header: () => $_('first-name'),
+      filterFn: `includesString`,
+    },
+    {
+      accessorKey: "lastname",
+      header: () => $_('last-name'),
+      filterFn: `includesString`,
+    },
+    {
+      accessorKey: "group",
+      header: () => $_('group'),
+      cell: (info) => {
+        const group = info.getValue();
+        if(group.responseType === "RUNNERORGANIZATION"){return group.name}
+        return `${group.parentGroup.name} > ${group.name}`
+      },
+      filterFn: `includesString`,
+    },
+    {
+      accessorKey: "distance",
+      header: () => $_('distance'),
+      cell: (info) => {
+        if(info.getValue() < 1000){return `${info.getValue()} m`}
+        return `${(info.getValue() / 1000).toFixed(1)} km`
+      },
+      enableColumnFilter: false,
+    },
+  ];
+
+  //
+
   import {
     RunnerService,
     RunnerTeamService,
     RunnerOrganizationService,
   } from "@odit/lfk-client-js";
-  import ThFilterGroup from "./ThFilterGroup.svelte";
-  import { DataHandler, Datatable, Th, ThFilter } from "@vincjo/datatables";
   import store from "../../store";
   import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
   import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
   import { onMount } from "svelte";
+  import InputElement from "../shared/InputElement.svelte";
   $: active_deletes = [];
   let dataLoaded = false;
-  let current_runners = [];
+  export let current_runners = [];
-  const handler = new DataHandler(current_runners, { rowsPerPage: 50 });
-  const rows = handler.getRows();
   $: sponsoring_contracts_show = generate_runners.length > 0;
   $: cards_show = generate_runners.length > 0;
   $: certificates_show = generate_runners.length > 0;
@@ -31,11 +81,30 @@
       return { value: g.id, label: g.name };
     })
     .concat(mappedteams);
+  const options = writable({
+    data: [],
+    columns: columns,
+    initialState: {
+      pagination: {
+        pageSize: tablePageCount[0],
+      },
+    },
+    enableRowSelection: true,
+    getCoreRowModel: getCoreRowModel(),
+    getFilteredRowModel: getFilteredRowModel(),
+    getPaginationRowModel: getPaginationRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+  });
+  const table = createSvelteTable(options);
   onMount(() => {
     RunnerService.runnerControllerGetAll().then((val) => {
       current_runners = val;
       dataLoaded = true;
-      handler.setRows(val);
+
+      options.update((options) => ({
+        ...options,
+        data: current_runners,
+      }));
     });
     RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
       teams = val;
@@ -69,134 +138,161 @@
         bind:generate_runners
       />
     </div>
-    <Datatable {handler}>
+    <table class="w-full">
-      <table>
       <thead>
-          <tr>
+        {#each $table.getHeaderGroups() as headerGroup}
-            <th style="border-bottom: 1px solid #ddd;">
+          <tr class="select-none">
-              <input
+            <th class="inset-y-0 left-0 px-4 py-2 text-left bg-stone-100 w-px">
+              <InputElement
                 type="checkbox"
-                class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded"
+                checked={$table.getIsAllRowsSelected()}
-                checked={generate_runners.length == current_runners.length}
+                indeterminate={$table.getIsSomeRowsSelected()}
-                on:click={() => {
+                on:change={() => $table.toggleAllRowsSelected()}
-                  if (generate_runners.length != current_runners.length) {
-                    generate_runners = current_runners;
-                  } else {
-                    generate_runners = [];
-                  }
-                }}
               />
             </th>
-            <Th {handler} orderBy="id">ID</Th>
+            {#each headerGroup.headers as header}
-            <Th {handler} orderBy="firstname">First Name</Th>
+              <th class="cursor-pointer">
-            <Th {handler} orderBy="middlename">Middle Name</Th>
+                {#if !header.isPlaceholder}
-            <Th {handler} orderBy="lastname">Last Name</Th>
+                  <div on:click={header.column.getToggleSortingHandler()}>
-            <th style="border-bottom: 1px solid #ddd;">Gruppe</th>
+                    <svelte:component
-            <Th {handler} orderBy="distance">Distanz</Th>
+                      this={flexRender(
-            <th style="border-bottom: 1px solid #ddd;">{$_("action")}</th>
+                        header.column.columnDef.header,
-          </tr>
+                        header.getContext()
-          <tr>
+                      )}
-            <th style="border-bottom: 1px solid #ddd;" />
+                    />
-            <ThFilter {handler} filterBy="id" />
+                    {#if header.column.getIsSorted().toString() == "asc"}
-            <ThFilter {handler} filterBy="firstname" />
+                      🔼
-            <ThFilter {handler} filterBy="middlename" />
+                    {:else if header.column.getIsSorted().toString() == "desc"}
-            <ThFilter {handler} filterBy="lastname" />
+                      🔽
-            <ThFilterGroup groups={selectgroups} {handler} />
+                    {/if}
-            <th style="border-bottom: 1px solid #ddd;" />
+                  </div>
-            <th style="border-bottom: 1px solid #ddd;" />
+                {/if}
+                {#if header.column.getCanFilter()}
+                  <div class="relative max-w-xs">
+                    <input
+                      title="name-search"
+                      value={header.column.getFilterValue() || ""}
+                      on:keyup={(e) => {
+                        header.column.setFilterValue(e.target.value);
+                      }}
+                      type="text"
+                      class="block rounded-md border-gray-200 py-2 pl-8 text-xs focus:border-blue-500 focus:ring-blue-500"
+                      placeholder=""
+                    />
+                    <div
+                      class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-2"
+                    >
+                      <svg
+                        class="h-3.5 w-3.5 text-gray-400"
+                        xmlns="http://www.w3.org/2000/svg"
+                        width={16}
+                        height={16}
+                        fill="currentColor"
+                        viewBox="0 0 16 16"
+                      >
+                        <path
+                          d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                {/if}
+              </th>
+            {/each}
           </tr>
+        {/each}
       </thead>
       <tbody>
-          {#each $rows as row}
+        {#each $table.getRowModel().rows as row}
           <tr>
-              <td>
+            <td class="inset-y-0 left-0 px-4 py-2">
-                <input
+              <InputElement
                 type="checkbox"
-                  class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded"
+                checked={row.getIsSelected()}
-                  checked={generate_runners.filter((i)=>i.id == row.id).length > 0}
+                on:change={() => row.toggleSelected()}
-                  on:click={() => {
-                    if (
-                      generate_runners.findIndex((i) => i.id == row.id) == -1
-                    ) {
-                      generate_runners.push(row);
-                      generate_runners = generate_runners;
-                    } else {
-                      generate_runners = generate_runners.filter(
-                        (r) => r.id != row.id
-                      );
-                    }
-                    console.log(generate_runners)
-                  }}
               />
             </td>
-              <td>{row.id}</td>
+            {#each row.getVisibleCells() as cell}
-              <td>{row.firstname}</td>
-              <td>{row.middlename || ""}</td>
-              <td>{row.lastname}</td>
-              <td
-                >{#if row.group.responseType === "RUNNERTEAM"}
-                  <a
-                    href="../teams/{row.group.id}"
-                    class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800"
-                    >{row.group.parentGroup.name} &gt; {row.group.name}</a
-                  >
-                {/if}
-                {#if row.group.responseType === "RUNNERORGANIZATION"}
-                  <a
-                    href="../orgs/{row.group.id}"
-                    class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800"
-                    >{row.group.name}</a
-                  >
-                {/if}</td
-              >
-              <td>{row.distance / 1000} km</td>
               <td>
-                {#if active_deletes[row.id] === true}
+                <svelte:component
-                  <button
+                  this={flexRender(
-                    on:click={() => {
+                    cell.column.columnDef.cell,
-                      active_deletes[row.id] = false;
+                    cell.getContext()
-                    }}
+                  )}
-                    tabindex="0"
+                />
-                    class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer"
-                    >{$_("cancel-delete")}</button
-                  >
-                  <button
-                    on:click={() => {
-                      RunnerService.runnerControllerRemove(row.id, true)
-                        .then((resp) => {
-                          current_runners = current_runners.filter(
-                            (obj) => obj.id !== row.id
-                          );
-                        })
-                        .catch((err) => {});
-                    }}
-                    tabindex="0"
-                    class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-                    >{$_("confirm-delete")}</button
-                  >
-                {:else}
-                  <a
-                    href="./{row.id}"
-                    class="text-indigo-600 hover:text-indigo-900"
-                    >{$_("details")}</a
-                  >
-                  {#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:DELETE")}
-                    <button
-                      on:click={() => {
-                        active_deletes[row.id] = true;
-                      }}
-                      tabindex="0"
-                      class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-                      >{$_("delete")}</button
-                    >
-                  {/if}
-                {/if}
               </td>
+            {/each}
           </tr>
         {/each}
       </tbody>
     </table>
-    </Datatable>
+    <div class="h-2" />
+    <div class="flex items-center gap-2">
+      <button
+        class="border rounded p-1"
+        on:click={() => $table.setPageIndex(0)}
+        disabled={!$table.getCanPreviousPage()}
+      >
+        {"<<"}
+      </button>
+      <button
+        class="border rounded p-1"
+        on:click={() => $table.previousPage()}
+        disabled={!$table.getCanPreviousPage()}
+      >
+        {"<"}
+      </button>
+      <button
+        class="border rounded p-1"
+        on:click={() => $table.nextPage()}
+        disabled={!$table.getCanNextPage()}
+      >
+        {">"}
+      </button>
+      <button
+        class="border rounded p-1"
+        on:click={() => $table.setPageIndex($table.getPageCount() - 1)}
+        disabled={!$table.getCanNextPage()}
+      >
+        {">>"}
+      </button>
+      <span class="flex items-center gap-1">
+        <div>Page</div>
+        <strong>
+          {$table.getState().pagination.pageIndex + 1} of{" "}
+          {$table.getPageCount()}
+        </strong>
+      </span>
+      <span class="flex items-center gap-1">
+        | Go to page:
+        <input
+          type="number"
+          defaultValue={$table.getState().pagination.pageIndex + 1}
+          on:change={(e) => {
+            const page = e.target.value ? Number(e.target.value) - 1 : 0;
+            $table.setPageIndex(page);
+          }}
+          class="border p-1 rounded w-16"
+        />
+      </span>
+      <select
+        value={$table.getState().pagination.pageSize}
+        on:change={(e) => {
+          const ps = Number(e.target.value);
+          console.log({ ps });
+          $table.setPageSize(Number(e.target.value));
+        }}
+      >
+        {#each tablePageCount as pageSize}
+          <option value={pageSize}>{pageSize}</option>
+        {/each}
+      </select>
+    </div>
+    <pre>{JSON.stringify($table.getState(), null, 2)}</pre>
+    <div>
+      {Object.keys(selected).length} of{" "}
+      {$table.getPreFilteredRowModel().rows.length} Total Rows Selected
+    </div>
   {/if}
 {/if}
 

src/components/scans/AddScanModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import {
     RunnerService,
     ScanService,
@@ -81,7 +81,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/scanstations/AddScanStationModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { ScanStationService, TrackService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import Select from "svelte-select";
@@ -81,7 +81,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/scanstations/ConfirmScanStationDeletion.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { ScanStationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import { createEventDispatcher } from "svelte";
@@ -32,7 +32,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={cancelDelete}>
     <div

src/components/scanstations/CopyScanStationTokenModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import Toastify from "toastify-js";
   import { tick, createEventDispatcher } from "svelte";
   export let copy_modal_open;
@@ -46,7 +46,7 @@
   {#if valueCopy != null}
     <textarea bind:this={areaDom}>{valueCopy}</textarea>
   {/if}
-  <div class="fixed z-10 inset-0 overflow-y-auto" use:focusTrap>
+  <div class="fixed z-10 inset-0 overflow-y-auto" >
     <div
       class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
       <div class="fixed inset-0 transition-opacity" aria-hidden="true">

src/components/settings/ConfirmProfileDeletion.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { MeService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import { createEventDispatcher } from "svelte";
@@ -30,7 +30,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={cancelDelete}>
     <div

src/components/shared/InputElement.svelte

@@ -0,0 +1,20 @@
+<script>
+  let className = "";
+  export { className as class };
+
+  export let type;
+</script>
+
+<input
+  class={`border-1 border-stone-300 border rounded-md shadow ${className} ${
+    type === "checkbox" && "w-5 h-5 text-orange-400"
+  }`}
+  {type}
+  {...$$restProps}
+  on:click
+  on:change
+  on:keydown
+  on:keyup
+  on:mouseenter
+  on:mouseleave
+/>

src/components/statsclients/AddStatsClientModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { StatsClientService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   export let modal_open;
@@ -66,7 +66,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/statsclients/ConfirmStatsClientDeletion.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { ScanStationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import { createEventDispatcher } from "svelte";
@@ -32,7 +32,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={cancelDelete}>
     <div

src/components/statsclients/CopyStatsClientTokenModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import Toastify from "toastify-js";
   import { tick, createEventDispatcher } from "svelte";
   export let copy_modal_open;
@@ -46,7 +46,7 @@
   {#if valueCopy != null}
     <textarea bind:this={areaDom}>{valueCopy}</textarea>
   {/if}
-  <div class="fixed z-10 inset-0 overflow-y-auto" use:focusTrap>
+  <div class="fixed z-10 inset-0 overflow-y-auto" >
     <div
       class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
       <div class="fixed inset-0 transition-opacity" aria-hidden="true">

src/components/teams/AddTeamModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import {
     RunnerOrganizationService,
     RunnerTeamService,
@@ -77,7 +77,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/teams/ConfirmTeamDeletion.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { RunnerTeamService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import { createEventDispatcher } from "svelte";
@@ -29,7 +29,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={cancelDelete}>
     <div

src/components/tracks/AddTrackModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { tracks as tracksstore } from "../../store.js";
   import { TrackService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
@@ -75,7 +75,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/components/users/AddUserModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-  import { focusTrap } from "svelte-focus-trap";
+  
   import { UserService } from "@odit/lfk-client-js";
   import isEmail from "validator/es/lib/isEmail";
   import Toastify from "toastify-js";
@@ -92,7 +92,7 @@
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
+    
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;

src/locales/de.json

@@ -473,5 +473,7 @@
   "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"
+  "zip-postal-code": "Postleitzahl",
+  "delete-cards": "Karten löschen",
+  "cards-deleted": "Karten gelöscht"
 }

src/locales/en.json

@@ -473,5 +473,7 @@
   "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"
+  "zip-postal-code": "ZIP/ postal code",
+  "delete-cards": "Delete cards",
+  "cards-deleted": "Cards deleted"
 }

tailwind.config.js

@@ -1,6 +1,6 @@
 module.exports = {
 	mode: 'jit',
-	purge: [ './src/**/*.svelte' ],
+	content: [ './src/**/*.svelte' ],
 	theme: {
 		extend: {
 			colors: {

vite.config.js

@@ -1,39 +1,11 @@
-import svelte from '@sveltejs/vite-plugin-svelte';
+// vite.config.js
-import { minify } from 'html-minifier';
 import { defineConfig } from 'vite';
-//
+import { svelte } from '@sveltejs/vite-plugin-svelte';
-const indexReplace = () => {
-	return {
-		name: 'html-transform',
-		transformIndexHtml(html) {
-			return minify(html, {
-				collapseWhitespace: true
-			});
-		}
-	};
-};
 
-export default defineConfig(({ command, mode }) => {
+export default defineConfig({
-	const isProduction = mode === 'production';
-	return {
-		// base: './',
-		build: {
-			polyfillDynamicImport: false,
-			cssCodeSplit: false,
-			minify: isProduction,
-			target: ["es2020", "esnext", "edge88", "chrome87", "safari14"]
-		},
 	plugins: [
 		svelte({
-				//@ts-ignore
+			/* plugin options */
-				hot: !isProduction,
+		})
-				emitCss: true,
-				extensions: ['.md', '.svx', '.svelte'],
-				preprocess: [
-					//
 	]
-			}),
-			indexReplace()
-		]
-	};
 });