Merge pull request #18 from ente-io/revert-14-add-web-app

Revert "added web app as submodule"

.gitignore

@@ -1,6 +1,5 @@
 node_modules
 app
-.next/
 dist
 .vscode
 buildingSteps.md

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "src/renderer"]
-	path = src/renderer
-	url = https://github.com/ente-io/bada-frame
-	branch = release

package.json

@@ -4,7 +4,7 @@
   "version": "1.3.3",
   "private": true,
   "description": "Desktop client for ente.io",
-  "main": "app/main/index.js",
+  "main": "app/main.js",
   "build": {
     "appId": "io.ente.bhari-frame",
     "artifactName": "${productName}-${version}.${ext}",
@@ -35,13 +35,11 @@
   },
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
-    "build-main": "tsc",
+    "build": "tsc",
     "watch": "tsc -w",
     "lint": "eslint -c .eslintrc --ext .ts ./src",
-    "pre-build": "concurrently \"yarn && yarn run build-main\" \"cd src/renderer && yarn\"",
-    "start": "yarn run pre-build && concurrently \"yarn run watch\" \"electron ./app/main/index.js\" \"cd src/renderer && yarn dev\"",
-    "build-renderer": "cd src/renderer && yarn && yarn build && cd ../../",
-    "test-release": "yarn && yarn build-renderer && yarn run build-main && electron-builder",
+    "start": "yarn build && electron ./app/main.js",
+    "test-release": "yarn build && electron-builder",
     "release": "electron-builder -mwl --publish always"
   },
   "author": "ente <code@ente.io>",
@@ -49,7 +47,6 @@
     "@sentry/cli": "^1.68.0",
     "@typescript-eslint/eslint-plugin": "^4.20.0",
     "@typescript-eslint/parser": "^4.20.0",
-    "concurrently": "^7.0.0",
     "electron": "^15.3.0",
     "electron-builder": "^22.10.5",
     "electron-builder-notarize": "^1.2.0",
@@ -64,9 +61,7 @@
     "@types/promise-fs": "^2.1.1",
     "electron-is-dev": "^2.0.0",
     "electron-log": "^4.3.5",
-    "electron-reload": "^2.0.0-alpha.1",
     "electron-updater": "^4.3.8",
-    "next-electron-server": "^0.0.8",
     "promise-fs": "^2.1.1"
   }
-}
+}

src/config.ts

@@ -1,4 +0,0 @@
-const PROD_HOST_URL: string = 'next://app';
-const RENDERER_OUTPUT_DIR: string = './src/renderer/out';
-
-export { PROD_HOST_URL, RENDERER_OUTPUT_DIR };

src/main.ts

@@ -6,12 +6,6 @@ import { createWindow } from './utils/createWindow';
 import setupIpcComs from './utils/ipcComms';
 import { buildContextMenu, buildMenuBar } from './utils/menuUtil';
 import initSentry from './utils/sentry';
-import electronReload from 'electron-reload';
-import { PROD_HOST_URL, RENDERER_OUTPUT_DIR } from '../config';
-
-if (isDev) {
-    electronReload(__dirname, {});
-}
 
 let tray: Tray;
 let mainWindow: BrowserWindow;
@@ -23,7 +17,6 @@ let updateIsAvailable = false;
 export const isAppQuitting = (): boolean => {
     return appIsQuitting;
 };
-
 export const setIsAppQuitting = (value: boolean): void => {
     appIsQuitting = value;
 };
@@ -35,11 +28,6 @@ export const setIsUpdateAvailable = (value: boolean): void => {
     updateIsAvailable = value;
 };
 
-const serveNextAt = require('next-electron-server');
-serveNextAt(PROD_HOST_URL, {
-    outputDir: RENDERER_OUTPUT_DIR,
-});
-
 // Disable error dialogs by overriding
 dialog.showErrorBox = function (title, content) {
     console.log(`${title}\n${content}`);
@@ -49,7 +37,6 @@ const gotTheLock = app.requestSingleInstanceLock();
 if (!gotTheLock) {
     app.quit();
 } else {
-    app.commandLine.appendSwitch('enable-features', 'SharedArrayBuffer');
     app.on('second-instance', () => {
         // Someone tried to run a second instance, we should focus our window.
         if (mainWindow) {

src/main/utils/cors.ts

@@ -1,23 +0,0 @@
-import { BrowserWindow } from 'electron';
-
-function lowerCaseHeaders(responseHeaders: Record<string, string[]>) {
-    const headers: Record<string, string[]> = {};
-    for (const key in responseHeaders) {
-        headers[key.toLowerCase()] = responseHeaders[key];
-    }
-    return headers;
-}
-
-export function addAllowOriginHeader(
-    mainWindow: BrowserWindow
-) {
-    mainWindow.webContents.session.webRequest.onHeadersReceived(
-        (details, callback) => {
-            details.responseHeaders = lowerCaseHeaders(details.responseHeaders);
-            details.responseHeaders['access-control-allow-origin'] = ['*'];
-            callback({
-                responseHeaders: details.responseHeaders,
-            });
-        }
-    );
-}

src/renderer

@@ -1 +0,0 @@
-Subproject commit d0bdb2e24bda9c480d69c5c19d1c234c23475be3

src/utils/appUpdater.ts

@@ -1,7 +1,7 @@
 import { BrowserWindow, dialog, Tray } from 'electron';
 import { autoUpdater } from 'electron-updater';
 import log from 'electron-log';
-import { setIsAppQuitting, setIsUpdateAvailable } from '..';
+import { setIsAppQuitting, setIsUpdateAvailable } from '../main';
 import { buildContextMenu } from './menuUtil';
 
 class AppUpdater {

src/utils/createWindow.ts

@@ -1,9 +1,7 @@
 import { app, BrowserWindow, nativeImage } from 'electron';
 import * as isDev from 'electron-is-dev';
 import * as path from 'path';
-import { isAppQuitting } from '..';
-import { addAllowOriginHeader } from './cors';
-import { PROD_HOST_URL } from '../../config';
+import { isAppQuitting } from '../main';
 
 export function createWindow(): BrowserWindow {
     const appImgPath = isDev
@@ -31,18 +29,16 @@ export function createWindow(): BrowserWindow {
     });
     splash.maximize();
 
-    addAllowOriginHeader(mainWindow);
-
     if (isDev) {
         splash.loadFile(`../build/splash.html`);
-        mainWindow.loadURL(PROD_HOST_URL);
+        mainWindow.loadURL('http://localhost:3000');
         // Open the DevTools.
         mainWindow.webContents.openDevTools();
     } else {
         splash.loadURL(
             `file://${path.join(process.resourcesPath, 'splash.html')}`
         );
-        mainWindow.loadURL(PROD_HOST_URL);
+        mainWindow.loadURL('http://web.ente.io');
     }
     mainWindow.webContents.on('did-fail-load', () => {
         splash.close();

src/utils/menuUtil.ts

@@ -5,7 +5,7 @@ import {
     BrowserWindow,
     MenuItemConstructorOptions,
 } from 'electron';
-import { isUpdateAvailable, setIsAppQuitting } from '..';
+import { isUpdateAvailable, setIsAppQuitting } from '../main';
 import { showUpdateDialog } from './appUpdater';
 
 const isMac = process.platform === 'darwin';

src/utils/sentry.ts

@@ -5,7 +5,7 @@ import * as isDev from 'electron-is-dev';
 const SENTRY_DSN = 'https://e9268b784d1042a7a116f53c58ad2165@sentry.ente.io/5';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const version = require('../../../package.json').version;
+const version = require('../../package.json').version;
 
 function initSentry(): void {
     Sentry.init({

tsconfig.json

@@ -1,7 +1,6 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "esModuleInterop": true,
         "noImplicitAny": true,
         "sourceMap": true,
         "outDir": "app",
@@ -10,5 +9,5 @@
             "*": ["node_modules/*"]
         }
     },
-    "include": ["src/main/**/*", "src/config.ts"]
+    "include": ["src/**/*"]
 }