BhawanSingh
/
va-tracker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: BhawanSingh:42dd4da26b47f2d8f4d9c342d47a0a44cabc1dee
Branches Tags
BhawanSingh:master
BhawanSingh:new-window-v2
BhawanSingh:window-build
BhawanSingh:merge
..
compare: BhawanSingh:ec383c109f1c47845fe885ce1321598b1123e019
Branches Tags
BhawanSingh:master
BhawanSingh:new-window-v2
BhawanSingh:window-build
BhawanSingh:merge

No commits in common. "42dd4da26b47f2d8f4d9c342d47a0a44cabc1dee" and "ec383c109f1c47845fe885ce1321598b1123e019" have entirely different histories.
42dd4da26b ... ec383c109f

11 changed files with 216 additions and 819 deletions
Show Stats Expand all files Collapse all files

825
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@ -21,7 +21,6 @@
"@tailwindcss/vite": "^4.1.16",
"axios": "^1.13.2",
"electron-store": "^11.0.2",
"get-windows": "^9.2.3",
"lucide-react": "^0.552.0",
"os-utils": "^0.0.14",
"react": "^18.3.1",

12
src/electron/api/axiosClient.ts
View File

@ -2,21 +2,19 @@
import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
import { getToken } from '../utils/tokenHelper.js';
const TOKEN_KEY = 'ACCESS_TOKEN';
const TOKEN_KEY = 'auth_token';
const api: AxiosInstance = axios.create({
baseURL: 'https://wired-terminally-muskrat.ngrok-free.app/api/v1/va', // 🔁 your backend
// timeout: 10000,
baseURL: 'https://wired-terminally-muskrat.ngrok-free.app/api/v1', // 🔁 your backend
timeout: 10000,
});
// --- Request Interceptor ---
api.interceptors.request.use(
async (config: AxiosRequestConfig): Promise<any> => {
const token = await getToken(TOKEN_KEY);
config.headers = config.headers || {}
if (token) {
config.headers['token'] = token;
if (token && config.headers) {
config.headers.token = token;
config.headers['ngrok-skip-browser-warning'] = 98098;
}

23
src/electron/ipc/ipcHandler.ts
View File

@ -1,14 +1,14 @@
// electron/ipc/tokenHandler.ts
import { ipcMain } from 'electron';
import { getToken, saveToken, clearToken } from '../utils/tokenHelper.js';
import { getActiveApp, handleLogin, takeScreenshot } from '../utils/utilityFunctions.js';
import { handleLogin, takeScreenshot } from '../utils/utilityFunctions.js';
import api from '../api/axiosClient.js';
ipcMain.handle('get-token', async (_, TOKEN_KEY: "ACCESS_TOKEN" | "REFRESH_TOKEN") => {
ipcMain.handle('get-token', async (_, TOKEN_KEY: string) => {
return await getToken(TOKEN_KEY);
});
ipcMain.handle('save-token', async (_, TOKEN_KEY: "ACCESS_TOKEN" | "REFRESH_TOKEN", token: string) => {
ipcMain.handle('save-token', async (_, TOKEN_KEY: string, token: string) => {
await saveToken(TOKEN_KEY, token);
return true;
});
@ -29,19 +29,8 @@ ipcMain.handle('login-request', async (event, credentials: { email: string, pass
});
ipcMain.handle('logout-request', async () => {
try {
(async () => {
console.log("Handle Logout listened")
console.log("Token", await getToken("ACCESS_TOKEN"))
const res = await api.get("/logout");
if(res && ("success" in res) && res.success) {
return {success: true, message: "Logout Successfully"}
}
return {success: false, message: ""}
} catch(error) {
return {success: false, message: ""}
}
});
ipcMain.handle('get-active-app', () => {
return getActiveApp();
await api.get("/logout");
})()
});

32
src/electron/main.ts
View File

@ -11,12 +11,6 @@ app.on('ready', async () => {
webPreferences: {
preload: getPreloadPath(),
},
resizable: false, // disables resizing (no maximize)
minimizable: false, // disables minimize button
maximizable: false, // disables maximize button
closable: true,
alwaysOnTop: true,
// disables default system frame (dont do this if you want a proper working menu bar)
frame: process.platform === 'darwin' ? false : true,
autoHideMenuBar: true
@ -36,19 +30,19 @@ app.on('ready', async () => {
return getStaticData();
});
// ipcMainOn('sendFrameAction', (payload) => {
// switch (payload) {
// case 'CLOSE':
// mainWindow.close();
// break;
// case 'MAXIMIZE':
// mainWindow.maximize();
// break;
// case 'MINIMIZE':
// mainWindow.minimize();
// break;
// }
// });
ipcMainOn('sendFrameAction', (payload) => {
switch (payload) {
case 'CLOSE':
mainWindow.close();
break;
case 'MAXIMIZE':
mainWindow.maximize();
break;
case 'MINIMIZE':
mainWindow.minimize();
break;
}
});
// createTray(mainWindow);
handleCloseEvents(mainWindow);

33
src/electron/preload.cts
View File

@ -1,33 +0,0 @@
import { contextBridge, ipcRenderer } from "electron";
console.log("setting PreLoad")
contextBridge.exposeInMainWorld('electron', {
login: (credentials: { email: string, password: string }) => ipcRenderer.invoke('login-request', credentials),
logout: () => ipcRenderer.invoke('logout-request'),
getToken: (TOKEN_KEY: "ACCESS_TOKEN" | "REFRESH_TOKEN") => ipcRenderer.invoke('get-token', TOKEN_KEY),
uploadScreenshot: () => ipcRenderer.invoke('upload-screenshot'),
getActiveAppDetails: () => ipcRenderer.invoke('get-active-app'),
} satisfies Window['electron']);
// function ipcInvoke<Key extends keyof EventPayloadMapping>(
// key: Key
// ): Promise<EventPayloadMapping[Key]> {
// return ipcRenderer.invoke(key);
// }
// function ipcOn<Key extends keyof EventPayloadMapping>(
// key: Key,
// callback: (payload: EventPayloadMapping[Key]) => void
// ) {
// const cb = (_: Electron.IpcRendererEvent, payload: any) => callback(payload);
// ipcRenderer.on(key, cb);
// return () => ipcRenderer.off(key, cb);
// }
// function ipcSend<Key extends keyof EventPayloadMapping>(
// key: Key,
// payload: EventPayloadMapping[Key]
// ) {
// ipcRenderer.send(key, payload);
// }

55
src/electron/preload.ts Normal file
View File

@ -0,0 +1,55 @@
import { contextBridge, ipcRenderer } from "electron";
const electron = require('electron');
console.log("setting PreLoad")
contextBridge.exposeInMainWorld('electron', {
subscribeStatistics: (callback) =>
ipcOn('statistics', (stats) => {
callback(stats);
}),
subscribeChangeView: (callback) =>
ipcOn('changeView', (view) => {
callback(view);
}),
getStaticData: () => ipcInvoke('getStaticData'),
sendFrameAction: (payload) => ipcSend('sendFrameAction', payload),
login: (credentials: { email: string, password: string }) => ipcRenderer.invoke('login-request', credentials),
logout: () => ipcRenderer.invoke('logout-request'),
getToken: (TOKEN_KEY: string) => ipcRenderer.invoke('get-token', TOKEN_KEY),
uploadScreenshot: () => ipcRenderer.invoke('upload-screenshot'),
} satisfies Window['electron']);
function ipcInvoke<Key extends keyof EventPayloadMapping>(
key: Key
): Promise<EventPayloadMapping[Key]> {
return electron.ipcRenderer.invoke(key);
}
function ipcOn<Key extends keyof EventPayloadMapping>(
key: Key,
callback: (payload: EventPayloadMapping[Key]) => void
) {
const cb = (_: Electron.IpcRendererEvent, payload: any) => callback(payload);
electron.ipcRenderer.on(key, cb);
return () => electron.ipcRenderer.off(key, cb);
}
function ipcSend<Key extends keyof EventPayloadMapping>(
key: Key,
payload: EventPayloadMapping[Key]
) {
electron.ipcRenderer.send(key, payload);
}
contextBridge.exposeInMainWorld('electronAPI', {
getToken: (key: string) => ipcRenderer.invoke('get-token', key),
saveToken: (key: string, token: string) => ipcRenderer.invoke('save-token', key, token),
clearToken: (key: string) => ipcRenderer.invoke('clear-token', key),
});

4
src/electron/utils/tokenHelper.ts
View File

@ -4,14 +4,14 @@ import Store from 'electron-store';
const store = new Store();
export async function getToken(TOKEN_KEY: "ACCESS_TOKEN" | "REFRESH_TOKEN"): Promise<string | null> {
export async function getToken(TOKEN_KEY: string): Promise<string | null> {
const encryptedBase64 = store.get(TOKEN_KEY) as string | undefined;
if (!encryptedBase64) return null;
const encryptedBuffer = Buffer.from(encryptedBase64, 'base64');
return safeStorage.decryptString(encryptedBuffer);
}
export async function saveToken(TOKEN_KEY: "ACCESS_TOKEN" | "REFRESH_TOKEN", token: string): Promise<void> {
export async function saveToken(TOKEN_KEY: string, token: string): Promise<void> {
const encryptedBuffer = safeStorage.encryptString(token);
store.set(TOKEN_KEY, encryptedBuffer.toString('base64'));
}

13
src/electron/utils/utilityFunctions.ts
View File

@ -4,7 +4,6 @@ import path from "path";
import axios from 'axios';
import sharp from 'sharp';
import { saveToken } from "./tokenHelper.js";
import { activeWindow } from "get-windows";
// Blur using an offscreen canvas
async function blurAndCompressBase64Image(base64: string): Promise<Buffer> {
@ -63,10 +62,7 @@ export const handleLogin = async (credentials: { email: string, password: string
console.log("API CAlled", response)
const { accessToken, refreshToken } = response.data;
await saveToken("ACCESS_TOKEN", accessToken);
await saveToken("REFRESH_TOKEN", refreshToken);
await saveToken(accessToken, refreshToken);
return { success: true, user: response.data.user };
} catch (error) {
@ -93,9 +89,4 @@ export const handleLogin = async (credentials: { email: string, password: string
return { success: false, error: "Unexpected error occurred" };
}
}
export const getActiveApp = async () => {
const result = await activeWindow();
return result;
};
}

24
src/ui/layout/DashboardLayout.tsx
View File

@ -101,28 +101,22 @@ const DashboardLayout: React.FC<DashboardLayoutProps> = ({ setUser }) => {
}, []);
const handleLogout = async () => {
localStorage.removeItem("user");
setUser(null);
console.log("calling Logout UI")
try {
const res = await window.electron.logout()
if (res && res.success) {
localStorage.removeItem("user");
setUser(null);
navigate("/login");
}
console.log(res)
} catch (error) {
console.log(error)
}
navigate("/login");
};
useEffect(() => {
setInterval(async () => {
const details = await window.electron.getActiveAppDetails()
console.log(details)
}, 15000)
}, [])
const toggleSidebar = () => setSidebarOpen(!isSidebarOpen);
const closeSidebarOnMobile = () => {

13
types.d.ts vendored
View File

@ -25,11 +25,18 @@ type UnsubscribeFunction = () => void;
interface Window {
electron: {
subscribeStatistics: (
callback: (statistics: Statistics) => void
) => UnsubscribeFunction;
getStaticData: () => Promise<StaticData>;
subscribeChangeView: (
callback: (view: View) => void
) => UnsubscribeFunction;
sendFrameAction: (payload: FrameWindowAction) => void;
login: (credentials: { email: string; password: string }) => Promise<any>;
logout: () => Promise<any>;
getToken: (tokenKey: "ACCESS_TOKEN" | "REFRESH_TOKEN") => Promise<string | null>;
logout: () => {};
getToken: (tokenKey: string) => Promise<string | null>;
uploadScreenshot: () => {};
getActiveAppDetails: () => {};
};
}