Merge branch 'feature/14-release_config' into dev

# Conflicts: # package.json
Merge pull request 'feature/13-url_validator' (#15 ) from feature/13-url_validator into dev
2021-04-07 19:31:18 +02:00 · 2021-04-07 17:26:39 +00:00 · 2021-04-07 17:23:27 +00:00 · 2021-04-07 19:22:39 +02:00 · 2021-04-07 19:06:03 +02:00 · 2021-04-07 19:04:01 +02:00
15 changed files with 5301 additions and 86 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -0,0 +1,50 @@
 ---
 kind: secret
 name: gitea_token
 get:
  path: odit-git-bot
  name: apikey
 ---
 kind: secret
 name: ci_token
 get:
  path: odit-ci-bot
  name: apikey
 ---
 kind: pipeline
 type: kubernetes
 name: build:tag
 steps:
  - name: run build
    image: node:15.11.0-alpine3.13
    commands:
      - apk add git zip -f
      - yarn
      - yarn build
      - mkdir out
      - zip -r out/dist.zip dist
  - name: gitea add packages to build
    image: plugins/gitea-release
    settings:
      api_key:
        from_secret: gitea_token
      base_url: https://git.odit.services
      files: out/*
      checksum:
        - md5
        - sha1
        - sha256
        - sha512
        - adler32
        - crc32
  - name: trigger electron build
    image: idcooldi/drone-webhook
    settings:
      urls: https://ci.odit.services/api/repos/lfk/scanclient-electron/builds?SOURCE_TAG=${DRONE_TAG}
      bearer:
        from_secret: ci_token
 trigger:
  event:
    - tag
--- a/.husky/.gitignore
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
 _
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -0,0 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 yarn format
 yarn license:export
--- a/index.html
+++ b/index.html
@@ -9,7 +9,6 @@
  </head>
  <body class="bg-white font-family-karla h-screen">
    <script src="./env.js"></script>
    <script type="module" src="./src/main.js"></script>
  </body>
 </html>
--- a/licenses.md
+++ b/licenses.md
--- a/package.json
+++ b/package.json
@@ -1,25 +1,50 @@
 {
 	"name": "@lfk/scanclient",
-	"version": "0.0.0",
+	"version": "0.1.1",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
-		"format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte"
+		"format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte",
 		"prepare": "husky install",
 		"license:export": "license-exporter --markdown && git stage licenses.md",
 		"release": "release-it --only-version"
 	},
 	"devDependencies": {
 		"@odit/license-exporter": "^0.0.11",
 		"@svitejs/vite-plugin-svelte": "^0.11.1",
 		"@tsconfig/svelte": "^1.0.10",
 		"@types/html-minifier": "^4.0.0",
 		"axios": "^0.21.1",
 		"html-minifier": "^4.0.0",
 		"husky": "^5.1.3",
 		"prettier": "^2.2.1",
 		"prettier-plugin-svelte": "^2.2.0",
 		"release-it": "^14.5.1",
 		"svelte": "^3.35.0",
 		"svelte-i18n": "^3.3.7",
 		"svelte-preprocess": "^4.6.9",
 		"vite": "^2.1.2",
 		"vite-plugin-windicss": "^0.9.2"
 	},
 	"dependencies": {
-		"svelte-i18n": "^3.3.7"
+		"validator": "^13.5.2"
 	},
 	"release-it": {
 		"git": {
 			"commit": true,
 			"requireCleanWorkingDir": false,
 			"commitMessage": "🚀Bumped version to ${version}",
 			"requireBranch": "dev",
 			"push": false,
 			"tag": true,
 			"tagName": null,
 			"tagAnnotation": "${version}"
 		},
 		"npm": {
 			"publish": false
 		},
 		"hooks": {
 			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order.js  && git add src/locales"
 		}
 	}
 }
--- a/public/env.js
+++ b/public/env.js
@@ -1,3 +0,0 @@
 const config = {
 	endpoint: 'https://dev.lauf-fuer-kaya.de/'
 };
--- a/public/env.sample.js
+++ b/public/env.sample.js
@@ -1,3 +0,0 @@
 const config = {
 	endpoint: 'https://dev.lauf-fuer-kaya.de/'
 };
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,5 +1,5 @@
 <script>
-  console.log("app started with base url " + config.endpoint);
+  import { apikey, api_endpoint, lang, page } from "./store.js";
  import { addMessages, init } from "svelte-i18n";
  import en from "./locales/en.json";
  import de from "./locales/de.json";
@@ -11,13 +11,13 @@
  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 && $apikey !== "null" && $apikey !== "";
  $: settings_open = $page === "settings";
  init({
    fallbackLocale: "en-US",
    initialLocale: $lang,
  });
  console.log("app started with base url " + $api_endpoint);
 </script>
 {#if settings_open && is_configured}
--- a/src/Login.svelte
+++ b/src/Login.svelte
@@ -1,28 +1,18 @@
 <script>
-  import { apikey, lang, stationinfo } from "./store.js";
+  import isURL from "validator/lib/isURL";
  import isUUID from "validator/lib/isUUID";
  import { apikey, lang, stationinfo, api_endpoint } from "./store.js";
  import axios from "axios";
  import { _, locale } from "svelte-i18n";
  let token;
  let api_endpoint_input;
  $: error = false;
  $: errormessage = "";
  $: isTokenValid =
    token?.length === 44 &&
    token.split(".")[0].length === 7 &&
    isUUID(token.split(".")[1]);
-  function isLocale(l) {
+  $: isEndpointValid = isURL(api_endpoint_input);
    return $locale == l;
  }
  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">
@@ -71,57 +61,99 @@
          </div>
        {/if}
      {/if}
-
+      {#if $api_endpoint}
-      <form
+        <form
-        class="flex flex-col pt-3 md:pt-8"
+          class="flex flex-col pt-3 md:pt-8"
-        onsubmit="event.preventDefault();"
+          onsubmit="event.preventDefault();"
-        on:submit={() => {
+          on:submit={() => {
-          axios
+            axios
-            .request({
+              .request({
-              method: "GET",
+                method: "GET",
-              url: config.endpoint + "api/stations/me",
+                url: $api_endpoint + "api/stations/me",
-              headers: { Authorization: "Bearer " + token },
+                headers: { Authorization: "Bearer " + token },
-            })
+              })
-            .then(function (response) {
+              .then(function (response) {
-              error = false;
+                error = false;
-              errormessage = "";
+                errormessage = "";
-              apikey.set(token);
+                apikey.set(token);
-              stationinfo.set(JSON.stringify(response.data));
+                stationinfo.set(JSON.stringify(response.data));
-            })
+              })
-            .catch(function (e) {
+              .catch(function (e) {
-              error = true;
+                error = true;
-              errormessage = e.response.data.short;
+                errormessage = e.response.data.short;
-            });
+              });
-        }}
+          }}
      >
        <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="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>
      {:else}
        <form
          class="flex flex-col pt-3 md:pt-8"
          onsubmit="event.preventDefault();"
          on:submit={() => {
            if (api_endpoint_input.substr(-1) !== "/") {
              api_endpoint_input = api_endpoint_input + "/";
            }
            api_endpoint.set(api_endpoint_input);
          }}
        >
          <div class="flex flex-col pt-4">
            <label for="api_endpoint" class="text-lg"
              >{$_("api_endpoint")}</label
            >
            <input
              type="text"
              id="api_endpoint"
              placeholder={$_("api_endpoint")}
              bind:value={api_endpoint_input}
              class:border-red-500={!isEndpointValid}
              class:border-solid={!isEndpointValid}
              class:border-3={!isEndpointValid}
              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 !isEndpointValid}
            <span class="text-sm"
              >{$_("please_provide_a_valid_client_api_endpoint")}</span
            >
          {/if}
          <button
            disabled={!isEndpointValid}
            class:cursor-pointer={isEndpointValid}
            class:opacity-50={!isEndpointValid}
            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>
      {/if}
      <div class="text-center pt-12 pb-12">
        <p>
          <svg
--- a/src/Scanner.svelte
+++ b/src/Scanner.svelte
@@ -1,7 +1,7 @@
 <script>
  import axios from "axios";
  import { _ } from "svelte-i18n";
-  import { apikey, page, stationinfo } from "./store.js";
+  import { apikey, api_endpoint, page, stationinfo } from "./store.js";
  function init(el) {
    el.focus();
  }
@@ -9,6 +9,7 @@
  let lastscan_time = "";
  let lastscan_laptime = "";
  let lastscan_totaldistance = "";
  let lastscan_valid = true;
  let card = "";
  // live clock at the top
  let time = new Date();
@@ -64,7 +65,7 @@
            axios
              .request({
                method: "POST",
-                url: config.endpoint + "api/scans/trackscans",
+                url: $api_endpoint + "api/scans/trackscans",
                headers: { Authorization: "Bearer " + $apikey },
                data: { card },
              })
@@ -83,6 +84,7 @@
                  ) +
                  "s";
                lastscan_laptime = response.data.lapTime;
                lastscan_valid = response.data.valid;
                lastscan_totaldistance =
                  Math.floor(response.data.runner.distance / 1000) +
                  "km " +
@@ -112,14 +114,44 @@
          />
        </label>
        {#if lastscan_totaldistance}
-          <h1 class="text-3xl font-bold text-center">last scan</h1>
+          {#if !lastscan_valid || lastscan_error}
-          <h1 class="text-5xl font-bold text-center">{lastscan_time}</h1>
+            <svg
-          <h1 class="text-3xl font-bold text-center">total distance</h1>
+              xmlns="http://www.w3.org/2000/svg"
-          <h1 class="text-8xl font-bold text-center">
+              width="20rem"
              height="20rem"
              class="ml-auto mr-auto"
              version="1.0"
              title="Invalid"
              viewBox="0 0 100 100"
              ><g fill="none" stroke="red"
                ><path d="M6 6l88 88" stroke-width="18.1" /><path
                  d="M6 94L94 6"
                  stroke-width="17.8"
                /></g
              ></svg
            >
          {:else}
            <svg
              xmlns="http://www.w3.org/2000/svg"
              width="20rem"
              height="20rem"
              class="ml-auto mr-auto"
              title="Valid"
              viewBox="0 0 600 600"
              ><path
                d="M8 405s115 129 138 182h99c41-126 203-429 341-535 28-37-43-52-102-27-87 36-252 317-283 384-44 12-90-74-90-74z"
                fill="#181"
              /></svg
            >
          {/if}
          <h1 class="text-2xl font-bold text-center">{$_("total-distance")}</h1>
          <h1 class="text-6xl font-bold text-center">
            {lastscan_totaldistance}
          </h1>
-          <h1 class="text-3xl font-bold text-center">lap time</h1>
+          <h1 class="text-2xl font-bold text-center">{$_("lap-time")}</h1>
-          <h1 class="text-8xl font-bold text-center">{lastscan_laptime}</h1>
+          <h1 class="text-6xl font-bold text-center">{lastscan_laptime}</h1>
          <h1 class="text-2xl font-bold text-center">{$_("last-scan")}</h1>
          <h1 class="text-5xl font-bold text-center">{lastscan_time}</h1>
        {:else}
          <h1 class="text-3xl font-bold text-center">
            {$_("please_scan_a_card")}
--- a/src/Settings.svelte
+++ b/src/Settings.svelte
@@ -1,7 +1,7 @@
 <script>
  import { _ } from "svelte-i18n";
-  import { apikey, lang, page, stationinfo } from "./store.js";
+  import { apikey, api_endpoint, lang, page, stationinfo } from "./store.js";
 </script>
 <div class="p-5 min-h-screen">
@@ -103,6 +103,7 @@
  <button
    on:click={() => {
      apikey.set("");
      api_endpoint.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"
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -1,4 +1,5 @@
 {
    "api_endpoint": "API-Endpunkt",
    "api_key": "API Key",
    "back_to_scanner": "Zurück zum Scanner",
    "client_token": "Client Token",
@@ -6,9 +7,12 @@
    "configure": "Konfigurieren",
    "error": "Error!",
    "language": "Sprache",
    "lap-time": "Rundenzeit",
    "last-scan": "Letzter Scan um",
    "log_out_from_this_client": "Von diesem Scanner abmelden",
    "minimum_lap_time": "minimale Rundenzeit",
    "please_check_your_token_and_try_again": "Bitte überprüfe den Token und versuche es erneut...",
    "please_provide_a_valid_client_api_endpoint": "Bitte gebe einen gültigen API-Endpunkt an ...",
    "please_provide_a_valid_client_token": "Bitte gebe einen gültigen Client-Token an ...",
    "please_provide_the_scan_client_token": "Bitte gebe den Scan-Client-Token an.",
    "please_scan_a_card": "Bitte scanne eine Karte ...",
@@ -20,6 +24,7 @@
    "station_id": "Scanstations-ID",
    "the_provided_scan_station_is_disabled": "Die angegebene Scanstation ist deaktiviert.",
    "the_provided_scan_station_token_is_invalid": "Der angegebene Scanstation-Token ist ungültig.",
    "total-distance": "Gesamtdistanz",
    "track_distance": "Länge des Tracks",
    "track_id": "Track ID",
    "track_name": "Track Name"
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,4 +1,5 @@
 {
    "api_endpoint": "API Endpoint",
    "api_key": "API Key",
    "back_to_scanner": "Back to Scanner",
    "client_token": "Client Token",
@@ -6,9 +7,12 @@
    "configure": "Configure",
    "error": "Error!",
    "language": "Language",
    "lap-time": "lap time",
    "last-scan": "last scan",
    "log_out_from_this_client": "Log Out from this Client",
    "minimum_lap_time": "minimum lap time",
    "please_check_your_token_and_try_again": "Please check your token and try again...",
    "please_provide_a_valid_client_api_endpoint": "Please provide a valid api endpoint...",
    "please_provide_a_valid_client_token": "Please provide a valid client token...",
    "please_provide_the_scan_client_token": "Please provide the scan client token.",
    "please_scan_a_card": "please scan a card...",
@@ -20,6 +24,7 @@
    "station_id": "Scanstation ID",
    "the_provided_scan_station_is_disabled": "The provided scan station is disabled.",
    "the_provided_scan_station_token_is_invalid": "The provided scan station token is invalid.",
    "total-distance": "total distance",
    "track_distance": "Track Distance",
    "track_id": "Track ID",
    "track_name": "Track Name"
--- a/src/store.js
+++ b/src/store.js
@@ -1,5 +1,10 @@
 import { writable } from 'svelte/store';
 const stored_api_endpoint = localStorage.getItem('api_endpoint')||"";
 export const api_endpoint = writable(stored_api_endpoint);
 api_endpoint.subscribe((value) => {
 	localStorage.setItem('api_endpoint', value);
 });
 const stored_apikey = localStorage.getItem('apikey');
 export const apikey = writable(stored_apikey);
 apikey.subscribe((value) => {
Author	SHA1	Message	Date
Nicolai Ort	7f44ad402b	Merge branch 'feature/14-release_config' into dev # Conflicts: # package.json	2021-04-07 19:31:18 +02:00
Nicolai Ort	6ade51fb73	Merge pull request 'feature/13-url_validator' (#15 ) from feature/13-url_validator into dev Reviewed-on: #15	2021-04-07 17:26:39 +00:00
Nicolai Ort	da3e56d9dc	Merge branch 'main' into feature/14-release_config	2021-04-07 17:23:27 +00:00
Nicolai Ort	2f1567e802	Changed tag name scheme ref #14	2021-04-07 19:22:39 +02:00
Philipp Dormann	6ba90a7851	Merge branch 'dev' into feature/13-url_validator	2021-04-07 19:06:03 +02:00
Philipp Dormann	97ef6c798e	formatting ref #13	2021-04-07 19:04:01 +02:00
Philipp Dormann	0cea262ac5	added validator js ref #13	2021-04-07 19:03:48 +02:00
Nicolai Ort	d83a908db6	Updated ci token and added electron build via ci custom call ref #14	2021-04-07 18:12:45 +02:00
Nicolai Ort	96cbac2702	Revert "0.1.2" This reverts commit `1d788671c6`.	2021-04-07 17:00:54 +02:00
Nicolai Ort	1d788671c6	0.1.2	2021-04-07 16:59:42 +02:00
Nicolai Ort	e7458c49f0	Now also triggering electron build ref #14	2021-04-07 16:59:35 +02:00
Nicolai Ort	2ec6e1c107	Merge branch 'feature/14-release_config' of git.odit.services:lfk/scanclient into feature/14-release_config	2021-04-07 16:51:47 +02:00
Nicolai Ort	3c2300c09e	Updated package version to the current version ref #14	2021-04-07 16:51:46 +02:00
Nicolai Ort	69ab9893d3	Updated version to the current electron version ref #14	2021-04-07 16:51:25 +02:00
Nicolai Ort	dbff163b6b	Added release-it w/ config ref #14	2021-04-07 16:50:38 +02:00
Nicolai Ort	703168081c	Merge pull request 'Symbols for valid/invalid scans feature/11-valid_icons' (#12 ) from feature/11-valid_icons into dev Reviewed-on: #12	2021-04-06 19:01:07 +00:00
Nicolai Ort	64398cdd74	Now also showing ❌ for errors ref #11	2021-04-06 20:53:21 +02:00
Nicolai Ort	a4d749cc3f	Added svg titels ref #11	2021-04-06 18:07:13 +02:00
Nicolai Ort	838127cf72	Added missing translations ref #11	2021-04-06 18:05:04 +02:00
Nicolai Ort	379999e491	Changed test sizes to fit the page on smaller screens ref #11	2021-04-06 18:03:13 +02:00
Nicolai Ort	be6974af20	Added valid/invalid svg icons ref #11	2021-04-06 18:00:31 +02:00
Nicolai Ort	c0555c0662	Added valid/invalid logic ref #11	2021-04-06 18:00:05 +02:00
Philipp Dormann	db4d63da8b	Merge pull request 'feature/9-move-url-config-from-env-to-local-config' (#10 ) from feature/9-move-url-config-from-env-to-local-config into dev Reviewed-on: #10 close #9	2021-03-23 17:35:48 +00:00
Philipp Dormann	b80a832256	Login - add trailing slash to api_endpoint url ref #9	2021-03-23 18:10:58 +01:00
Philipp Dormann	81b2db60ec	🧹 drop old env.js ref #9	2021-03-22 19:28:42 +01:00
Philipp Dormann	5563f1fca3	new api_endpoint store + Config UI ref #9	2021-03-22 19:26:03 +01:00
Philipp Dormann	2fa6acea3a	Merge branch 'dev' into main All checks were successful continuous-integration/drone/tag Build is passing Details	2021-03-19 18:49:35 +01:00
Philipp Dormann	517cfddc5f	CI - mkdir out	2021-03-19 18:49:26 +01:00
Philipp Dormann	8809c583d0	Merge branch 'dev' into main Some checks failed continuous-integration/drone/tag Build is failing Details	2021-03-19 18:44:52 +01:00
Philipp Dormann	ae0ec9d67c	CI fix	2021-03-19 18:44:38 +01:00
Philipp Dormann	f211e35517	Merge branch 'main' of https://git.odit.services/lfk/scanclient into main	2021-03-19 18:25:59 +01:00
Philipp Dormann	cfd40d3f19	re-enable CI	2021-03-19 18:25:28 +01:00
Philipp Dormann	76ccb2290e	Merge pull request 'Husky pre-commit hooks 🐶' (#8 ) from dev into main Reviewed-on: #8 close #4 close #5	2021-03-19 16:41:28 +00:00
Philipp Dormann	5c117d6f48	Merge branch 'main' into dev	2021-03-19 16:40:32 +00:00
Philipp Dormann	0296c26479	Merge branch 'feature/4-license-exporter' into dev close #4 , close #5	2021-03-19 17:36:50 +01:00
Philipp Dormann	d0facb2846	added husky formatting 🐶 ref #5	2021-03-19 17:33:23 +01:00
Philipp Dormann	7deb0d26c4	added license:export script to pre-commit hook ref #4	2021-03-19 17:32:54 +01:00
Philipp Dormann	00b8a14bc3	husky 🐶	2021-03-19 17:24:39 +01:00