Merge branch 'dev' into feature/18-add-rst-login

Reviewed-on: #19
close #17

CHANGELOG.md

@@ -2,8 +2,15 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v0.1.5](https://git.odit.services/lfk/scanclient/compare/0.1.4...v0.1.5)
+#### [v0.1.6](https://git.odit.services/lfk/scanclient/compare/0.1.5...v0.1.6)
 
+- Updated readme [`64f2ddf`](https://git.odit.services/lfk/scanclient/commit/64f2ddf70b5e3ace8557ff1cfd346fb52a251afd)
+
+#### [0.1.5](https://git.odit.services/lfk/scanclient/compare/0.1.4...0.1.5)
+
+> 13 April 2021
+
+- 🚀Bumped version to 0.1.5 [`3fa1bc9`](https://git.odit.services/lfk/scanclient/commit/3fa1bc93eb33509555820b6d96a01fad3b1338c2)
 - 🧹 drop emoji from ui bar [`18845f8`](https://git.odit.services/lfk/scanclient/commit/18845f86d12bf82ede8170e81805bf49f37f63f5)
 
 #### [0.1.4](https://git.odit.services/lfk/scanclient/compare/0.1.3...0.1.4)

README.md

@@ -3,6 +3,7 @@
 ## ✒️ Overview
 This is an API client for [https://git.odit.services/lfk/backend](@lfk/backend)
 - WebApp built with [Svelte](https://svelte.dev), [WindiCSS](https://windicss.org/) (to compile [TailwindCSS](https://tailwindcss.com/)) and [Vite](https://vitejs.dev).
+- Packaged with electron here: [https://git.odit.services/lfk/selfservice-electron](@lfk/selfservice-electron)
 
 ## 🚀 Getting Started
 ```

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lfk/scanclient",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",

src/Login.svelte

@@ -1,17 +1,19 @@
 <script>
   import isURL from "validator/lib/isURL";
   import isUUID from "validator/lib/isUUID";
-  import { apikey, lang, stationinfo, api_endpoint } from "./store.js";
+  import { apikey, lang, stationinfo, api_endpoint, page } from "./store.js";
   import axios from "axios";
+  import background from "./kaya_kids_background.jpg";
   import { _, locale } from "svelte-i18n";
   let token;
   let api_endpoint_input = "";
   $: error = false;
   $: errormessage = "";
   $: isTokenValid =
-    token?.length === 44 &&
+    token === "rst" ||
-    token.split(".")[0].length === 7 &&
+    (token?.length === 44 &&
-    isUUID(token.split(".")[1]);
+      token.split(".")[0].length === 7 &&
+      isUUID(token.split(".")[1]));
   $: isEndpointValid = isURL(api_endpoint_input);
 </script>
 
@@ -66,22 +68,30 @@
           class="flex flex-col pt-3 md:pt-8"
           onsubmit="event.preventDefault();"
           on:submit={() => {
-            axios
+            if (token === "rst") {
-              .request({
+              apikey.set("");
-                method: "GET",
+              api_endpoint.set("");
-                url: $api_endpoint + "api/stations/me",
+              page.set("");
-                headers: { Authorization: "Bearer " + token },
+              token = "";
-              })
+              api_endpoint_input = "";
-              .then(function (response) {
+            } else {
-                error = false;
+              axios
-                errormessage = "";
+                .request({
-                apikey.set(token);
+                  method: "GET",
-                stationinfo.set(JSON.stringify(response.data));
+                  url: $api_endpoint + "api/stations/me",
-              })
+                  headers: { Authorization: "Bearer " + token },
-              .catch(function (e) {
+                })
-                error = true;
+                .then(function (response) {
-                errormessage = e.response.data.short;
+                  error = false;
-              });
+                  errormessage = "";
+                  apikey.set(token);
+                  stationinfo.set(JSON.stringify(response.data));
+                })
+                .catch(function (e) {
+                  error = true;
+                  errormessage = e.response.data.short;
+                });
+            }
           }}
         >
           <div class="flex flex-col pt-4">
@@ -117,10 +127,18 @@
           class="flex flex-col pt-3 md:pt-8"
           onsubmit="event.preventDefault();"
           on:submit={() => {
-            if (api_endpoint_input.substr(-1) !== "/") {
+            if (api_endpoint_input === "rst") {
-              api_endpoint_input = api_endpoint_input + "/";
+              apikey.set("");
+              api_endpoint.set("");
+              page.set("");
+              token = "";
+              api_endpoint_input = "";
+            } else {
+              if (api_endpoint_input.substr(-1) !== "/") {
+                api_endpoint_input = api_endpoint_input + "/";
+              }
+              api_endpoint.set(api_endpoint_input);
             }
-            api_endpoint.set(api_endpoint_input);
           }}
         >
           <div class="flex flex-col pt-4">
@@ -239,7 +257,7 @@
     <img
       alt=""
       class="object-cover w-full h-screen hidden md:block"
-      src="https://source.unsplash.com/IXUM4cJynP0"
+      src={background}
     />
   </div>
 </div>