Merge pull request #22 from GenerateNU/hope-branch

Electron build + Router Updates

backend/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 project(Tubender)
 
 set(CMAKE_CXX_STANDARD 14)

frontend/electron.js

@@ -1,6 +1,9 @@
 const { app, BrowserWindow } = require('electron');
 const path = require('path');
-const isDev = require('electron-is-dev');
+const express = require('express');
+
+// Implement NSApplicationDelegate.applicationSupportsSecureRestorableState
+app.applicationSupportsSecureRestorableState = () => true;
 
 let mainWindow;
 
@@ -9,22 +12,34 @@ function createWindow() {
     width: 800,
     height: 600,
     webPreferences: {
-      nodeIntegration: false, // nodeIntegration is set to false
-      contextIsolation: true, // enable context isolation
-      preload: path.join(__dirname, 'preload.js'), // specify preload script
+      nodeIntegration: false, 
+      contextIsolation: true, 
     },
   });
 
-  const startURL = isDev
-    ? 'http://localhost:3000'
-    : `file://${path.join(__dirname, '../build/index.html')}`;
-
-  mainWindow.loadURL(startURL);
+  // Load the production build of the React application
+  mainWindow.loadFile(path.join(__dirname, 'build', 'index.html'));
 
   mainWindow.on('closed', () => (mainWindow = null));
 }
 
-app.on('ready', createWindow);
+app.on('ready', () => {
+  createWindow();
+
+  // Create an express server to serve static files
+  const expressApp = express();
+  const staticPath = path.join(__dirname, 'build', 'static');
+  expressApp.use(express.static(staticPath));
+
+  // Error handling
+  expressApp.on('error', (err) => {
+    console.error('Express server error:', err);
+  });
+
+  expressApp.listen(3000, () => {
+    console.log('Static server running on port 3000');
+  });
+});
 
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
@@ -36,4 +51,4 @@ app.on('activate', () => {
   if (mainWindow === null) {
     createWindow();
   }
-});
+});

frontend/package.json

@@ -51,7 +51,7 @@
     "@types/electron": "^1.6.10",
     "@types/react": "^18.2.53",
     "@types/react-dom": "^18.2.18",
-    "electron": "^28.1.1",
+    "electron": "^28.2.3",
     "electron-builder": "^24.9.1",
     "electron-is-dev": "^2.0.0",
     "tailwindcss": "^3.4.1",

frontend/src/App.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
+import { Route } from "react-router-dom";
 import HomePage from './pages/HomePage';
+import RoutingComponent from './components/RoutingComponent';
 import AboutPage from './pages/AboutPage';
 import MainPage from './pages/MainPage';
 import PersuasivePage from './pages/PersuasivePage';
@@ -9,17 +10,14 @@ import ReviewsPage from './pages/ReviewsPage';
 
 function App() {
   return (
-    <Router>
-        <Routes>
+  <RoutingComponent>
           <Route path="/" element={<HomePage />} />
           <Route path="/main" element={<MainPage />} />
           <Route path="/about" element={<AboutPage />} />
           <Route path="/persuasive" element={<PersuasivePage />} />
           <Route path="/contact" element={<ContactPage />} />
           <Route path="/reviews" element={<ReviewsPage />} />
-        </Routes>
-    </Router>
-
+   </RoutingComponent>
   );
 }
 

frontend/src/components/RoutingComponent.tsx

@@ -0,0 +1,30 @@
+import React, { ReactNode } from 'react';
+import { BrowserRouter as BrowserRouterImpl, HashRouter as HashRouterImpl, Routes } from 'react-router-dom';
+
+interface RoutingComponentProps {
+  children: ReactNode;
+}
+
+const RoutingComponent: React.FC<RoutingComponentProps> = ({ children }) => {
+  if (isElectron()) {
+    return (
+      <HashRouterImpl>
+        <Routes>{children}</Routes>
+      </HashRouterImpl>
+    );
+  } else {
+    return (
+      <BrowserRouterImpl>
+        <Routes>{children}</Routes>
+      </BrowserRouterImpl>
+    );
+  }
+}
+
+function isElectron() {
+  // Check if running in Electron environment
+  const isElectron = navigator.userAgent.toLowerCase().indexOf(' electron/') > -1;
+  return isElectron;
+}
+
+export default RoutingComponent;