Remove close window buttons

Levminer · Jun 25, 2022 · 6277135 · 6277135
1 parent 970c728
commit 6277135
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 86 deletions.
diff --git a/app/edit/index.html b/app/edit/index.html
@@ -21,16 +21,10 @@ <h5 class="build-content m-0 mx-3 flex flex-row text-center font-bold">You are r
 		</div>
 
 		<!-- header -->
-		<div class="mx-auto mt-40 w-3/5 rounded-2xl bg-gray-700 text-center">
+		<div class="mx-auto mt-40 w-3/5 rounded-2xl bg-gray-700 pb-1 text-center">
 			<img src="../../img/header.png" class="relative top-5 h-16 w-16" />
 			<h2 data-loc>Edit codes</h2>
 			<h4 data-loc>You can edit or delete your existing codes and you can add more codes.</h4>
-			<button class="buttoni mb-6" onclick="hide()">
-				<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-					<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-				</svg>
-				<span data-loc>Close window</span>
-			</button>
 		</div>
 
 		<!-- content -->

diff --git a/app/edit/index.js b/app/edit/index.js
@@ -623,13 +623,6 @@ const loadCodes = async () => {
 	}
 }
 
-/**
- * Hide window
- */
-const hide = () => {
-	ipc.invoke("toggleToolsWindow")
-}
-
 /**
  * Send reload events
  */

diff --git a/app/export/index.html b/app/export/index.html
@@ -21,16 +21,10 @@ <h5 class="build-content m-0 mx-3 flex flex-row text-center font-bold">You are r
 		</div>
 
 		<!-- header -->
-		<div class="mx-auto mt-40 w-3/5 rounded-2xl bg-gray-700 text-center">
+		<div class="mx-auto mt-40 w-3/5 rounded-2xl bg-gray-700 pb-1 text-center">
 			<img src="../../img/header.png" class="relative top-5 h-16 w-16" />
 			<h2>Export</h2>
 			<h4 data-loc>You can export the 2FA codes you saved.</h4>
-			<button class="buttoni mb-6" onclick="hide()">
-				<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-					<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-				</svg>
-				<span data-loc>Close window</span>
-			</button>
 		</div>
 
 		<!-- content -->

diff --git a/app/export/index.js b/app/export/index.js
@@ -202,13 +202,6 @@ const saveQrCodes = () => {
 		})
 }
 
-/**
- * Hide window
- */
-const hide = () => {
-	ipc.invoke("toggleToolsWindow")
-}
-
 /**
  * No saved codes found
  */

diff --git a/app/import/index.html b/app/import/index.html
@@ -21,16 +21,10 @@ <h5 class="build-content m-0 mx-3 flex flex-row text-center font-bold">You are r
 		</div>
 
 		<!-- header -->
-		<div class="mx-auto mt-40 w-3/5 rounded-2xl bg-gray-700 text-center">
+		<div class="mx-auto mt-40 w-3/5 rounded-2xl bg-gray-700 pb-1 text-center">
 			<img src="../../img/header.png" class="relative top-5 h-16 w-16" />
 			<h2>Import</h2>
 			<h4 data-loc>You can import your 2FA codes here, see supported QR codes for more information.</h4>
-			<button class="buttoni mb-6" onclick="hide()">
-				<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-					<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-				</svg>
-				<span data-loc>Close window</span>
-			</button>
 		</div>
 
 		<!-- content -->

diff --git a/app/import/index.js b/app/import/index.js
@@ -64,13 +64,6 @@ const examplesLink = () => {
 	shell.openExternal("https://docs.authme.levminer.com/#/examples")
 }
 
-/**
- * Hide window
- */
-const hide = () => {
-	ipc.invoke("toggleToolsWindow")
-}
-
 /**
  * Build number
  */

diff --git a/app/settings/index.html b/app/settings/index.html
@@ -92,16 +92,10 @@ <h5 class="build-content m-0 mx-3 flex flex-row text-center font-bold">You are r
 					</div>
 
 					<!-- header -->
-					<div id="header" class="mx-auto mt-40 w-3/5 rounded-2xl bg-gray-700 text-center">
+					<div id="header" class="mx-auto mt-40 w-3/5 rounded-2xl bg-gray-700 pb-1 text-center">
 						<img src="../../img/header.png" class="relative top-5 h-16 w-16" />
 						<h2 data-loc>Settings</h2>
 						<h4 data-loc>You can configure the app settings here.</h4>
-						<button class="buttoni mb-6" onclick="hide()">
-							<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-								<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-							</svg>
-							<span data-loc>Close window</span>
-						</button>
 					</div>
 
 					<!-- settings -->

diff --git a/app/settings/index.js b/app/settings/index.js
@@ -730,13 +730,6 @@ const githubIssues = () => {
 	shell.openExternal("https://github.com/Levminer/authme/issues")
 }
 
-/**
- * Hide window
- */
-const hide = () => {
-	ipc.send("toggleSettings")
-}
-
 /**
  * Menu
  */

diff --git a/languages/en.js b/languages/en.js
@@ -164,7 +164,6 @@ module.exports = {
 		"Version",
 		"Settings",
 		"You can configure the app settings here.",
-		"Close window",
 		"Launch on startup",
 		"Start Authme after your computer started. Authme will start on the system tray.",
 		"Close app to tray",
@@ -205,7 +204,6 @@ module.exports = {
 
     "import": [
 		"You can import your 2FA codes here, see supported QR codes for more information.",
-		"Close window",
 		"Supported QR codes",
 		"List of the currently supported QR codes. You can import from more types at the same time.",
 		"Examples",
@@ -254,7 +252,6 @@ module.exports = {
 
 	"export": [
 		"You can export the 2FA codes you saved.",
-		"Close window",
 		"Export codes",
 		"Your saved codes can be exported here. Ideal if you want to use your codes elsewhere or for a security backup.",
 		"Confirm",
@@ -275,7 +272,6 @@ module.exports = {
 	"edit": [
 		"Edit codes",
 		"You can edit or delete your existing codes and you can add more codes.",
-		"Close window",
 		"Restore",
 		"You can restore the latest save. If you load your codes below it will overwrite the current save!",
 		"Restore",

diff --git a/languages/hu.js b/languages/hu.js
@@ -164,7 +164,6 @@ module.exports = {
 		"Verzió",
 		"Beállítások",
 		"Itt tudod szerkeszteni a beállításokat.",
-		"Ablak bezárása",
 		"Autómatikus indítás",
 		"Az Authme elindul a számítógépeddel együtt. Az alkalmazás a tálcán fog indulni.",
 		"Tálcára kicsinyítés",
@@ -205,7 +204,6 @@ module.exports = {
 
 	"import": [
 		"Itt tudod importálni a 2FA kódjaidat, több információért nézd meg a támogatott QR-kódokat.",
-		"Ablak bezárása",
 		"Támogatott QR-kódok",
 		"A jelenleg támogatott QR-kódok listája. Több féle típusból is importálhatsz egyszerre.",
 		"Példák",
@@ -254,7 +252,6 @@ module.exports = {
 
 	"export": [
 		"Itt exportálhatod az elmentett 2FA kódjaidat.",
-		"Ablak bezárása",
 		"Kódok exportálása",
 		"Az elmentett kódjaidat itt tudod exportálni. Ideális ha máshol is akarod használni a kódjaidat vagy egy biztonsági mentéshez.",
 		"Megerősítés",
@@ -275,7 +272,6 @@ module.exports = {
 	"edit": [
 		"Kódok szerkesztése",
 		"Itt tudod szerkeszteni vagy törölni a mentett kódjaidat vagy új kódokat hozzáadni.",
-		"Ablak bezárása",
 		"Visszaállítás",
 		"Vissza tudod állítani az előző mentést. Ha lentebb betöltöd a kódjaidat az felül fogja írni a jelenlegi mentést.",
 		"Visszaállítás",

diff --git a/main.js b/main.js
@@ -636,7 +636,7 @@ const createWindows = () => {
 	window_security.on("close", () => {
 		app.exit()
 
-		logger.log("Application exited from landing window")
+		logger.log("Application exited from security window")
 	})
 
 	window_codes.on("close", (event) => {
@@ -655,7 +655,6 @@ const createWindows = () => {
 				logger.log("Application exited from application window")
 			} else {
 				event.preventDefault()
-
 				window_codes.hide()
 
 				codes_shown = false
@@ -665,35 +664,27 @@ const createWindows = () => {
 			}
 		}
 
-		logger.log("Application closed")
+		logger.log("Application window closed")
 	})
 
 	window_settings.on("close", (event) => {
-		if (dev === true) {
-			app.quit()
-		} else {
-			event.preventDefault()
-
-			window_settings.hide()
+		event.preventDefault()
+		window_settings.hide()
+		window_codes.focus()
 
-			settings_shown = false
-		}
+		settings_shown = false
 
-		logger.log("Settings closed")
+		logger.log("Settings window closed")
 	})
 
 	window_tools.on("close", (event) => {
-		if (dev === true) {
-			app.quit()
-		} else {
-			event.preventDefault()
-
-			window_tools.hide()
+		event.preventDefault()
+		window_tools.hide()
+		window_codes.focus()
 
-			tools_shown = false
-		}
+		tools_shown = false
 
-		logger.log("Edit closed")
+		logger.log("Tools window closed")
 	})
 
 	/**

diff --git a/styles/tailwind.css b/styles/tailwind.css