authme 2.2.2

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,14 @@
 # Reference issue
 
--   Reference the issue with #number here.
+-   `Reference the issue with #number here.`
 
 ## Purpose
 
--   Describe the problem or feature.
+-   `Describe the problem or feature.`
 
 ## Approach
 
--   How does this change or address the problem.
+-   `How does this change or address the problem.`
 
 ## TODO
 

.github/SECURITY.md

@@ -13,7 +13,7 @@
 
 ## Reporting a Vulnerability
 
--   Please report security vulnerabilitys thru email at: <[email protected]>.
+-   Please report security vulnerabilitys in email at: <[email protected]>
 
 ## Release cycle
 

README.md

@@ -1,7 +1,7 @@
 # Authme
 
 -   Simple cross platform two-factor authentication app for desktop.
--   Available on: [Windows x64](github.com/Levminer/authme/releases/latest), [Linux x64](github.com/Levminer/authme/releases/latest), [Mac x64 (Alpha)](https://nightly.link/Levminer/authme/workflows/mac-artifacts/dev/authme-latest-mac-x64-installer-portable.zip)
+-   Available on: [Windows x64](https://github.com/Levminer/authme/releases/latest), [Linux x64](https://github.com/Levminer/authme/releases/latest), [Mac x64 (Alpha)](https://nightly.link/Levminer/authme/workflows/mac-artifacts/dev/authme-latest-mac-x64-installer-portable.zip)
 
 <img src="https://raw.githubusercontent.com/Levminer/authme/main/img/screenshot.png?raw=true">
 
@@ -26,7 +26,7 @@
 
 ## Authme Web
 
--   Authme is now available as a web app. It's a PWA app to, so you can install it on your Android or IOS phone!
+-   Authme is now available as a web app. It's a PWA app to, so you can install it on your Android or IOS phone.
 -   Try it out and give feedback: [Authme Web](https://github.com/levminer/authme-web)
 
 ## Release cycle
@@ -42,5 +42,4 @@
 ## License
 
 -   This software is licensed under: [GPL-3.0](https://github.com/Levminer/authme/blob/main/LICENSE.md)
-
 -   If you are planning to use this software as a business please contact me at: <[email protected]>

app/application/index.html

@@ -6,7 +6,7 @@
 		<meta charset="UTF-8" />
 		<title>Authme</title>
 		<!-- css -->
-		<link rel="stylesheet" href="../.././src/dragonfly@1.3.0.css" />
+		<link rel="stylesheet" href="../.././src/dragonfly@1.4.0.css" />
 		<link rel="stylesheet" href="../.././src/[email protected]" />
 		<link rel="stylesheet" href="./src/css/index.css" />
 		<!-- js -->

app/application/src/css/index.css

@@ -5,10 +5,6 @@ body {
 	background: rgb(20, 20, 20);
 }
 
-:root {
-	--df_gray: rgb(10, 10, 10);
-}
-
 h4 {
 	font-size: 1.5rem;
 }
@@ -151,7 +147,7 @@ h4 {
 }
 
 .input2:hover {
-	background-color: var(--df_gray);
+	background-color: var(--df_primary_background);
 	color: white;
 	border-color: white;
 }

app/confirm/index.html

@@ -6,8 +6,7 @@
 		<!-- js -->
 		<script defer src="./src/js/index.js"></script>
 		<!-- css -->
-		<link rel="stylesheet" href="../.././src/[email protected]" />
-		<link rel="stylesheet" href="../.././src/var.css" />
+		<link rel="stylesheet" href="../.././src/[email protected]" />
 		<link rel="stylesheet" href="./src/css/index.css" />
 		<!-- favicon -->
 		<link rel="shortcut icon" href="../../img/icon.ico" type="image/x-icon" />

app/export/index.html

@@ -4,14 +4,11 @@
 		<meta charset="UTF-8" />
 		<title>Authme</title>
 		<!-- js -->
-		<script defer src="../.././src/[email protected]"></script>
 		<script defer src="./src/js/convert.js"></script>
 		<script defer src="./src/js/index.js"></script>
 		<script defer src="./src/js/export.js"></script>
 		<!-- css -->
-		<link rel="stylesheet" href="../.././src/[email protected]" />
-		<link rel="stylesheet" href="../.././src/[email protected]" />
-		<link rel="stylesheet" href="../.././src/var.css" />
+		<link rel="stylesheet" href="../.././src/[email protected]" />
 		<link rel="stylesheet" href="./src/css/index.css" />
 		<!-- favicon -->
 		<link rel="shortcut icon" href="../../img/icon.ico" type="image/x-icon" />

app/import/index.html

@@ -6,9 +6,8 @@
 		<!-- js -->
 		<script defer src="./src/js/index.js"></script>
 		<!-- css -->
-		<link rel="stylesheet" href="../.././src/dragonfly@1.3.0.css" />
+		<link rel="stylesheet" href="../.././src/dragonfly@1.4.0.css" />
 		<link rel="stylesheet" href="./src/css/index.css" />
-		<link rel="stylesheet" href="../.././src/var.css" />
 		<!-- favicon -->
 		<link rel="shortcut icon" href="../../img/icon.ico" type="image/x-icon" />
 	</head>

app/landing/index.html

@@ -6,8 +6,7 @@
 		<!-- js -->
 		<script defer src="./src/js/index.js"></script>
 		<!-- css -->
-		<link rel="stylesheet" href="../.././src/[email protected]" />
-		<link rel="stylesheet" href="../.././src/var.css" />
+		<link rel="stylesheet" href="../.././src/[email protected]" />
 		<link rel="stylesheet" href="./src/css/index.css" />
 		<!-- favicon -->
 		<link rel="shortcut icon" href="../../img/icon.ico" type="image/x-icon" />

app/settings/index.html

@@ -7,8 +7,7 @@
 		<script defer src="./src/js/index.js"></script>
 		<script defer src="./src/js/keys.js"></script>
 		<!-- css -->
-		<link rel="stylesheet" href="../.././src/[email protected]" />
-		<link rel="stylesheet" href="../.././src/var.css" />
+		<link rel="stylesheet" href="../.././src/[email protected]" />
 		<link rel="stylesheet" href="./src/css/index.css" />
 		<!-- favicon -->
 		<link rel="shortcut icon" href="../../img/icon.ico" type="image/x-icon" />

app/settings/src/js/index.js

@@ -142,7 +142,6 @@ const tray = () => {
 }
 
 // ? reset
-
 const reset = () => {
 	dialog
 		.showMessageBox({
@@ -155,38 +154,54 @@ const reset = () => {
 		})
 		.then((result) => {
 			if (result.response === 0) {
+				// remove settings file
 				fs.unlink(path.join(file_path, "settings.json"), (err) => {
 					if (err && err.code === "ENOENT") {
-						return console.warn(`Authme - Rrror deleting settings.json - ${err}`)
+						return console.warn(`Authme - Error deleting settings.json - ${err}`)
 					} else {
 						console.warn("Authme - File settings.json deleted")
 					}
 				})
 
+				// remove hash file
 				fs.unlink(path.join(file_path, "hash.authme"), (err) => {
 					if (err && err.code === "ENOENT") {
-						return console.warn(`Authme - Rrror deleting hash.authme - ${err}`)
+						return console.warn(`Authme - Error deleting hash.authme - ${err}`)
 					} else {
 						console.warn("Authme - File hash.authme deleted")
 					}
 				})
 
+				// remove start shortcut
 				const file_path2 = path.join(process.env.APPDATA, "/Microsoft/Windows/Start Menu/Programs/Startup/Authme Launcher.lnk")
 
-				fs.unlink(file_path2, (err) => {
-					if (err && err.code === "ENOENT") {
-						return console.warn(`Authme - Rrror deleting shortcut - ${err}`)
-					} else {
-						console.warn("Authme - File shortcut deleted")
-					}
-				})
+				if (dev !== true) {
+					fs.unlink(file_path2, (err) => {
+						if (err && err.code === "ENOENT") {
+							return console.warn(`Authme - Error deleting shortcut - ${err}`)
+						} else {
+							console.warn("Authme - File shortcut deleted")
+						}
+					})
+				}
 
+				// remove cache folder
+				const spawn = require("child_process").spawn
+
+				const src = "src/remove.py"
+
+				const py = spawn("python", [src])
+
+				// clear localstorage
+				localStorage.clear()
+
+				// restart
 				but1.textContent = "Restarting app"
 
-				setTimeout(() => {
+				/* 				setTimeout(() => {
 					app.relaunch()
 					app.exit()
-				}, 1000)
+				}, 1000) */
 			}
 		})
 }

app/splash/index.html

@@ -6,7 +6,7 @@
 		<!-- js -->
 		<script defer src="./src/js/index.js"></script>
 		<!-- css -->
-		<link rel="stylesheet" href="../.././src/dragonfly@1.3.0.css" />
+		<link rel="stylesheet" href="../.././src/dragonfly@1.4.0.css" />
 		<link rel="stylesheet" href="./src/css/index.css" />
 		<!-- favicon -->
 		<link rel="shortcut icon" href="../../img/icon.ico" type="image/x-icon" />
@@ -15,11 +15,11 @@
 		<div class="center">
 			<h1>Authme</h1>
 
-			<img src="../../img/iconw.png" alt="" srcset="" />
+			<img src="../../img/iconw.png" />
 			<br />
 			<br />
 			<br />
-			<img src="../../img/loading.gif" alt="" srcset="" />
+			<img src="../../img/loading.gif" />
 
 			<h4 id="ver"></h4>
 		</div>

app/splash/src/css/index.css

@@ -11,5 +11,5 @@ h1 {
 	top: -150px;
 	width: 500px;
 	height: 550px;
-	background: rgb(20, 20, 20);
+	background: rgb(10, 10, 10);
 }

main.js

@@ -38,8 +38,8 @@ let pass_start = false
 let update_start = false
 
 // ? version
-const authme_version = "2.2.1"
-const tag_name = "2.2.1"
+const authme_version = "2.2.2"
+const tag_name = "2.2.2"
 
 ipc.on("ver", (event, data) => {
 	event.returnValue = authme_version
@@ -171,7 +171,7 @@ const file = JSON.parse(
 // ? install protbuf
 const spawn = require("child_process").spawn
 
-const src = "extract/install.py"
+const src = "src/install.py"
 
 const py = spawn("python", [src])
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "authme",
-	"version": "2.2.1",
+	"version": "2.2.2",
 	"description": "A simple 2FA app for desktop built with Electron and Node.js.",
 	"main": "main.js",
 	"scripts": {