feat: next design iteration (#30)

* more changes and general strucutre Signed-off-by: Kevin Beier <[email protected]> * partially rewrote the desktopCapture feature Signed-off-by: Kevin Beier <[email protected]> * adjusted prettierrc Signed-off-by: Kevin Beier <[email protected]> * updating formating and formating Signed-off-by: Kevin Beier <[email protected]> * class infrastructure & uml * regen uml & add npm script * added Vigad logo Signed-off-by: Kevin Beier <[email protected]> * rewrote a lot of the streamhandler implementation Signed-off-by: Kevin Beier <[email protected]> * documenting StreamHandler and finished preview Signed-off-by: Kevin Beier <[email protected]> * resolved pr issues Signed-off-by: Kevin Beier <[email protected]> Signed-off-by: Kevin Beier <[email protected]> Co-authored-by: Kevin Beier <[email protected]>
VisualGameData · Nov 30, 2022 · 173bc99 · 173bc99
1 parent 8ed214b
commit 173bc99
Show file tree

Hide file tree

Showing 45 changed files with 1,344 additions and 1,399 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,23 +1,23 @@
 module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-  },
-  extends: [
-    'eslint:recommended',
-    'plugin:vue/essential',
-    'plugin:@typescript-eslint/recommended',
-    'prettier/@typescript-eslint',
-  ],
-  parserOptions: {
-    ecmaVersion: 'latest',
-    parser: '@typescript-eslint/parser',
-    sourceType: 'module',
-  },
-  plugins: ['vue', '@typescript-eslint'],
-  rules: {
-    // override/add rules settings here, such as:
-    'vue/no-unused-vars': 'error',
-    'vue/script-setup-uses-vars': 'off',
-  },
-}
+    env: {
+        browser: true,
+        es2021: true,
+    },
+    extends: [
+        'eslint:recommended',
+        'plugin:vue/essential',
+        'plugin:@typescript-eslint/recommended',
+        'prettier/@typescript-eslint',
+    ],
+    parserOptions: {
+        ecmaVersion: 'latest',
+        parser: '@typescript-eslint/parser',
+        sourceType: 'module',
+    },
+    plugins: ['vue', '@typescript-eslint'],
+    rules: {
+        // override/add rules settings here, such as:
+        'vue/no-unused-vars': 'error',
+        'vue/script-setup-uses-vars': 'off',
+    },
+};
diff --git a/.prettierrc b/.prettierrc
@@ -1,11 +1,11 @@
 {
-  "semi": false,
-  "tabWidth": 2,
-  "useTabs": false,
-  "printWidth": 80,
-  "endOfLine": "auto",
-  "singleQuote": true,
-  "trailingComma": "es5",
-  "bracketSpacing": true,
-  "arrowParens": "always"
+    "semi": true,
+    "tabWidth": 4,
+    "useTabs": false,
+    "printWidth": 80,
+    "endOfLine": "auto",
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "arrowParens": "always"
 }
diff --git a/docs/proc-uml.svg b/docs/proc-uml.svg
diff --git a/electron-builder.json5 b/electron-builder.json5
@@ -2,36 +2,29 @@
  * @see https://www.electron.build/configuration/configuration
  */
 {
-  "appId": "YourAppID",
-  "asar": true,
-  "directories": {
-    "output": "release/${version}"
-  },
-  "files": [
-    "dist-electron",
-    "dist"
-  ],
-  "mac": {
-    "artifactName": "${productName}_${version}.${ext}",
-    "target": [
-      "dmg"
-    ]
-  },
-  "win": {
-    "target": [
-      {
-        "target": "nsis",
-        "arch": [
-          "x64"
-        ]
-      }
-    ],
-    "artifactName": "${productName}_${version}.${ext}"
-  },
-  "nsis": {
-    "oneClick": false,
-    "perMachine": false,
-    "allowToChangeInstallationDirectory": true,
-    "deleteAppDataOnUninstall": false
-  }
+    appId: 'Vigad4256',
+    asar: true,
+    directories: {
+        output: 'release/${version}',
+    },
+    files: ['dist-electron', 'dist'],
+    mac: {
+        artifactName: '${productName}_${version}.${ext}',
+        target: ['dmg'],
+    },
+    win: {
+        target: [
+            {
+                target: 'nsis',
+                arch: ['x64'],
+            },
+        ],
+        artifactName: '${productName}_${version}.${ext}',
+    },
+    nsis: {
+        oneClick: false,
+        perMachine: false,
+        allowToChangeInstallationDirectory: true,
+        deleteAppDataOnUninstall: false,
+    },
 }
diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -8,151 +8,154 @@
 // ├─┬ dist
 // │ └── index.html    > Electron-Renderer
 //
-process.env.DIST_ELECTRON = join(__dirname, '..')
-process.env.DIST = join(process.env.DIST_ELECTRON, '../dist')
+process.env.DIST_ELECTRON = join(__dirname, '..');
+process.env.DIST = join(process.env.DIST_ELECTRON, '../dist');
 process.env.PUBLIC = app.isPackaged
-  ? process.env.DIST
-  : join(process.env.DIST_ELECTRON, '../public')
+    ? process.env.DIST
+    : join(process.env.DIST_ELECTRON, '../public');
 
-import { app, BrowserWindow, shell, ipcMain } from 'electron'
-import { release } from 'os'
-import { join } from 'path'
+import { app, BrowserWindow, shell, ipcMain } from 'electron';
+import { release } from 'os';
+import { join } from 'path';
 
 // Disable GPU Acceleration for Windows 7
-if (release().startsWith('6.1')) app.disableHardwareAcceleration()
+if (release().startsWith('6.1')) app.disableHardwareAcceleration();
 
 // Set application name for Windows 10+ notifications
-if (process.platform === 'win32') app.setAppUserModelId(app.getName())
+if (process.platform === 'win32') app.setAppUserModelId(app.getName());
 
 if (!app.requestSingleInstanceLock()) {
-  app.quit()
-  process.exit(0)
+    app.quit();
+    process.exit(0);
 }
 
 // Remove electron security warnings
 // This warning only shows in development mode
 // Read more on https://www.electronjs.org/docs/latest/tutorial/security
 // process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'
 
-let win: BrowserWindow | null = null
+let win: BrowserWindow | null = null;
 // Here, you can also use other preload
-const preload = join(__dirname, '../preload/index.js')
-const url = process.env.VITE_DEV_SERVER_URL
-const indexHtml = join(process.env.DIST, 'index.html')
+const preload = join(__dirname, '../preload/index.js');
+const url = process.env.VITE_DEV_SERVER_URL;
+const indexHtml = join(process.env.DIST, 'index.html');
 
 async function createWindow() {
-  win = new BrowserWindow({
-    title: 'Main window',
-    minWidth: 800,
-    minHeight: 500,
-    frame: true, // still buggy cant select items from the custom titlebar
-    autoHideMenuBar: true,
-    icon: join(process.env.PUBLIC, 'favicon.ico'),
-    webPreferences: {
-      preload,
-      // Warning: Enable nodeIntegration and disable contextIsolation is not secure in production
-      // Consider using contextBridge.exposeInMainWorld
-      // Read more on https://www.electronjs.org/docs/latest/tutorial/context-isolation
-      nodeIntegration: true,
-      contextIsolation: true, // protect against prototype pollution
-    },
-  })
-
-  const remoteMain = require('@electron/remote/main')
-  remoteMain.initialize()
-
-  if (app.isPackaged) {
-    win.loadFile(indexHtml)
-  } else {
-    win.loadURL(url)
-    // Open devTool if the app is not packaged
-    win.webContents.openDevTools()
-  }
-
-  // Test actively push message to the Electron-Renderer
-  win.webContents.on('did-finish-load', () => {
-    win?.webContents.send('main-process-message', new Date().toLocaleString())
-    win.setTitle(`Vigad v${1.0}`)
-  })
-
-  // Make all links open with the browser, not with the application
-  win.webContents.setWindowOpenHandler(({ url }) => {
-    if (url.startsWith('https:')) shell.openExternal(url)
-    return { action: 'deny' }
-  })
-
-  remoteMain.enable(win.webContents)
-
-  // Get all screens/windows from the main process to the renderer process
-  ipcMain.handle('get-screens', getScreen)
-  ipcMain.handle('minimize-screen', () => {
-    win.minimize()
-  })
-  ipcMain.handle('full-screen', () => {
-    win.isMaximized() ? win.restore() : win.maximize()
-  })
-  ipcMain.handle('close-application', () => {
-    win.close()
-  })
+    win = new BrowserWindow({
+        title: 'Main window',
+        minWidth: 950,
+        minHeight: 750,
+        frame: true, // still buggy cant select items from the custom titlebar
+        autoHideMenuBar: true,
+        icon: join(process.env.PUBLIC, '../src/assets/logo.png'),
+        webPreferences: {
+            preload,
+            // Warning: Enable nodeIntegration and disable contextIsolation is not secure in production
+            // Consider using contextBridge.exposeInMainWorld
+            // Read more on https://www.electronjs.org/docs/latest/tutorial/context-isolation
+            nodeIntegration: true,
+            contextIsolation: true, // protect against prototype pollution
+        },
+    });
+
+    const remoteMain = require('@electron/remote/main');
+    remoteMain.initialize();
+
+    if (app.isPackaged) {
+        win.loadFile(indexHtml);
+    } else {
+        win.loadURL(url);
+        // Open devTool if the app is not packaged
+        win.webContents.openDevTools();
+    }
+
+    // Test actively push message to the Electron-Renderer
+    win.webContents.on('did-finish-load', () => {
+        win?.webContents.send(
+            'main-process-message',
+            new Date().toLocaleString()
+        );
+        win.setTitle(`Vigad`);
+    });
+
+    // Make all links open with the browser, not with the application
+    win.webContents.setWindowOpenHandler(({ url }) => {
+        if (url.startsWith('https:')) shell.openExternal(url);
+        return { action: 'deny' };
+    });
+
+    remoteMain.enable(win.webContents);
+
+    // Get all screens/windows from the main process to the renderer process
+    ipcMain.handle('get-screens', getScreen);
+    ipcMain.handle('minimize-screen', () => {
+        win.minimize();
+    });
+    ipcMain.handle('full-screen', () => {
+        win.isMaximized() ? win.restore() : win.maximize();
+    });
+    ipcMain.handle('close-application', () => {
+        win.close();
+    });
 }
 
-app.whenReady().then(createWindow)
+app.whenReady().then(createWindow);
 
 app.on('window-all-closed', () => {
-  win = null
-  if (process.platform !== 'darwin') app.quit()
-})
+    win = null;
+    if (process.platform !== 'darwin') app.quit();
+});
 
 app.on('second-instance', () => {
-  if (win) {
-    // Focus on the main window if the user tried to open another
-    if (win.isMinimized()) win.restore()
-    win.focus()
-  }
-})
+    if (win) {
+        // Focus on the main window if the user tried to open another
+        if (win.isMinimized()) win.restore();
+        win.focus();
+    }
+});
 
 app.on('activate', () => {
-  const allWindows = BrowserWindow.getAllWindows()
-  if (allWindows.length) {
-    allWindows[0].focus()
-  } else {
-    createWindow()
-  }
-})
+    const allWindows = BrowserWindow.getAllWindows();
+    if (allWindows.length) {
+        allWindows[0].focus();
+    } else {
+        createWindow();
+    }
+});
 
 // new window example arg: new windows url
 ipcMain.handle('open-win', (event, arg) => {
-  const childWindow = new BrowserWindow({
-    webPreferences: {
-      preload,
-    },
-  })
-
-  if (app.isPackaged) {
-    childWindow.loadFile(indexHtml, { hash: arg })
-  } else {
-    childWindow.loadURL(`${url}/#${arg}`)
-    // childWindow.webContents.openDevTools({ mode: "undocked", activate: true })
-  }
-})
+    const childWindow = new BrowserWindow({
+        webPreferences: {
+            preload,
+        },
+    });
+
+    if (app.isPackaged) {
+        childWindow.loadFile(indexHtml, { hash: arg });
+    } else {
+        childWindow.loadURL(`${url}/#${arg}`);
+        // childWindow.webContents.openDevTools({ mode: "undocked", activate: true })
+    }
+});
 
 async function getScreen(event, title) {
-  // In the main process.
-  const { desktopCapturer } = require('electron')
-
-  const allSources = await desktopCapturer.getSources({
-    types: ['window', 'screen'],
-  })
-
-  // const videoOptionsMenu = Menu.buildFromTemplate([
-  //   allSources.map((source) => {
-  //     return {
-  //       label: source.name,
-  //       click: () => selectSource(source),
-  //     }
-  //   }),
-  // ])
-
-  // videoOptionsMenu.popup()
-  return allSources
+    // In the main process.
+    const { desktopCapturer } = require('electron');
+
+    const allSources = await desktopCapturer.getSources({
+        types: ['window', 'screen'],
+    });
+
+    // const videoOptionsMenu = Menu.buildFromTemplate([
+    //   allSources.map((source) => {
+    //     return {
+    //       label: source.name,
+    //       click: () => selectSource(source),
+    //     }
+    //   }),
+    // ])
+
+    // videoOptionsMenu.popup()
+    return allSources;
 }