formatting

added lang option to config page
ref #1
2021-03-16 14:19:53 +01:00 · 2021-03-15 15:22:44 +01:00 · 2021-03-15 15:21:09 +01:00 · 2021-03-15 14:56:30 +01:00 · 2021-03-15 14:56:13 +01:00 · 2021-03-15 14:55:59 +01:00
17 changed files with 652 additions and 91 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,10 +15,11 @@ steps:
    depends_on: ["clone"]
    image: node:15.11.0-alpine3.13
    commands:
-      - apk add git libzip -f
+      - apk add git zip -f
      - yarn && cd app && yarn && cd ..
      - yarn electron:package
-      - zip -r out/lfk-scanclient-win32-x64.zip out/@lfk-scanclient-win32-x64
+      - mkdir dist
+      - zip -r dist/@lfk-scanclient-linux-x64.zip out/@lfk-scanclient-linux-x64
  - name: gitea_release
    depends_on: ["run electron packager"]
    image: plugins/gitea-release
@@ -26,9 +27,7 @@ steps:
      api_key:
        from_secret: gitea_token
      base_url: https://git.odit.services
-      # files: out/*
-      files:
-        - out/lfk-scanclient-win32-x64.zip
+      files: dist/*
      checksum:
        - md5
        - sha1
@@ -40,8 +39,7 @@ steps:
      event: tag

 trigger:
-  # branch:
-  #   - dev
+  branch:
+    - main
  event:
-    - push
    - tag
--- a/app/index.html
+++ b/app/index.html
@@ -1,16 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>LfK!Scan</title>
+    <base href="./" />
+    <link rel="icon" type="image/png" href="./favicon.png" />
+  </head>

-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>LfK!Scan</title>
-  <base href="./">
-  <link rel="icon" type="image/png" href="./favicon.png" />
-</head>
-
-<body class="bg-white font-family-karla h-screen">
-  <script type="module" src="./src/main.js"></script>
-</body>
-
-</html>
+  <body class="bg-white font-family-karla h-screen">
+    <script type="module" src="./src/main.js"></script>
+  </body>
+</html>
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,8 @@
 	"version": "0.0.0",
 	"scripts": {
 		"dev": "vite",
-		"build": "vite build"
+		"build": "vite build",
+		"format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte"
 	},
 	"devDependencies": {
 		"@svitejs/vite-plugin-svelte": "^0.11.0",
@@ -12,6 +13,8 @@
 		"axios": "^0.21.1",
 		"glob": "^7.1.6",
 		"html-minifier": "^4.0.0",
+		"prettier": "^2.2.1",
+		"prettier-plugin-svelte": "^2.2.0",
 		"svelte": "^3.35.0",
 		"svelte-preprocess": "^4.6.9",
 		"vite": "^2.0.5",
--- a/app/src/App.svelte
+++ b/app/src/App.svelte
@@ -1,63 +1,17 @@
-  <div class="w-full flex flex-wrap">
+<script>
+  import Scanner from "./Scanner.svelte";
+  import Login from "./Login.svelte";
+  import Settings from "./Settings.svelte";
+  import { apikey, lang, page } from "./store.js";
+  $: is_configured = $apikey !== "null" && $apikey !== "";
+  $: settings_open = $page === "settings";
+  console.log($page);
+</script>

-      <!-- Login Section -->
-      <div class="w-full md:w-1/2 flex flex-col">
-
-          <div class="flex justify-center md:justify-start pt-12 md:pl-12 md:-mb-24">
-              <div class="bg-black text-white font-bold text-xl p-4"><img src="./favicon.png" alt=""
-                      style="height: 3rem;display: inline;"> LfK!Scan</div>
-          </div>
-
-          <div class="flex flex-col justify-center md:justify-start my-auto pt-8 md:pt-0 px-8 md:px-24 lg:px-32">
-              <p class="text-center text-3xl">Configuration</p>
-              <p class="text-center">Please provide the scan client token.<br><a target="_blank" class="underline"
-                      href="https://docs.lauf-fuer-kaya.de/">See our configuration guide.</a></p>
-              <form class="flex flex-col pt-3 md:pt-8" onsubmit="event.preventDefault();">
-                  <div class="flex flex-col pt-4">
-                      <label for="token" class="text-lg">Client Token</label>
-                      <input type="text" id="token" onchange="tokenchanged()" placeholder="Client Token"
-                          class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mt-1 leading-tight focus:outline-none focus:shadow-outline">
-                  </div>
-                  <input id="configure" type="submit" value="Configure"
-                      class="bg-black text-white font-bold text-lg hover:bg-gray-700 p-2 mt-8 cursor-pointer">
-              </form>
-              <div class="text-center pt-12 pb-12">
-                  <p><svg style="height: 1rem;display: inline;" xmlns="http://www.w3.org/2000/svg" fill="none"
-                          stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
-                          class="feather feather-zap" viewBox="0 0 24 24">
-                          <path d="M13 2L3 14h9l-1 8 10-12h-9l1-8z" />
-                      </svg><span>powered by <a href="https://odit.services" target="_blank"
-                              class="underline">ODIT.Services</a>.</span></p>
-              </div>
-          </div>
-
-          <div class="w-full p-3">
-              <div class="inline-block mr-2 mt-2">
-                  <button type="button"
-                      class="bg-black focus:outline-none text-white text-sm py-2.5 px-5 rounded-md hover:bg-blue-700">Deutsch
-                      <svg class="h-4 inline" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M15.923 345.043C52.094 442.527 145.929 512 256 512s203.906-69.473 240.077-166.957L256 322.783l-240.077 22.26z" fill="#ffda44"/><path d="M256 0C145.929 0 52.094 69.472 15.923 166.957L256 189.217l240.077-22.261C459.906 69.472 366.071 0 256 0z"/><path d="M15.923 166.957C5.633 194.69 0 224.686 0 256s5.633 61.31 15.923 89.043h480.155C506.368 317.31 512 287.314 512 256s-5.632-61.31-15.923-89.043H15.923z" fill="#d80027"/></svg></button>
-              </div>
-              <div class="inline-block mr-2 mt-2">
-                  <button type="button"
-                      class="bg-black focus:outline-none text-white text-sm py-2.5 px-5 rounded-md hover:bg-blue-700 bg-blue-700">English
-                      <svg class="h-4 inline" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-                          <circle cx="256" cy="256" r="256" fill="#f0f0f0"></circle>
-                          <g fill="#d80027">
-                              <path
-                                  d="M244.87 256H512c0-23.106-3.08-45.49-8.819-66.783H244.87V256zM244.87 122.435h229.556a257.35 257.35 0 00-59.07-66.783H244.87v66.783zM256 512c60.249 0 115.626-20.824 159.356-55.652H96.644C140.374 491.176 195.751 512 256 512zM37.574 389.565h436.852a254.474 254.474 0 0028.755-66.783H8.819a254.474 254.474 0 0028.755 66.783z">
-                              </path>
-                          </g>
-                          <path
-                              d="M118.584 39.978h23.329l-21.7 15.765 8.289 25.509-21.699-15.765-21.699 15.765 7.16-22.037a257.407 257.407 0 00-49.652 55.337h7.475l-13.813 10.035a255.58 255.58 0 00-6.194 10.938l6.596 20.301-12.306-8.941a253.567 253.567 0 00-8.372 19.873l7.267 22.368h26.822l-21.7 15.765 8.289 25.509-21.699-15.765-12.998 9.444A258.468 258.468 0 000 256h256V0c-50.572 0-97.715 14.67-137.416 39.978zm9.918 190.422l-21.699-15.765L85.104 230.4l8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765 8.289 25.509zm-8.289-100.083l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765zM220.328 230.4l-21.699-15.765L176.93 230.4l8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765 8.289 25.509zm-8.289-100.083l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765zm0-74.574l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765z"
-                              fill="#0052b4"></path>
-                      </svg></button>
-              </div>
-          </div>
-
-      </div>
-
-      <!-- Image Section -->
-      <div class="w-1/2 shadow-2xl">
-          <img alt="" class="object-cover w-full h-screen hidden md:block" src="https://source.unsplash.com/IXUM4cJynP0">
-      </div>
-  </div>
+{#if settings_open && is_configured}
+  <Settings />
+{:else if is_configured}
+  <Scanner />
+{:else}
+  <Login />
+{/if}
--- a/app/src/Login.svelte
+++ b/app/src/Login.svelte
@@ -0,0 +1,166 @@
+<script>
+  import { apikey, lang } from "./store.js";
+  let token;
+  $: isTokenValid =
+    token?.length === 44 &&
+    token.split(".")[0].length === 7 &&
+    isUUID(token.split(".")[1]);
+  function isUUID(uuid) {
+    let s = "" + uuid;
+
+    s = s.match(
+      "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
+    );
+    if (s === null) {
+      return false;
+    }
+    return true;
+  }
+</script>
+
+<div class="w-full flex flex-wrap">
+  <!-- Login Section -->
+  <div class="w-full md:w-1/2 flex flex-col">
+    <div class="flex justify-center md:justify-start pt-12 md:pl-12 md:-mb-24">
+      <div class="bg-black text-white font-bold text-xl p-4">
+        <img src="./favicon.png" alt="" style="height: 3rem;display: inline;" />
+        LfK!Scan
+      </div>
+    </div>
+
+    <div
+      class="flex flex-col justify-center md:justify-start my-auto pt-8 md:pt-0 px-8 md:px-24 lg:px-32"
+    >
+      <p class="text-center text-3xl">Configuration</p>
+      <p class="text-center">
+        Please provide the scan client token.<br /><a
+          target="_blank"
+          class="underline"
+          href="https://docs.lauf-fuer-kaya.de/">See our configuration guide.</a
+        >
+      </p>
+      <form
+        class="flex flex-col pt-3 md:pt-8"
+        onsubmit="event.preventDefault();"
+        on:submit={() => {
+          // TODO: validate token with backend api
+          console.log(token);
+          apikey.set(token);
+        }}
+      >
+        <div class="flex flex-col pt-4">
+          <label for="token" class="text-lg">Client Token</label>
+          <input
+            type="text"
+            id="token"
+            placeholder="Client Token"
+            bind:value={token}
+            class:border-red-500={!isTokenValid}
+            class:border-solid={!isTokenValid}
+            class:border-3={!isTokenValid}
+            class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mt-1 leading-tight focus:outline-none focus:shadow-outline"
+          />
+        </div>
+        {#if !isTokenValid}
+          <span class="text-sm">Please provide a valid client token...</span>
+        {/if}
+        <button
+          disabled={!isTokenValid}
+          class:cursor-pointer={isTokenValid}
+          class:opacity-50={!isTokenValid}
+          id="configure"
+          type="submit"
+          class="bg-black text-white font-bold text-lg hover:bg-gray-700 p-2 mt-8 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black"
+          >Configure</button
+        >
+      </form>
+      <div class="text-center pt-12 pb-12">
+        <p>
+          <svg
+            style="height: 1rem;display: inline;"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            class="feather feather-zap"
+            viewBox="0 0 24 24"
+          >
+            <path d="M13 2L3 14h9l-1 8 10-12h-9l1-8z" />
+          </svg><span
+            >powered by <a
+              href="https://odit.services"
+              target="_blank"
+              class="underline">ODIT.Services</a
+            >.</span
+          >
+        </p>
+      </div>
+    </div>
+
+    <div class="w-full p-3">
+      <div class="inline-block mr-2 mt-2">
+        <button
+          on:click={() => {
+            lang.set("de-DE");
+          }}
+          type="button"
+          class:bg-blue-700={$lang === "de-DE"}
+          class="bg-black focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md hover:bg-blue-700"
+          >Deutsch
+          <svg
+            class="h-4 inline"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 512 512"
+            ><path
+              d="M15.923 345.043C52.094 442.527 145.929 512 256 512s203.906-69.473 240.077-166.957L256 322.783l-240.077 22.26z"
+              fill="#ffda44"
+            /><path
+              d="M256 0C145.929 0 52.094 69.472 15.923 166.957L256 189.217l240.077-22.261C459.906 69.472 366.071 0 256 0z"
+            /><path
+              d="M15.923 166.957C5.633 194.69 0 224.686 0 256s5.633 61.31 15.923 89.043h480.155C506.368 317.31 512 287.314 512 256s-5.632-61.31-15.923-89.043H15.923z"
+              fill="#d80027"
+            /></svg
+          ></button
+        >
+      </div>
+      <div class="inline-block mr-2 mt-2">
+        <button
+          on:click={() => {
+            lang.set("en-EN");
+          }}
+          type="button"
+          class:bg-blue-700={$lang === "en-EN"}
+          class="bg-black focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md hover:bg-blue-700"
+          >English
+          <svg
+            class="h-4 inline"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 512 512"
+          >
+            <circle cx="256" cy="256" r="256" fill="#f0f0f0" />
+            <g fill="#d80027">
+              <path
+                d="M244.87 256H512c0-23.106-3.08-45.49-8.819-66.783H244.87V256zM244.87 122.435h229.556a257.35 257.35 0 00-59.07-66.783H244.87v66.783zM256 512c60.249 0 115.626-20.824 159.356-55.652H96.644C140.374 491.176 195.751 512 256 512zM37.574 389.565h436.852a254.474 254.474 0 0028.755-66.783H8.819a254.474 254.474 0 0028.755 66.783z"
+              />
+            </g>
+            <path
+              d="M118.584 39.978h23.329l-21.7 15.765 8.289 25.509-21.699-15.765-21.699 15.765 7.16-22.037a257.407 257.407 0 00-49.652 55.337h7.475l-13.813 10.035a255.58 255.58 0 00-6.194 10.938l6.596 20.301-12.306-8.941a253.567 253.567 0 00-8.372 19.873l7.267 22.368h26.822l-21.7 15.765 8.289 25.509-21.699-15.765-12.998 9.444A258.468 258.468 0 000 256h256V0c-50.572 0-97.715 14.67-137.416 39.978zm9.918 190.422l-21.699-15.765L85.104 230.4l8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765 8.289 25.509zm-8.289-100.083l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765zM220.328 230.4l-21.699-15.765L176.93 230.4l8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765 8.289 25.509zm-8.289-100.083l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765zm0-74.574l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765z"
+              fill="#0052b4"
+            />
+          </svg></button
+        >
+      </div>
+    </div>
+  </div>
+
+  <!-- Image Section -->
+  <div class="w-1/2 shadow-2xl">
+    <img
+      alt=""
+      class="object-cover w-full h-screen hidden md:block"
+      src="https://source.unsplash.com/IXUM4cJynP0"
+    />
+  </div>
+</div>
--- a/app/src/Scanner.svelte
+++ b/app/src/Scanner.svelte
@@ -0,0 +1,81 @@
+<script>
+  import { apikey, lang, page } from "./store.js";
+  function init(el) {
+    el.focus();
+  }
+  let lastscan_time = "";
+  let lastscan_laptime = "";
+  let lastscan_totaldistance = "";
+  let card = "";
+  // live clock at the top
+  let time = new Date();
+  $: hours = (time.getHours() + "").padStart(2, "0");
+  $: minutes = (time.getMinutes() + "").padStart(2, "0");
+  $: seconds = (time.getSeconds() + "").padStart(2, "0");
+  const interval = setInterval(() => {
+    time = new Date();
+  }, 1000);
+</script>
+
+<div class="p-5 min-h-screen">
+  <h1 class="font-semibold w-full text-center text-gray-900">
+    Lauf Für Kaya! Scan 📷
+  </h1>
+  <h1 class="mr-6 text-6xl font-semibold text-center text-gray-900">
+    {hours}:{minutes}:{seconds}
+  </h1>
+  <section class="px-4 py-24 mx-auto max-w-7xl">
+    <div
+      class="w-full mx-auto space-y-5 sm:w-8/12 md:w-6/12 lg:w-4/12 xl:w-3/12"
+    >
+      <form
+        class="space-y-4"
+        onsubmit="event.preventDefault();"
+        on:submit={() => {
+          if (card === "cnf") {
+            page.set("settings");
+          } else {
+            console.log(card);
+            //TODO: hit API for scan entry
+            lastscan_totaldistance = "400m";
+            let time = new Date();
+            const hours = (time.getHours() + "").padStart(2, "0");
+            const minutes = (time.getMinutes() + "").padStart(2, "0");
+            const seconds = (time.getSeconds() + "").padStart(2, "0");
+            lastscan_time = hours + ":" + minutes + ":" + seconds;
+            lastscan_laptime = "1min 30s";
+          }
+          card = "";
+        }}
+      >
+        {#if lastscan_totaldistance}
+          <h1 class="text-3xl font-bold text-center">last scan</h1>
+          <h1 class="text-5xl font-bold text-center">{lastscan_time}</h1>
+          <h1 class="text-3xl font-bold text-center">total distance</h1>
+          <h1 class="text-9xl font-bold text-center">
+            {lastscan_totaldistance}
+          </h1>
+          <h1 class="text-3xl font-bold text-center">lap time</h1>
+          <h1 class="text-9xl font-bold text-center">{lastscan_laptime}</h1>
+        {:else}
+          <h1 class="text-3xl font-bold text-center">please scan a card...</h1>
+        {/if}
+        <label class="block">
+          <span class="block mb-1 text-xs font-medium text-gray-700"
+            >Runner Card</span
+          >
+          <input
+            class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mt-1 leading-tight focus:outline-none focus:shadow-outline"
+            type="text"
+            placeholder="123456789"
+            required
+            use:init
+            bind:value={card}
+          />
+        </label>
+        <!-- <button type="submit" class="w-full py-3 bg-black text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black">Scan!</button> -->
+        <button type="submit" class="hidden">Scan!</button>
+      </form>
+    </div>
+  </section>
+</div>
--- a/app/src/Settings.svelte
+++ b/app/src/Settings.svelte
@@ -0,0 +1,85 @@
+<!--  -->
+<script>
+  import { apikey, lang, page } from "./store.js";
+</script>
+
+<div class="p-5 min-h-screen">
+  <h1 class="font-bold text-3xl w-full text-center text-gray-900">
+    Lauf Für Kaya! Scan 📷
+  </h1>
+  <h1 class="text-3xl w-full text-center text-gray-900">Settings</h1>
+  <p class="block text-sm font-bold text-gray-700">API Key</p>
+  <p class="block text-sm text-gray-700">{$apikey}</p>
+  <br />
+  <p class="block text-sm font-bold text-gray-700">Language</p>
+  <div class="w-full">
+    <div class="inline-block mr-2 mt-2">
+      <button
+        on:click={() => {
+          lang.set("de-DE");
+        }}
+        type="button"
+        class:bg-blue-700={$lang === "de-DE"}
+        class="bg-black focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md hover:bg-blue-700"
+        >Deutsch
+        <svg
+          class="h-4 inline"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 512 512"
+          ><path
+            d="M15.923 345.043C52.094 442.527 145.929 512 256 512s203.906-69.473 240.077-166.957L256 322.783l-240.077 22.26z"
+            fill="#ffda44"
+          /><path
+            d="M256 0C145.929 0 52.094 69.472 15.923 166.957L256 189.217l240.077-22.261C459.906 69.472 366.071 0 256 0z"
+          /><path
+            d="M15.923 166.957C5.633 194.69 0 224.686 0 256s5.633 61.31 15.923 89.043h480.155C506.368 317.31 512 287.314 512 256s-5.632-61.31-15.923-89.043H15.923z"
+            fill="#d80027"
+          /></svg
+        ></button
+      >
+    </div>
+    <div class="inline-block mr-2 mt-2">
+      <button
+        on:click={() => {
+          lang.set("en-EN");
+        }}
+        type="button"
+        class:bg-blue-700={$lang === "en-EN"}
+        class="bg-black focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md hover:bg-blue-700"
+        >English
+        <svg
+          class="h-4 inline"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 512 512"
+        >
+          <circle cx="256" cy="256" r="256" fill="#f0f0f0" />
+          <g fill="#d80027">
+            <path
+              d="M244.87 256H512c0-23.106-3.08-45.49-8.819-66.783H244.87V256zM244.87 122.435h229.556a257.35 257.35 0 00-59.07-66.783H244.87v66.783zM256 512c60.249 0 115.626-20.824 159.356-55.652H96.644C140.374 491.176 195.751 512 256 512zM37.574 389.565h436.852a254.474 254.474 0 0028.755-66.783H8.819a254.474 254.474 0 0028.755 66.783z"
+            />
+          </g>
+          <path
+            d="M118.584 39.978h23.329l-21.7 15.765 8.289 25.509-21.699-15.765-21.699 15.765 7.16-22.037a257.407 257.407 0 00-49.652 55.337h7.475l-13.813 10.035a255.58 255.58 0 00-6.194 10.938l6.596 20.301-12.306-8.941a253.567 253.567 0 00-8.372 19.873l7.267 22.368h26.822l-21.7 15.765 8.289 25.509-21.699-15.765-12.998 9.444A258.468 258.468 0 000 256h256V0c-50.572 0-97.715 14.67-137.416 39.978zm9.918 190.422l-21.699-15.765L85.104 230.4l8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765 8.289 25.509zm-8.289-100.083l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765zM220.328 230.4l-21.699-15.765L176.93 230.4l8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765 8.289 25.509zm-8.289-100.083l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765zm0-74.574l8.289 25.509-21.699-15.765-21.699 15.765 8.289-25.509-21.7-15.765h26.822l8.288-25.509 8.288 25.509h26.822l-21.7 15.765z"
+            fill="#0052b4"
+          />
+        </svg></button
+      >
+    </div>
+  </div>
+  <br />
+  <button
+    on:click={() => {
+      page.set("");
+    }}
+    class="mb-3 w-full py-3 border-black border-3 text-black focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black"
+    >Back to Scanner</button
+  >
+  <button
+    on:click={() => {
+      apikey.set("");
+      page.set("");
+    }}
+    class="w-full py-3 bg-black text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black"
+    >Log Out from this Client</button
+  >
+</div>
--- a/app/src/store.js
+++ b/app/src/store.js
@@ -0,0 +1,17 @@
+import { writable } from 'svelte/store';
+
+const stored_apikey = localStorage.getItem('apikey');
+export const apikey = writable(stored_apikey);
+apikey.subscribe((value) => {
+	localStorage.setItem('apikey', value);
+});
+const stored_page = localStorage.getItem('page');
+export const page = writable(stored_page);
+page.subscribe((value) => {
+	localStorage.setItem('page', value);
+});
+const stored_lang = localStorage.getItem('lang') === 'null' ? navigator.language : localStorage.getItem('lang');
+export const lang = writable(stored_lang);
+lang.subscribe((value) => {
+	localStorage.setItem('lang', value);
+});
--- a/package.json
+++ b/package.json
@@ -23,15 +23,12 @@
 		"forge": {
 			"packagerConfig": {},
 			"makers": [
-				{
-					"name": "@electron-forge/maker-squirrel",
-					"config": {
-						"name": "@lfk/scanclient"
-					}
-				},
 				{
 					"name": "@electron-forge/maker-zip",
-					"platforms": [ "darwin" ]
+					"platforms": [ "darwin" ],
+					"config": {
+						"name": "lfk__scanclient"
+					}
 				},
 				{
 					"name": "@electron-forge/maker-deb",
--- a/public/favicon.png
+++ b/public/favicon.png
--- a/public/global.css
+++ b/public/global.css
--- a/public/index.html
+++ b/public/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+
+	<title>LfK!Scan</title>
+
+	<link rel="icon" type="image/png" href="/favicon.png">
+	<link rel="stylesheet" href="/global.css">
+	<link rel="stylesheet" href="/build/bundle.css">
+
+	<script defer src="/build/bundle.js"></script>
+</head>
+
+<body>
+</body>
+
+</html>
--- a/public/svelte.png
+++ b/public/svelte.png
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -0,0 +1,75 @@
+import svelte from 'rollup-plugin-svelte';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import livereload from 'rollup-plugin-livereload';
+import { terser } from 'rollup-plugin-terser';
+
+const production = !process.env.ROLLUP_WATCH;
+
+function serve() {
+	let server;
+	
+	function toExit() {
+		if (server) server.kill(0);
+	}
+
+	return {
+		writeBundle() {
+			if (server) return;
+			server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
+				stdio: ['ignore', 'inherit', 'inherit'],
+				shell: true
+			});
+
+			process.on('SIGTERM', toExit);
+			process.on('exit', toExit);
+		}
+	};
+}
+
+export default {
+	input: 'src/main.js',
+	output: {
+		sourcemap: true,
+		format: 'iife',
+		name: 'app',
+		file: 'public/build/bundle.js'
+	},
+	plugins: [
+		svelte({
+			// enable run-time checks when not in production
+			dev: !production,
+			// we'll extract any component CSS out into
+			// a separate file - better for performance
+			css: css => {
+				css.write('public/build/bundle.css');
+			}
+		}),
+
+		// If you have external dependencies installed from
+		// npm, you'll most likely need these plugins. In
+		// some cases you'll need additional configuration -
+		// consult the documentation for details:
+		// https://github.com/rollup/plugins/tree/master/packages/commonjs
+		resolve({
+			browser: true,
+			dedupe: ['svelte']
+		}),
+		commonjs(),
+
+		// In dev mode, call `npm run start` once
+		// the bundle has been generated
+		!production && serve(),
+
+		// Watch the `public` directory and refresh the
+		// browser on changes when not in production
+		!production && livereload('public'),
+
+		// If we're building for production (npm run build
+		// instead of npm run dev), minify
+		production && terser()
+	],
+	watch: {
+		clearScreen: false
+	}
+};
--- a/scripts/setupTypeScript.js
+++ b/scripts/setupTypeScript.js
@@ -0,0 +1,125 @@
+// @ts-check
+
+/** This script modifies the project to support TS code in .svelte files like:
+
+  <script lang="ts">
+  	export let name: string;
+  </script>
+ 
+  As well as validating the code for CI.
+  */
+
+/**  To work on this script:
+  rm -rf test-template template && git clone sveltejs/template test-template && node scripts/setupTypeScript.js test-template
+*/
+
+const fs = require("fs")
+const path = require("path")
+const { argv } = require("process")
+
+const projectRoot = argv[2] || path.join(__dirname, "..")
+
+// Add deps to pkg.json
+const packageJSON = JSON.parse(fs.readFileSync(path.join(projectRoot, "package.json"), "utf8"))
+packageJSON.devDependencies = Object.assign(packageJSON.devDependencies, {
+  "svelte-check": "^1.0.0",
+  "svelte-preprocess": "^4.0.0",
+  "@rollup/plugin-typescript": "^4.0.0",
+  "typescript": "^3.9.3",
+  "tslib": "^2.0.0",
+  "@tsconfig/svelte": "^1.0.0"
+})
+
+// Add script for checking
+packageJSON.scripts = Object.assign(packageJSON.scripts, {
+  "validate": "svelte-check"
+})
+
+// Write the package JSON
+fs.writeFileSync(path.join(projectRoot, "package.json"), JSON.stringify(packageJSON, null, "  "))
+
+// mv src/main.js to main.ts - note, we need to edit rollup.config.js for this too
+const beforeMainJSPath = path.join(projectRoot, "src", "main.js")
+const afterMainTSPath = path.join(projectRoot, "src", "main.ts")
+fs.renameSync(beforeMainJSPath, afterMainTSPath)
+
+// Switch the app.svelte file to use TS
+const appSveltePath = path.join(projectRoot, "src", "App.svelte")
+let appFile = fs.readFileSync(appSveltePath, "utf8")
+appFile = appFile.replace("<script>", '<script lang="ts">')
+appFile = appFile.replace("export let name;", 'export let name: string;')
+fs.writeFileSync(appSveltePath, appFile)
+
+// Edit rollup config
+const rollupConfigPath = path.join(projectRoot, "rollup.config.js")
+let rollupConfig = fs.readFileSync(rollupConfigPath, "utf8")
+
+// Edit imports
+rollupConfig = rollupConfig.replace(`'rollup-plugin-terser';`, `'rollup-plugin-terser';
+import sveltePreprocess from 'svelte-preprocess';
+import typescript from '@rollup/plugin-typescript';`)
+
+// Replace name of entry point
+rollupConfig = rollupConfig.replace(`'src/main.js'`, `'src/main.ts'`)
+
+// Add preprocess to the svelte config, this is tricky because there's no easy signifier.
+// Instead we look for `css:` then the next `}` and add the preprocessor to that
+let foundCSS = false
+let match
+
+// https://regex101.com/r/OtNjwo/1
+const configEditor = new RegExp(/css:.|\n*}/gmi)
+while (( match = configEditor.exec(rollupConfig)) != null) {
+  if (foundCSS) {
+    const endOfCSSIndex = match.index + 1
+    rollupConfig = rollupConfig.slice(0, endOfCSSIndex) + ",\n			preprocess: sveltePreprocess()," + rollupConfig.slice(endOfCSSIndex);
+    break
+  }
+  if (match[0].includes("css:")) foundCSS = true
+}
+
+
+// Add TypeScript
+rollupConfig = rollupConfig.replace("commonjs(),", 'commonjs(),\n\t\ttypescript({ sourceMap: !production }),')
+fs.writeFileSync(rollupConfigPath, rollupConfig)
+
+// Add TSConfig
+const tsconfig = `{
+  "extends": "@tsconfig/svelte/tsconfig.json",
+
+  "include": ["src/**/*"],
+  "exclude": ["node_modules/*", "__sapper__/*", "public/*"],
+}`
+const tsconfigPath =  path.join(projectRoot, "tsconfig.json")
+fs.writeFileSync(tsconfigPath, tsconfig)
+
+// Delete this script, but not during testing
+if (!argv[2]) {
+  // Remove the script
+  fs.unlinkSync(path.join(__filename))
+
+  // Check for Mac's DS_store file, and if it's the only one left remove it
+  const remainingFiles = fs.readdirSync(path.join(__dirname))
+  if (remainingFiles.length === 1 && remainingFiles[0] === '.DS_store') {
+    fs.unlinkSync(path.join(__dirname, '.DS_store'))
+  }
+
+  // Check if the scripts folder is empty
+  if (fs.readdirSync(path.join(__dirname)).length === 0) {
+    // Remove the scripts folder
+    fs.rmdirSync(path.join(__dirname))
+  }
+}
+
+// Adds the extension recommendation
+fs.mkdirSync(path.join(projectRoot, ".vscode"))
+fs.writeFileSync(path.join(projectRoot, ".vscode", "extensions.json"), `{
+  "recommendations": ["svelte.svelte-vscode"]
+}
+`)
+
+console.log("Converted to TypeScript.")
+
+if (fs.existsSync(path.join(projectRoot, "node_modules"))) {
+  console.log("\nYou will need to re-run your dependency manager to get started.")
+}
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -0,0 +1,31 @@
+<header class="navbar">
+	<section class="navbar-section">
+	  <a href="#" class="btn btn-link">Docs</a>
+	  <a href="#" class="btn btn-link">Examples</a>
+	</section>
+	<div class="navbar-center"><img src="/favicon.png" style="height:4rem;" alt="Spectre.css"></div>
+	<section class="navbar-section">
+	  <a href="#" class="btn btn-link">Twitter</a>
+	  <a href="#" class="btn btn-link">GitHub</a>
+	</section>
+  </header>
+<main>
+	<div class="hero hero-sm bg-dark">
+		<div class="hero-body">
+			<h1><img src="/favicon.png" alt="Logo" style="height: 5rem;vertical-align: middle;"><span style="vertical-align: middle;">LfK!Scan</span></h1>
+			<p>Lauf für Kaya! Scanstation</p>
+		</div>
+	</div>
+	<div style="padding:1rem;">
+		<div class="column col-12">
+			<h3>Configure Scanstation <a target="_blank" href="https://docs.lauf-fuer-kaya.de/"><small class="label">📃 take a look at the configuration guide</small></a></h3>
+		</div>
+		<div class="column col-6 col-xs-12">
+		  <div class="form-group">
+			<label class="form-label" for="input-example-1">Token</label>
+			<input class="form-input" id="input-example-1" type="text" placeholder="Token">
+		  </div>
+		  <button class="btn btn-primary input-group-btn btn-lg">Submit</button>
+		</div>
+	  </div>
+</main>
--- a/src/main.js
+++ b/src/main.js
@@ -0,0 +1,10 @@
+import App from './App.svelte';
+
+const app = new App({
+	target: document.body,
+	props: {
+		appName: 'Electron-Svelte'
+	}
+});
+
+export default app;
Author	SHA1	Message	Date
Philipp Dormann	93efc326ab	formatting	2021-03-16 14:19:53 +01:00
Philipp Dormann	7cde92e206	added lang option to config page ref #1	2021-03-15 15:22:44 +01:00
Philipp Dormann	4e8a203c6d	👀 added basic settings page ref #1	2021-03-15 15:21:09 +01:00
Philipp Dormann	ece709954c	🧠 base ui logic ref #1	2021-03-15 14:56:30 +01:00
Philipp Dormann	0f20996ac3	input autofocus ref #1	2021-03-15 14:56:13 +01:00
Philipp Dormann	22671156a9	⌚ added live clock widget ref #1	2021-03-15 14:55:59 +01:00
Philipp Dormann	84a2ca60b7	📷 Scanner - basic language switching ref #1	2021-03-15 14:38:45 +01:00
Philipp Dormann	d0112c31e0	🚚 split into App, Login, Scanner ref #1	2021-03-15 14:38:27 +01:00
Philipp Dormann	c2f9da6e92	💾 store - added localstorage persistence ref #1	2021-03-15 14:13:19 +01:00
Philipp Dormann	df3621d086	💾 added basic svelte store ref #1	2021-03-15 14:11:24 +01:00
Philipp Dormann	e4f5a810a4	🚧 basic client token frontend validation ui logic ref #1	2021-03-15 14:01:58 +01:00
Philipp Dormann	ba07f7b55f	Merge branch 'main' of https://git.odit.services/lfk/scanclient into main # Conflicts: # .gitignore # README.md # main.js # package.json	2021-03-15 13:36:54 +01:00
Philipp Dormann	a2ec9d0cb3	👷‍♂️ CI - move to main tags event + disable rpm build for now	2021-03-15 13:33:22 +01:00
Philipp Dormann	3e533f5c6d	CI - fixed rpm build Some checks failed continuous-integration/drone/push Build was killed Details continuous-integration/drone/tag Build was killed Details	2021-03-14 22:03:04 +01:00
Philipp Dormann	8f907ba597	CI - rpm release building Some checks failed continuous-integration/drone/push Build was killed Details continuous-integration/drone/tag Build is failing Details	2021-03-14 21:59:41 +01:00
Philipp Dormann	e85a639e96	CI - only build @lfk-scanclient-linux-x64 Some checks failed continuous-integration/drone/push Build was killed Details continuous-integration/drone/tag Build was killed Details	2021-03-14 21:52:41 +01:00
Philipp Dormann	b1c9cc7652	CI - testing full artifact zipping Some checks failed continuous-integration/drone/push Build was killed Details continuous-integration/drone/tag Build is passing Details	2021-03-14 21:47:50 +01:00
Philipp Dormann	ab7ba528ee	removed "@" from dist package Some checks failed continuous-integration/drone/push Build was killed Details continuous-integration/drone/tag Build is failing Details	2021-03-14 21:35:41 +01:00
Philipp Dormann	bfff17c465	🚚 move to apk zip Some checks failed continuous-integration/drone/push Build was killed Details continuous-integration/drone/tag Build is failing Details	2021-03-14 21:28:40 +01:00
Philipp Dormann	913b1ef047	initial commit 🎉	2021-03-10 21:29:07 +01:00