update license exporter

Reviewed-on: #20
close #18

.drone.yml

@@ -12,19 +12,30 @@ get:
   path: odit-ci-bot
   name: apikey
 
+---
+kind: secret
+name: npm_url
+get:
+  path: odit-npm-cache
+  name: url
+
 ---
 kind: pipeline
 type: kubernetes
 name: build:tag
 steps:
   - name: run build
-    image: node:15.11.0-alpine3.13
+    image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
     commands:
       - apk add git zip -f
-      - yarn
+      - npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
-      - yarn build
+      - pnpm i
+      - pnpm build
       - mkdir out
       - zip -r out/dist.zip dist
+    environment:
+      NPM_REGISTRY_URL:
+        from_secret: npm_url
   - name: gitea add packages to build
     image: plugins/gitea-release
     settings:

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/pre-commit

@@ -1,5 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn format
-yarn license:export

CHANGELOG.md

@@ -2,8 +2,40 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v0.1.3](https://git.odit.services/lfk/scanclient/compare/0.1.2...v0.1.3)
+#### [v0.2.0](https://git.odit.services/lfk/scanclient/compare/0.1.6...v0.2.0)
 
+- Merge pull request 'add 'rst' to Login component' (#20) from feature/18-add-rst-login into dev [`#18`](https://git.odit.services/lfk/scanclient/issues/18)
+- Merge pull request 'replace unsplash with kaya_bg' (#19) from feature/17-remote-background-image into dev [`#17`](https://git.odit.services/lfk/scanclient/issues/17)
+- add 'rst' to Login component [`e6d8861`](https://git.odit.services/lfk/scanclient/commit/e6d8861340f6998234d8b2446b918ab01738cf63)
+- replace unsplash with kaya_bg [`37c384a`](https://git.odit.services/lfk/scanclient/commit/37c384aa3688a66bc31673048e718fc04bc7bf0d)
+
+#### [0.1.6](https://git.odit.services/lfk/scanclient/compare/0.1.5...0.1.6)
+
+> 13 April 2021
+
+- 🚀Bumped version to 0.1.6 [`cd1b3aa`](https://git.odit.services/lfk/scanclient/commit/cd1b3aafc7587541eddd088a9d446ad50b719f56)
+- 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)
+
+> 7 April 2021
+
+- 🚀Bumped version to 0.1.4 [`0a23f6a`](https://git.odit.services/lfk/scanclient/commit/0a23f6a7e5d77852c035bcd0ad49260d429d687d)
+- Formatting [`277269e`](https://git.odit.services/lfk/scanclient/commit/277269e299924dbc76b39d3503aa50da43888622)
+- Added fix for empty input [`0cd3c6d`](https://git.odit.services/lfk/scanclient/commit/0cd3c6da1bb885eebb132b04ec3ef8e08f4ef679)
+
+#### [0.1.3](https://git.odit.services/lfk/scanclient/compare/0.1.2...0.1.3)
+
+> 7 April 2021
+
+- 🚀Bumped version to 0.1.3 [`d443b29`](https://git.odit.services/lfk/scanclient/commit/d443b2904e9f51f9e182912bba1c2571d2c9abff)
 - Added release title [`1092112`](https://git.odit.services/lfk/scanclient/commit/1092112f7f75e49f9a6b9c197a29cca77d73684f)
 
 #### [0.1.2](https://git.odit.services/lfk/scanclient/compare/0.1.1...0.1.2)

Dockerfile

@@ -1,5 +1,13 @@
-FROM node:15.11.0-alpine3.13
+FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 as build
+ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 WORKDIR /app
+
+COPY package.json ./
+RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
+RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i
+
 COPY . .
-RUN yarn
+RUN pnpm build
-RUN yarn build
+
+FROM registry.odit.services/library/nginx-brotli:3.15 as final
+COPY --from=build /app/dist /usr/share/nginx/html

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,22 +1,18 @@
 {
 	"name": "@lfk/scanclient",
-	"version": "0.1.3",
+	"version": "0.2.0",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
 		"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",
+		"@odit/license-exporter": "^0.0.12",
 		"@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",

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;
+  let api_endpoint_input = "";
   $: error = false;
   $: errormessage = "";
   $: isTokenValid =
-    token?.length === 44 &&
+    token === "rst" ||
+    (token?.length === 44 &&
       token.split(".")[0].length === 7 &&
-    isUUID(token.split(".")[1]);
+      isUUID(token.split(".")[1]));
   $: isEndpointValid = isURL(api_endpoint_input);
 </script>
 
@@ -66,6 +68,13 @@
           class="flex flex-col pt-3 md:pt-8"
           onsubmit="event.preventDefault();"
           on:submit={() => {
+            if (token === "rst") {
+              apikey.set("");
+              api_endpoint.set("");
+              page.set("");
+              token = "";
+              api_endpoint_input = "";
+            } else {
               axios
                 .request({
                   method: "GET",
@@ -82,6 +91,7 @@
                   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 === "rst") {
+              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);
+            }
           }}
         >
           <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>

src/Scanner.svelte

@@ -29,7 +29,7 @@
       </div>
 
       <div class="my-1 px-1 w-1/3 overflow-hidden text-center self-center">
-        Lauf Für Kaya! Scan 📷
+        Lauf Für Kaya! Scan
       </div>
 
       <div class="my-1 px-1 w-1/3 overflow-hidden text-center self-center">
@@ -39,7 +39,7 @@
     </div>
   </div>
 
-  <h1 class="mr-6 text-7xl font-semibold text-center text-gray-900">
+  <h1 class="mr-6 text-7xl font-semibold text-center text-gray-900 font-mono">
     {hours}:{minutes}:{seconds}
   </h1>
   <section class="px-4 py-24 mx-auto max-w-7xl">

src/Settings.svelte

@@ -6,7 +6,7 @@
 
 <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 📷
+    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 mt-2">{$_("api_key")}</p>

vite.config.ts

@@ -1,19 +1,7 @@
 import svelte from '@svitejs/vite-plugin-svelte';
 import windiCSS from 'vite-plugin-windicss';
-import { minify } from 'html-minifier';
 import { defineConfig } from 'vite';
 //
-const indexReplace = () => {
-	return {
-		name: 'html-transform',
-		transformIndexHtml(html) {
-			return minify(html, {
-				collapseWhitespace: true
-			});
-		}
-	};
-};
-
 export default defineConfig(({ command, mode }) => {
 	const isProduction = mode === 'production';
 	return {
@@ -43,8 +31,7 @@ export default defineConfig(({ command, mode }) => {
 				preprocess: [
 					//
 				]
-			}),
+			})
-			indexReplace()
 		]
 	};
 });