Merge branch 'main' of https://git.odit.services/lfk/scanclient into main

Reviewed-on: #8

close #4
close #5

.drone.yml

@@ -4,30 +4,27 @@ name: gitea_token
 get:
   path: odit-git-bot
   name: apikey
-
 ---
 kind: pipeline
 type: kubernetes
 name: build
-
 steps:
-  - name: run electron packager
+  - name: run build
     depends_on: ["clone"]
     image: node:15.11.0-alpine3.13
     commands:
       - apk add git zip -f
-      - yarn && cd app && yarn && cd ..
+      - yarn
-      - yarn electron:package
+      - yarn build
-      - mkdir dist
+      - zip -r out/dist.zip dist
-      - zip -r dist/@lfk-scanclient-linux-x64.zip out/@lfk-scanclient-linux-x64
   - name: gitea_release
-    depends_on: ["run electron packager"]
+    depends_on: ["run build"]
     image: plugins/gitea-release
     settings:
       api_key:
         from_secret: gitea_token
       base_url: https://git.odit.services
-      files: dist/*
+      files: out/*
       checksum:
         - md5
         - sha1
@@ -37,7 +34,6 @@ steps:
         - crc32
     when:
       event: tag
-
 trigger:
   branch:
     - main

.husky/.gitignore

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

.husky/pre-commit

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

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
-    "i18n-ally.localesPaths": "app/src/locales",
+    "i18n-ally.localesPaths": "src/locales",
     "i18n-ally.keystyle": "nested"
 }

Dockerfile

@@ -1,6 +1,5 @@
 FROM node:15.11.0-alpine3.13
-RUN apk add git -f
 WORKDIR /app
 COPY . .
-RUN yarn && cd app && yarn && cd ..
+RUN yarn
-RUN yarn electron:package
+RUN yarn build

README.md

@@ -1,25 +1,20 @@
 # @lfk/scanclient
 
 ## ✒️ Overview
-This is an API client for @lfk/backend
+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).
-- Served to clients via by [Electron](https://electronjs.org/).
 
 ## 🚀 Getting Started
 ```
-yarn && cd app && yarn && cd ..
+yarn
 ```
-## WebApp Development
+## Development
 ```
 yarn dev
 /
 yarn dev --open
 ```
-## Run in electron
+## Build
 ```
-yarn electron:start
+yarn build
-```
-# Package electron
-```
-yarn electron:package
 ```

app/package.json

@@ -1,23 +0,0 @@
-{
-	"name": "@lfk/scanclient",
-	"version": "0.0.0",
-	"scripts": {
-		"dev": "vite",
-		"build": "vite build",
-		"format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte"
-	},
-	"devDependencies": {
-		"@svitejs/vite-plugin-svelte": "^0.11.1",
-		"@tsconfig/svelte": "^1.0.10",
-		"@types/html-minifier": "^4.0.0",
-		"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.1.2",
-		"vite-plugin-windicss": "^0.9.2"
-	}
-}

main.js

@@ -1,39 +0,0 @@
-const { app, BrowserWindow } = require('electron');
-const path = require('path');
-
-function createWindow() {
-	const mainWindow = new BrowserWindow({
-		width: 800,
-		height: 600,
-		fullscreen: true
-		// webPreferences: {
-		// 	preload: path.join(__dirname, 'preload.js')
-		// }
-	});
-	mainWindow.loadFile('app/dist/index.html');
-	// mainWindow.removeMenu();
-	// mainWindow.webContents.openDevTools()
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.whenReady().then(() => {
-	createWindow();
-
-	app.on('activate', function() {
-		// On macOS it's common to re-create a window in the app when the
-		// dock icon is clicked and there are no other windows open.
-		if (BrowserWindow.getAllWindows().length === 0) createWindow();
-	});
-});
-
-// Quit when all windows are closed, except on macOS. There, it's common
-// for applications and their menu bar to stay active until the user quits
-// explicitly with Cmd + Q.
-app.on('window-all-closed', function() {
-	if (process.platform !== 'darwin') app.quit();
-});
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.

package.json

@@ -1,48 +1,27 @@
 {
 	"name": "@lfk/scanclient",
 	"version": "0.0.0",
-	"description": "minimal electron application",
-	"main": "main.js",
 	"scripts": {
-		"dev": "cd app && yarn dev",
+		"dev": "vite",
-		"electron:start": "cd app && yarn build && cd .. && electron-forge start",
+		"build": "vite build",
-		"electron:package": "cd app && yarn build && cd .. && electron-forge package",
+		"format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte",
-		"format": "cd app && yarn format"
+		"prepare": "husky install",
+		"license:export": "license-exporter --markdown && git stage licenses.md"
 	},
 	"devDependencies": {
-		"@electron-forge/cli": "^6.0.0-beta.54",
+		"@odit/license-exporter": "^0.0.11",
-		"@electron-forge/maker-deb": "^6.0.0-beta.54",
+		"@svitejs/vite-plugin-svelte": "^0.11.1",
-		"@electron-forge/maker-rpm": "^6.0.0-beta.54",
+		"@tsconfig/svelte": "^1.0.10",
-		"@electron-forge/maker-squirrel": "^6.0.0-beta.54",
+		"@types/html-minifier": "^4.0.0",
-		"@electron-forge/maker-zip": "^6.0.0-beta.54",
+		"axios": "^0.21.1",
-		"electron-nightly": "14.0.0-nightly.20210318"
+		"html-minifier": "^4.0.0",
-	},
+		"husky": "^5.1.3",
-	"dependencies": {
+		"prettier": "^2.2.1",
-		"electron-squirrel-startup": "^1.0.0",
+		"prettier-plugin-svelte": "^2.2.0",
+		"svelte": "^3.35.0",
+		"svelte-preprocess": "^4.6.9",
+		"vite": "^2.1.2",
+		"vite-plugin-windicss": "^0.9.2",
 		"svelte-i18n": "^3.3.7"
-	},
-	"config": {
-		"forge": {
-			"packagerConfig": {},
-			"makers": [
-				{
-					"name": "@electron-forge/maker-zip",
-					"platforms": [
-						"darwin"
-					],
-					"config": {
-						"name": "lfk__scanclient"
-					}
-				},
-				{
-					"name": "@electron-forge/maker-deb",
-					"config": {}
-				},
-				{
-					"name": "@electron-forge/maker-rpm",
-					"config": {}
-				}
-			]
-		}
 	}
 }