chore: apply new pages

Author: Nemika-Haj

main/background.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, ipcMain } from 'electron';
+import { app, ipcMain } from 'electron';
 import serve from 'electron-serve';
 import { createWindow } from './helpers';
 import electronLogger from "electron-log";
@@ -7,10 +7,13 @@ import ipcEvents from './helpers/ipcEvents';
 import tray from './helpers/tray';
 import util, { isProd } from './util';
 import apiEvents from './helpers/apiEvents';
+import userSettings from "./helpers/userSettings"
 
 // AUTO UPDATER
 autoUpdater.logger = electronLogger
 
+autoUpdater.allowPrerelease = userSettings.get("beta")
+
 // @ts-ignore
 autoUpdater.logger.transports.file.level = "info"
 // AUTO UPDATER
@@ -45,12 +48,12 @@ if (isProd) {
     show: false,
     frame: false
   })
-  mainWindow.loadURL(util.renderPage("main"))
+  mainWindow.loadURL(util.renderPage("home"))
 
   splashWindow.on('close', () => {
     if(mainWindow) mainWindow.show()
   })
-
+  
   autoUpdater.on("update-not-available", () => {
     splashWindow.webContents.send("load-window")
   })

main/helpers/ipcEvents.ts

@@ -1,9 +1,10 @@
 import { randomUUID } from "crypto";
-import { app, dialog, ipcMain, Notification } from "electron";
+import { app, ipcMain, Notification } from "electron";
 import Store from "electron-store";
 import files from "./files";
 import util from "../util";
 import { PasswordData } from "../../renderer/util/interfaces";
+import userSettings from "./userSettings"
 
 const passwordStore = new Store({
   name: 'passwords'
@@ -74,7 +75,8 @@ const init = () => {
 
   ipcMain.handle("select-file", async (_, options) => files.select(options))
 
-  ipcMain.handle("save-file", async (_, path) => files.save(path, "testPy.png"))
+  ipcMain.handle("get-setting", async(_, name) => userSettings.get(name))
+  ipcMain.handle("update-setting", async(_, name, value) => userSettings.set(name, value))
 };
 
 export default {

main/helpers/tray.ts

@@ -1,4 +1,4 @@
-import { Tray, Menu, nativeImage } from "electron"
+import { Tray, Menu, nativeImage, BrowserWindow } from "electron"
 import util from "../util"
 
 const init = async() => {
@@ -10,6 +10,14 @@ const init = async() => {
         { label: "Exit LockPass", role: "quit" }
     ])
 
+    tray.on('right-click', () => {
+        if(BrowserWindow.getAllWindows().length > 1) {
+            const win = BrowserWindow.getAllWindows()[0]
+            win.show()
+            win.restore()
+        }
+    })
+
     tray.setToolTip("LockPass")
     tray.setContextMenu(contextMenu)
 }

main/helpers/userSettings.ts

@@ -0,0 +1,11 @@
+import Store from "electron-store"
+
+const settingStore = new Store({
+    name: "settings",
+    defaults: {
+        beta: false
+    },
+    clearInvalidConfig: true
+})
+
+export default settingStore

package.json

@@ -2,7 +2,7 @@
   "private": true,
   "name": "lock-pass",
   "description": "A simple password manager",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "author": "Nemika Hajbour <nemika@bytestobits.dev>",
   "repository": {
     "type": "git",

renderer/pages/main.tsx

@@ -0,0 +1,60 @@
+import { Badge, Checkbox, Divider, Flex, HStack, Text } from "@chakra-ui/react"
+import { ipcRenderer } from "electron"
+import { useEffect, useState } from "react"
+import Main from "../components/Main"
+
+export default () => {
+    const [firstFetch, setFetch] = useState(false)
+
+    const [beta, setBeta] = useState(false)
+    const [version, setVersion] = useState("")
+    
+    useEffect(() => {
+
+        if (!firstFetch) {
+            const init = async() => {
+                setBeta(await ipcRenderer.invoke("get-setting", "beta"))
+                setVersion(await ipcRenderer.invoke("get-version"))
+            }
+
+            init()
+
+            setFetch(true)
+        }
+
+    })
+
+    const handleUpdate = async(name, value) => {
+        await ipcRenderer.invoke("update-setting", name, value)
+    }
+
+    return (
+        <Main>
+            <Flex
+                w="calc(100vw - 150px)"
+                maxH="calc(100vh - 30px)"
+                overflowY="auto"
+                m={5}
+                p={5}
+                rounded="md"
+                border="2px solid white"
+                bg="darkBackground"
+                direction="column"
+            >
+                <Text fontWeight="bold" fontSize="30px">Settings</Text>
+                <Divider mb={2} />
+
+                <HStack>
+                    <Text>Beta Releases: </Text>
+                    <Checkbox isChecked={beta} onChange={async() => {
+                        await handleUpdate("beta", !beta)
+                        setBeta(!beta)
+                    }} />
+                </HStack>
+
+                <Badge colorScheme="orange" w="max-content" rounded="md" p={2} my={2}>Version: {version}</Badge>
+
+            </Flex>
+        </Main>
+    )
+}