Tuned eslint and pretifier. Updated navigation

.eslintrc.json

@@ -0,0 +1,57 @@
+{
+  "parserOptions": {
+    "ecmaVersion": "latest"
+  },
+  "plugins": ["prettier"],
+  "env": {
+    "browser": true,
+    "node": true,
+    "es6": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:prettier/recommended"
+  ],
+  "overrides": [
+    {
+      "files": ["**/*.ts"],
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended"
+      ],
+      "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "extraFileExtensions": [".svelte"]
+      },
+      "plugins": ["@typescript-eslint"],
+      "rules": {
+        "@typescript-eslint/no-explicit-any": "off"
+      }
+    },
+    {
+      "files": ["**/*.svelte"],
+      "parser": "svelte-eslint-parser",
+      "extends":[
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:svelte/recommended",
+        "plugin:svelte/prettier"
+      ],
+      "parserOptions": {
+        "parser": {
+          "ts": "@typescript-eslint/parser",
+          "js": "espree",
+          "typescript": "@typescript-eslint/parser"
+        }
+      },
+      "rules": {
+        "@typescript-eslint/no-explicit-any": "off"
+      }
+    }
+  ],
+  "rules": {
+    "prettier/prettier": "warn"
+  }
+}

.prettierrc

@@ -1,12 +1,15 @@
 {
-	"svelteSortOrder": "scripts-markup-styles",
+	"plugins": ["prettier-plugin-svelte"],
+	"svelteSortOrder": "scripts-markup-styles-options",
 	"htmlWhitespaceSensitivity": "ignore",
 	"trailingComma": "all",
 	"requirePragma": false,
 	"bracketSpacing": true,
+	"bracketSameLine": true,
 	"singleQuote": true,
-	"printWidth": 100,
+	"printWidth": 120,
 	"useTabs": false,
 	"tabWidth": 2,
-	"semi": true
+	"semi": true,
+	"arrowParens": "avoid"
 }

.vscode/settings.json

@@ -1,6 +1,9 @@
-{
-  "[svelte]": {
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "svelte.svelte-vscode"
-  }
-}
+{
+  "[svelte]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "svelte.svelte-vscode"
+  },
+  "eslint.validate": [
+    "javascript", "javascriptreact", "svelte"
+  ]
+}

package.json

@@ -15,8 +15,10 @@
 		"build:svelte": "vite build",
 		"build:electron": "electron-builder -mwl --config build.config.json",
 		"prepare": "npm run smui-theme-light && npm run smui-theme-dark",
-		"smui-theme-light": "smui-theme compile static/smui.css -i src/theme",
-		"smui-theme-dark": "smui-theme compile static/smui-dark.css -i src/theme/dark"
+		"smui-theme-light": "smui-theme compile static/smui.css -i src/theme -i node_modules",
+		"smui-theme-dark": "smui-theme compile static/smui-dark.css -i src/theme/dark -i node_modules",
+		"lint": "eslint src/",
+		"lint:fix": "eslint src/ --fix"
 	},
 	"browserslist": [
 		"Chrome 89"
@@ -32,6 +34,7 @@
 		"@smui-extra/accordion": "^7.0.0-beta.14",
 		"@smui/button": "^7.0.0-beta.14",
 		"@smui/circular-progress": "^7.0.0-beta.14",
+		"@smui/drawer": "^7.0.0-beta.14",
 		"@smui/icon-button": "^7.0.0-beta.14",
 		"@smui/list": "^7.0.0-beta.14",
 		"@smui/menu": "^7.0.0-beta.14",
@@ -55,11 +58,13 @@
 		"escape-string-regexp": "^5.0.0",
 		"eslint": "^8.36.0",
 		"eslint-config-prettier": "^9.0.0",
-		"eslint-plugin-svelte3": "^4.0.0",
+		"eslint-plugin-prettier": "^5.0.0",
+		"eslint-plugin-svelte": "^2.32.4",
 		"node-screenshots": "^0.1.6",
+		"normalize.css": "^8.0.1",
 		"npm-run-all": "^4.1.5",
 		"papaparse": "^5.4.1",
-		"prettier": "^3.0.1",
+		"prettier": "^3.0.2",
 		"prettier-plugin-svelte": "^3.0.3",
 		"qr-scanner": "^1.4.2",
 		"rollup-plugin-node-externals": "^6.1.1",

src/electron.cjs

@@ -2,7 +2,6 @@ const windowStateManager = require('electron-window-state');
 const { app, BrowserWindow } = require('electron');
 const serve = require('electron-serve');
 const path = require('path');
-const { rpcHandle } = require('./lib/electron-rpc/electron-rpc_main.cjs');
 
 try {
 	require('electron-reloader')(module);
@@ -14,7 +13,6 @@ const serveURL = serve({ directory: '.' });
 const port = process.env.PORT || 5173;
 const dev = !app.isPackaged;
 let mainWindow;
-let screenSize;
 
 function createWindow() {
 	let windowState = windowStateManager({
@@ -39,6 +37,7 @@ function createWindow() {
 		y: windowState.y,
 		width: windowState.width,
 		height: windowState.height,
+    icon: path.join(__dirname, '../static/favicon.png'),
 	});
 
 	windowState.manage(mainWindow);
@@ -65,11 +64,6 @@ function loadVite(port) {
 }
 
 function createMainWindow() {
-  const { screen } = require('electron');
-
-  const primaryDisplay = screen.getPrimaryDisplay();
-  screenSize = primaryDisplay.workAreaSize;
-
 	mainWindow = createWindow();
 	mainWindow.once('close', () => {
 		mainWindow = null;

src/global.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="@sveltejs/kit" />
-/// <reference types="svelte" />
-/// <reference types="vite/client" />
-declare interface Window {
-	electron: any;
-}
+/// <reference types="@sveltejs/kit" />
+/// <reference types="svelte" />
+/// <reference types="vite/client" />
+declare interface Window {
+  electron: any;
+}

src/lib/electron-rpc/electron-rpc_renderer.ts

@@ -3,7 +3,7 @@ import { v1 as uuidv4 } from 'uuid';
 
 export async function rpcToMain<T>(name: string, arg?: any): Promise<T> {
   const requestId = uuidv4();
-  return new Promise<any>((resolve, _) => {
+  return new Promise<any>(resolve => {
     function resultHandler(_: IpcRendererEvent, result: { result: any; requestId: string }) {
       if (result.requestId == requestId) {
         resolve(result.result);

src/lib/totp-client/ascii-table-parse.ts

@@ -1,17 +1,15 @@
 import { parse } from 'papaparse';
 
 export function parseFromString(input: string) {
-  const csvLike = input
-    .replace(/^\+[\-\+]+\+\r?\n?$/gm, '')
-    .replace(/(^\|\s*)|(\s*\|$)/gm, '');
-  return parse(csvLike, { 
-    delimiter: '|', 
-    dynamicTyping: true, 
+  const csvLike = input.replace(/^\+[-+]+\+\r?\n?$/gm, '').replace(/(^\|\s*)|(\s*\|$)/gm, '');
+  return parse(csvLike, {
+    delimiter: '|',
+    dynamicTyping: true,
     header: true,
     skipEmptyLines: true,
     quoteChar: '',
     escapeChar: '',
-    transformHeader: (header, _) => header.trim(),
-    transform: (value, _) => value.trim()
+    transformHeader: header => header.trim(),
+    transform: value => value.trim(),
   }).data;
 }

src/lib/totp-client/index.ts

@@ -1 +1 @@
-export * from './totp-client'
+export * from './totp-client';

src/lib/totp-client/serial-port-async.ts

@@ -1,15 +1,14 @@
-import { SerialPort } from "serialport";
+import { SerialPort } from 'serialport';
 import delay from 'delay';
 import { SmartBuffer } from 'smart-buffer';
 import { tryDelay } from './try-delay';
 
 export interface ReadUntilOptions {
-  timeout: number,
-  signal: AbortSignal
+  timeout: number;
+  signal: AbortSignal;
 }
 
 export class SerialPortAsync extends SerialPort {
-
   flushAsync() {
     return new Promise<void>((resolve, reject) => {
       this.flush(error => {
@@ -21,7 +20,7 @@ export class SerialPortAsync extends SerialPort {
       });
     });
   }
-  
+
   openAsync() {
     return new Promise<void>((resolve, reject) => {
       this.open(error => {
@@ -33,7 +32,7 @@ export class SerialPortAsync extends SerialPort {
       });
     });
   }
-  
+
   closeAsync() {
     return new Promise<void>((resolve, reject) => {
       this.close(error => {
@@ -45,7 +44,7 @@ export class SerialPortAsync extends SerialPort {
       });
     });
   }
-  
+
   writeAsync(data: string | Buffer, encoding: BufferEncoding) {
     return new Promise<void>((resolve, reject) => {
       this.write(data, encoding, error => {
@@ -57,7 +56,7 @@ export class SerialPortAsync extends SerialPort {
       });
     });
   }
-  
+
   drainAsync() {
     return new Promise<void>((resolve, reject) => {
       this.drain(error => {
@@ -71,30 +70,33 @@ export class SerialPortAsync extends SerialPort {
   }
 
   async readUntil(end: string | RegExp, options?: Partial<ReadUntilOptions>) {
-    let timeoutAbortController = null;
+    let timeoutAbortController: AbortController | null = null;
     let timeoutExpired = false;
     options = options || {};
     if (options.timeout && options.timeout > 0) {
       timeoutAbortController = new AbortController();
-      delay(options.timeout, { signal: timeoutAbortController.signal }).then(() => {
-        timeoutExpired = true;
-      }, () => {});
+      delay(options.timeout, { signal: timeoutAbortController.signal }).then(
+        () => {
+          timeoutExpired = true;
+        },
+        () => {},
+      );
     }
-  
+
     const buffer = new SmartBuffer();
     let matchFound = false;
-    let result = null;
+    let result: string | null = null;
     do {
       if (options.signal?.aborted) {
         break;
       }
-  
+
       const readResult = this.read(1);
       if (!readResult) {
         await tryDelay(100, { signal: timeoutAbortController ? timeoutAbortController.signal : undefined });
         continue;
       }
-  
+
       buffer.writeBuffer(readResult);
       result = buffer.toString('ascii');
       if (end instanceof RegExp) {
@@ -103,23 +105,23 @@ export class SerialPortAsync extends SerialPort {
         matchFound = result.includes(end);
       }
     } while (!matchFound && !timeoutExpired);
-  
+
     if (timeoutAbortController) {
       timeoutAbortController.abort();
     }
-  
+
     buffer.destroy();
-  
+
     options.signal?.throwIfAborted();
-  
+
     if (timeoutExpired) {
       throw 'Timeout expired';
     }
-  
+
     return result;
   }
-  
-  async writeAndDrain (data: string | Buffer, encoding: BufferEncoding = 'ascii') {
+
+  async writeAndDrain(data: string | Buffer, encoding: BufferEncoding = 'ascii') {
     await this.writeAsync(data, encoding);
     await this.drainAsync();
   }