Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor index.html #33

Merged
merged 3 commits into from
Sep 19, 2024
Merged

Refactor index.html #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b4e5ae
Moved progress bar and refactored html code to use React
KenCorma Sep 16, 2024
d5d0c81
Prettier didn't like these
KenCorma Sep 16, 2024
9939ae0
Console logs → log.info
KenCorma Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 1 addition & 33 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,9 @@
<head>
<meta charset="UTF-8" />
<title>ComfyUI</title>
<style>
body {
font-family: Arial, sans-serif;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 100vh;
margin: 0;
background-color: #f0f0f0;
}
#loading-text {
margin-bottom: 20px;
text-align: center;
}
#progress-bar {
width: 300px;
height: 20px;
background-color: #e0e0e0;
border-radius: 10px;
overflow: hidden;
}
#progress {
width: 0%;
height: 100%;
background-color: #09f;
transition: width 0.5s ease;
}
</style>
</head>
<body>
<div id="loading-text">Initializing...</div>
<div id="progress-bar">
<div id="progress"></div>
</div>
<div id="root"></div>
<script type="module" src="/src/renderer.ts"></script>
</body>
</html>
2 changes: 0 additions & 2 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
margin: auto;
max-width: 38rem;
padding: 2rem;
}
3 changes: 2 additions & 1 deletion src/preload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

import { contextBridge, ipcRenderer } from 'electron';
import { IPC_CHANNELS, ELECTRON_BRIDGE_API } from './constants';
import log from 'electron-log/main';

const electronAPI = {
onProgressUpdate: (callback: (update: { percentage: number; status: string }) => void) => {
ipcRenderer.on(IPC_CHANNELS.LOADING_PROGRESS, (_event, value) => {
console.log(`Received ${IPC_CHANNELS.LOADING_PROGRESS} event`, value);
log.info(`Received ${IPC_CHANNELS.LOADING_PROGRESS} event`, value);
callback(value);
});
},
Expand Down
35 changes: 4 additions & 31 deletions src/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,35 +27,8 @@
*/

import './index.css';
import { ELECTRON_BRIDGE_API } from './constants';
import log from 'electron-log/renderer';
import ReactDOM from 'react-dom/client';
import Home from './renderer/index';

log.info('👋 This message is being logged by "renderer.ts", included via Vite');

interface ProgressUpdate {
percentage: number;
status: string;
}

const progressBar = document.getElementById('progress') as HTMLElement;
const loadingText = document.getElementById('loading-text') as HTMLElement;

function updateProgress({ percentage, status }: ProgressUpdate) {
log.info(`Updating progress: ${percentage}%, ${status}`);
progressBar.style.width = `${percentage}%`;
loadingText.textContent = status;

if (percentage === 100) {
loadingText.textContent = 'ComfyUI is ready!';
}
}

if (ELECTRON_BRIDGE_API in window) {
log.info(`${ELECTRON_BRIDGE_API} found, setting up listeners`);
(window as any).electronAPI.onProgressUpdate((update: ProgressUpdate) => {
log.info('Received loading progress', update);
updateProgress(update);
});
} else {
console.error(`${ELECTRON_BRIDGE_API} not found in window object`);
}
// Generate the the app then render the root
ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(Home());
27 changes: 27 additions & 0 deletions src/renderer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';
import ProgressOverlay from './screens/ProgressOverlay';
import log from 'electron-log/renderer';

const bodyStyle: React.CSSProperties = {
fontFamily: 'Arial, sans-serif',
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
height: '100vh',
margin: '0',
backgroundColor: '#f0f0f0',
};

// Main entry point for the front end renderer.
// Currently this serves as the overlay to show progress as the comfy backend is coming online.
// after coming online the main.ts will replace the renderer with comfy's internal index.html
function Home(): React.ReactElement {
return (
<div style={bodyStyle}>
<ProgressOverlay />
</div>
);
}

export default Home;
68 changes: 68 additions & 0 deletions src/renderer/screens/ProgressOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import React, { useEffect } from 'react';
import { ELECTRON_BRIDGE_API } from 'src/constants';
import log from 'electron-log/renderer';

const loadingTextStyle: React.CSSProperties = {
marginBottom: '20px',
textAlign: 'center',
};

const progressBarStyle: React.CSSProperties = {
width: '300px',
height: '20px',
backgroundColor: '#e0e0e0',
borderRadius: '10px',
overflow: 'hidden',
};

const progressStyle: React.CSSProperties = {
width: '0%',
height: '100%',
backgroundColor: '#09f',
transition: 'width 0.5s ease',
};

interface ProgressUpdate {
percentage: number;
status: string;
}

//Overlay that shows the progress bar
function ProgressOverlay(): React.ReactElement {
function updateProgress({ percentage, status }: ProgressUpdate) {
const progressBar = document.getElementById('progress') as HTMLElement;
const loadingText = document.getElementById('loading-text') as HTMLElement;
log.info(`Updating progress: ${percentage}%, ${status}`);
progressBar.style.width = `${percentage}%`;
loadingText.textContent = status;

if (percentage === 100) {
loadingText.textContent = 'ComfyUI is ready!';
}
}

// Updates when internal items change
useEffect(() => {
if (ELECTRON_BRIDGE_API in window) {
log.info(`${ELECTRON_BRIDGE_API} found, setting up listeners`);
(window as any).electronAPI.onProgressUpdate((update: ProgressUpdate) => {
log.info('Received loading progress', update);
updateProgress(update);
});
} else {
log.error(`${ELECTRON_BRIDGE_API} not found in window object`);
}
});
return (
<>
<div style={loadingTextStyle} id="loading-text">
Initializing...
</div>
<div style={progressBarStyle} id="progress-bar">
<div style={progressStyle} id="progress"></div>
</div>
</>
);
}

export default ProgressOverlay;
2 changes: 2 additions & 0 deletions vite.renderer.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { ConfigEnv, UserConfig } from 'vite';
import { defineConfig } from 'vite';
import { pluginExposeRenderer } from './vite.base.config';
import { resolve } from 'node:path';

// https://vitejs.dev/config
export default defineConfig((env) => {
Expand All @@ -17,6 +18,7 @@ export default defineConfig((env) => {
},
plugins: [pluginExposeRenderer(name)],
resolve: {
alias: [{ find: 'src', replacement: resolve(__dirname, './src/') }],
preserveSymlinks: true,
},
clearScreen: false,
Expand Down
Loading