FromChat/web
1
0
Fork 0
mirror of https://github.com/fromchat-messenger/web.git synced 2026-09-22 19:15:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve Electron experience and build system

Browse Source
This commit is contained in:
denis0001-dev
2025-09-19 22:10:31 +03:00
Unverified
parent 89492b2f8c
commit a580b87e1c
17 changed files with 197 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/electron/forge/package.json
-33
View File
@@ -1,33 +0,0 @@
{
"name": "FromChat",
"productName": "FromChat",
"version": "1.0.0",
"description": "A 100% Open Source Messenger",
"main": "dist-electron/main.js",
"scripts": {
"package": "electron-forge package",
"make": "electron-forge make",
"publish": "electron-forge publish"
},
"keywords": [],
"author": {
"name": "denis0001-dev",
"email": "denis0001.dev@ya.ru"
},
"license": "GPL-2.0",
"devDependencies": {
"@electron-forge/cli": "^7.8.3",
"@electron-forge/maker-deb": "^7.8.3",
"@electron-forge/maker-rpm": "^7.8.3",
"@electron-forge/maker-squirrel": "^7.8.3",
"@electron-forge/maker-zip": "^7.8.3",
"@electron-forge/plugin-auto-unpack-natives": "^7.8.3",
"@electron-forge/plugin-fuses": "^7.8.3",
"@electron/fuses": "^1.8.0",
"electron": "37.3.1",
"vite": "^5.4.19"
},
"dependencies": {
"electron-squirrel-startup": "^1.0.1"
}
}
frontend/electron/main.ts
+4 -4
View File
@@ -4,7 +4,7 @@ import path from "node:path";
app.whenReady().then(() => {
const win = new BrowserWindow({
title: 'Main window',
minWidth: 650,
minWidth: 800,
minHeight: 420,
webPreferences: {
preload: path.join(import.meta.dirname, "preload.mjs")
@@ -16,11 +16,11 @@ app.whenReady().then(() => {
y: 16 - 4
},
titleBarOverlay: process.platform !== "darwin"
})
});
if (process.env.VITE_DEV_SERVER_URL) {
win.loadURL(process.env.VITE_DEV_SERVER_URL)
win.loadURL(process.env.VITE_DEV_SERVER_URL);
} else {
win.loadFile('dist/index.html');
win.loadFile('frontend/build/electron/dist/index.html');
}
});
frontend/electron/forge/forge.config.ts → frontend/forge.config.ts
+8 -11
View File
@@ -1,29 +1,28 @@
import { FusesPlugin } from '@electron-forge/plugin-fuses';
import { FuseV1Options, FuseVersion } from '@electron/fuses';
import type { ForgeConfig } from "@electron-forge/shared-types";
import type { ForgeConfig } from '@electron-forge/shared-types';
const config: ForgeConfig = {
export default {
packagerConfig: {
asar: true
asar: true,
},
outDir: "frontend/build/electron/forge",
rebuildConfig: {},
makers: [
{
name: '@electron-forge/maker-squirrel',
config: {},
},
{
name: '@electron-forge/maker-zip',
config: {},
platforms: ['darwin'],
platforms: ['win32', 'darwin'],
},
{
name: '@electron-forge/maker-deb',
config: {},
platforms: ['linux'],
},
{
name: '@electron-forge/maker-rpm',
config: {},
platforms: ['linux'],
},
],
plugins: [
@@ -43,6 +42,4 @@ const config: ForgeConfig = {
[FuseV1Options.OnlyLoadAppFromAsar]: true,
}),
],
};
export default config;
} satisfies ForgeConfig;
frontend/src/electron/electron.ts
+2 -4
View File
@@ -5,13 +5,11 @@
* @version 1.0.0
*/
import { PRODUCT_NAME } from "../core/config.ts";
import { id } from "../utils/utils.ts";
export const isElectron = import.meta.env.VITE_ELECTRON && window.electronInterface != undefined;
if (window.electronInterface !== undefined) {
if (isElectron) {
console.log("Running in Electron");
document.documentElement.classList.add("electron", `platform-${window.electronInterface.platform}`);
id("window-title").textContent = PRODUCT_NAME;
} else {
console.log("Running in normal browser");
}
frontend/src/main.tsx
+1
View File
@@ -10,6 +10,7 @@ import "mdui/mdui.css";
import "./utils/material";
import "./core/init";
import "./electron/electron";
import { createRoot } from 'react-dom/client';
import App from './ui/App';
import { StrictMode } from 'react';
frontend/src/resources/css/_electron.scss
+8 -10
View File
@@ -9,13 +9,14 @@ html.electron {
display: flex;
flex-direction: row;
gap: 8px;
height: 40px;
min-height: 40px;
background-color: $color-dark-surface-container;
width: 100%;
-webkit-app-region: drag;
user-select: none;
z-index: 10;
transition: background-color 0.5s ease;
flex-shrink: 0;
&.color-surface {
background-color: $color-dark-surface;
@@ -29,15 +30,12 @@ html.electron {
font-weight: 500;
}
&.platform-darwin .macos-padding {
width: 70px;
#main-wrapper {
flex: 1;
min-height: 0;
}
// .window-controls {
// -webkit-app-region: no-drag;
// .hidden {
// display: none;
// }
// }
&.platform-darwin .macos-padding {
width: 80px;
}
}
frontend/src/resources/css/style.scss
+9 -6
View File
@@ -24,17 +24,20 @@ body {
background-color: $color-dark-surface;
color: $color-dark-on-surface;
line-height: 1.6;
#main-wrapper {
flex: 1;
position: relative;
min-height: 0;
}
}
body, #root {
height: 100vh;
position: relative;
margin: 0;
display: flex;
flex-direction: column;
#main-wrapper {
flex: 1;
position: relative;
height: 100vh;
}
}
mdui-dialog {
frontend/src/ui/App.tsx
+2 -1
View File
@@ -1,4 +1,5 @@
import { MINIMUM_WIDTH } from "../core/config";
import { isElectron } from "../electron/electron";
import { ElectronTitleBar } from "./components/Electron";
import useWindowSize from "./hooks/useWindowSize";
import ChatScreen from "./screen/ChatScreen";
@@ -17,7 +18,7 @@ export default function App() {
restoreUserFromStorage();
}, [restoreUserFromStorage]);
if (width < MINIMUM_WIDTH) {
if (!isElectron && width < MINIMUM_WIDTH) {
return <DownloadAppScreen />
}
frontend/src/ui/components/Electron.tsx
+7 -14
View File
@@ -1,18 +1,11 @@
import { PRODUCT_NAME } from "../../core/config";
import { isElectron } from "../../electron/electron";
export function ElectronTitleBar() {
if (window.electronInterface !== undefined) {
return (
<div id="electron-title-bar">
{window.electronInterface.platform == "darwin" ? <div className="macos-padding"></div> : undefined}
<div id="window-title">{PRODUCT_NAME}</div>
{/* <div className="window-controls">
<mdui-button-icon icon="remove" id="window-minimize"></mdui-button-icon>
<mdui-button-icon icon="stack--outlined" id="window-restore" className="hidden"></mdui-button-icon>
<mdui-button-icon icon="ad--outlined" id="window-maximize"></mdui-button-icon>
<mdui-button-icon icon="close" id="window-close"></mdui-button-icon>
</div> */}
</div>
)
}
return isElectron && (
<div id="electron-title-bar">
{window.electronInterface.platform == "darwin" && <div className="macos-padding"></div>}
<div id="window-title">{PRODUCT_NAME}</div>
</div>
)
}
frontend/src/ui/components/chat/MessagePanelRenderer.tsx
+6 -6
View File
@@ -153,20 +153,20 @@ export function MessagePanelRenderer({ panel, isChatSwitching }: MessagePanelRen
<ChatMessages
messages={panelState.messages}
isDm={panel.isDm()}
onReplySelect={(m) => {
onReplySelect={(message) => {
if (editMessage || editVisible) {
setPendingAction({ type: "reply", message: m });
setPendingAction({ type: "reply", message: message });
setEditVisible(false); // onCloseEdit will apply pending
} else {
setReplyTo(m);
setReplyTo(message);
}
}}
onEditSelect={(m) => {
onEditSelect={(message) => {
if (replyTo || replyToVisible) {
setPendingAction({ type: "edit", message: m });
setPendingAction({ type: "edit", message: message });
setReplyToVisible(false); // onCloseReply will apply pending
} else {
setEditMessage(m);
setEditMessage(message);
}
}}
>
frontend/src/ui/state.ts
+2 -1
View File
@@ -6,6 +6,7 @@ import { PublicChatPanel } from "./panels/PublicChatPanel";
import { DMPanel, type DMPanelData } from "./panels/DMPanel";
import { getAuthHeaders } from "../auth/api";
import { restoreKeys } from "../auth/crypto";
import { API_BASE_URL } from "../core/config";
type Page = "login" | "register" | "chat"
export type ChatTabs = "chats" | "channels" | "contacts" | "dms"
@@ -199,7 +200,7 @@ export const useAppState = create<AppState>((set, get) => ({
const token = localStorage.getItem('authToken');
if (token) {
const response = await fetch("/api/user/profile", {
const response = await fetch(`${API_BASE_URL}/user/profile`, {
headers: getAuthHeaders(token)
});
frontend/vite.config.ts
+13 -2
View File
@@ -25,9 +25,19 @@ if (process.env.VITE_ELECTRON) {
electron({
main: {
entry: "electron/main.ts",
vite: {
build: {
outDir: "build/electron/core"
}
}
},
preload: {
input: "frontend/electron/preload.ts"
input: "frontend/electron/preload.ts",
vite: {
build: {
outDir: "build/electron/core"
}
}
},
renderer: {},
})
@@ -68,6 +78,7 @@ export default defineConfig({
}
},
cssMinify: true,
assetsInlineLimit: 0
assetsInlineLimit: 0,
outDir: process.env.VITE_ELECTRON ? "build/electron/dist" : "build/normal/dist"
}
});