merge main

Author: whyboris

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Report a bug in VHA
+title: "[BUG] "
+labels: bug
+assignees: ""
+---
+
+<!-- feel free to delete any section and add comments freeform -->
+
+### Description
+
+<!-- A description of what the bug is -->
+
+#### To Reproduce
+
+1. 🖱
+2. 💥
+3. 🤦‍♂️
+
+#### Expected behavior
+
+<!-- What did you expect to happen? -->
+
+#### Actual behavior
+
+<!-- What happened instead? -->
+
+#### Screenshot
+
+<!-- If useful for explanation and easy to do consider adding a screenshot -->
+
+#### Environment
+
+- OS: `Windows` / `Mac` / `Linux`
+- VHA version: `3.2.0`
+
+#### Additional context
+
+<!-- any other comments -->

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest a new feature for VHA
+title: "[FEATURE] "
+labels: enhancement
+assignees: ""
+---
+
+<!-- feel free to delete any section and add comments freeform -->
+
+### Description
+
+<!-- Describe the feature or enhancement you'd like to see implemented in VHA -->
+
+#### What problem does this solve?
+
+<!-- Explain why this feature is important, what problem it solves, and how it benefits the users -->
+
+#### Proposed Solution
+
+<!-- Describe how the feature should work, providing examples if possible -->
+
+#### Additional context
+
+<!-- Add any other comments -->

.github/ISSUE_TEMPLATE/other.md

@@ -0,0 +1,8 @@
+---
+name: Other
+about: Anything related to VHA
+title: "[OTHER] "
+assignees: ""
+---
+
+<!-- share a brief description of what you are thinking -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+<!-- 🙇‍♂️ Thank you very much for contributing to VHA ♥ -->
+
+Related issue: #{{issue number}}
+
+<!-- please add any additional comments too -->

.nvmrc

@@ -1 +1 @@
-v18.12.1
+v20.18.0

README.md

@@ -1,7 +1,6 @@
 # Video Hub App 3
 
-[*Video Hub App 3*](https://videohubapp.com/) is the fastest way to browse and search for videos on your computer. Think of it like YouTube for videos on your computer: browse, search, and preview. Works on Windows, Mac, and Linux!
-
+[_Video Hub App 3_](https://videohubapp.com/) is the fastest way to browse and search for videos on your computer. Think of it like YouTube for videos on your computer: browse, search, and preview. Works on Windows, Mac, and Linux!
 
 ## Download Now
 
@@ -11,31 +10,26 @@ $3.50 of every sale goes to the [_cost-effective_](https://www.givewell.org/char
 
 ![video-hub-app](https://user-images.githubusercontent.com/17264277/82097107-3ed91700-96d0-11ea-8679-87fa3e07cd0b.jpg)
 
-
 ## About
 
-*Video Hub App* was created by [Boris Yakubchik](https://videohubapp.com/en/about). It uses the frameworks _Angular_ and _Electron_.
-
+_Video Hub App_ was created by [Boris Yakubchik](https://videohubapp.com/en/about). It uses the frameworks _Angular_ and _Electron_.
 
 ## License
 
 This software was built on top of [`angular-electron`](https://github.com/maximegris/angular-electron) by [Maxime GRIS](https://github.com/maximegris). It carries an _MIT_ license (see the _LICENSE_ file). While the license is permissive, I ask that you do not distribute free copies of this software unless you have significantly changed it.
 
-
 ## Contributing
 
-I would love to see the improvements you make to this app and am happy to accept pull requests. You can reach out if you'd like to coordinate / collaborate, or just *jump to [issues](https://github.com/whyboris/Video-Hub-App/issues)* to see what's already getting worked on and to add new suggestions!
+I would love to see the improvements you make to this app and am happy to accept pull requests. You can reach out if you'd like to coordinate / collaborate, or just _jump to [issues](https://github.com/whyboris/Video-Hub-App/issues)_ to see what's already getting worked on and to add new suggestions!
 
 Please consider improving any of the translations, or [add a new translation](https://github.com/whyboris/Video-Hub-App/tree/master/i18n)!
 
 Please consider improving or adding an icon to the app. It's a simple process, just [follow the instructions](https://github.com/whyboris/Video-Hub-App/tree/master/src/app/components/icon)!
 
-
 ## Upcoming features
 
 See [issues](https://github.com/whyboris/Video-Hub-App/issues) for what is in progress.
 
-
 ## Development
 
 ⚠ The repository is usually ahead of the publicly [released version](https://github.com/whyboris/Video-Hub-App/releases) - it is 🚧 WIP and may have bugs in it.
@@ -48,45 +42,45 @@ How to start:
 
 Main dependencies in use:
 
-| Library          | Version   | Date           | Comment |
-| ---------------- | --------- | -------------- | ------- |
-| Angular          | v15.1.5   | Feb 2023       |         |
-| Angular-CLI      | v15.1.6   | Feb 2023       |         |
-| Electron         | v23.1.0   | Feb 2023       | (internally uses Node `v18.12.1` and Chromium 110) |
-| Electron Builder | v23.6.0   | Feb 2023       |         |
+| Library          | Version | Date      | Comment |
+| ---------------- | ------- | --------- | ------- |
+| Angular          | v18     | Oct 2024  |         |
+| Angular-CLI      | v18     | Oct 2024  |         |
+| Electron         | v33     | Oct 2024  | (internally uses Node `v20.18.0` and Chromium 128) |
+| Electron Builder | v25     | Oct 2024  |         |
 
-- **Node**: It may be best to use the same version as _Electron_ uses internally, but consider `v18.12.1`.
+- **Node**: It may be best to use the same version as _Electron_ uses internally (`v20.18.0`)
 
 - **Angular CLI**: not required but may be useful: [Angular CLI](https://cli.angular.io).
 
-To help debug a production build of VHA you can use [Debugtron](https://github.com/bytedance/debugtron)
+- **Mac**: We now have `M1` and `Intel` builds, but you may need to manually update the _FFmpeg_ and _FFprobe_ executables if you're building for a different architecture than you are on.
 
+To help debug a production build of VHA you can use [Debugtron](https://github.com/bytedance/debugtron)
 
 ## Remote
 
 👩‍🚀 a new feature in VHA is the option for the user to turn on a _server_ after the app starts. This will let the user open a simpler version of the VHA user interface on their phone or tablet (if both PC and device are on the same WiFi) and use it as remote control to play videos 🚀
 
 For details, see [instructions](https://github.com/whyboris/Video-Hub-App/blob/master/remote/README.md).
 
-
 ## Thank you
 
 This software would not be possible without the tremendous work by other people:
 
- - [Angular](https://github.com/angular/angular)
- - [Electron](https://github.com/electron/electron)
- - [FFmpeg](https://www.ffmpeg.org/)
- - [angular-electron](https://github.com/maximegris/angular-electron)
- - [ngx-virtual-scroller](https://github.com/rintoj/ngx-virtual-scroller)
- - [ffmpeg-static](https://github.com/eugeneware/ffmpeg-static)
- - [@ffprobe-installer/ffprobe](https://github.com/SavageCore/node-ffprobe-installer)
- - [ngx-translate](https://github.com/ngx-translate/core)
- - [fdir](https://github.com/thecodrr/fdir)
- - [async](https://github.com/caolan/async)
- - [chokidar](https://github.com/paulmillr/chokidar)
- - [trash](https://github.com/sindresorhus/trash)
- - [Fuse.js](https://github.com/krisk/Fuse)
- - [electron-window-state](https://github.com/mawie81/electron-window-state)
+- [Angular](https://github.com/angular/angular)
+- [Electron](https://github.com/electron/electron)
+- [FFmpeg](https://www.ffmpeg.org/)
+- [angular-electron](https://github.com/maximegris/angular-electron)
+- [ngx-virtual-scroller](https://github.com/rintoj/ngx-virtual-scroller)
+- [ffmpeg-static](https://github.com/eugeneware/ffmpeg-static)
+- [@ffprobe-installer/ffprobe](https://github.com/SavageCore/node-ffprobe-installer)
+- [ngx-translate](https://github.com/ngx-translate/core)
+- [fdir](https://github.com/thecodrr/fdir)
+- [async](https://github.com/caolan/async)
+- [chokidar](https://github.com/paulmillr/chokidar)
+- [trash](https://github.com/sindresorhus/trash)
+- [Fuse.js](https://github.com/krisk/Fuse)
+- [electron-window-state](https://github.com/mawie81/electron-window-state)
 
 This software uses libraries from the FFmpeg project under the LGPLv2.1 with binaries from [here](https://github.com/kribblo/node-ffmpeg-installer#the-binaries)
 

angular.json

@@ -9,7 +9,7 @@
       "projectType": "application",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser-esbuild",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist",
             "index": "src/index.html",
@@ -68,14 +68,14 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "video-hub-app:build"
+            "buildTarget": "video-hub-app:build"
           },
           "configurations": {
             "dev": {
-              "browserTarget": "angular-electron:build:dev"
+              "buildTarget": "angular-electron:build:dev"
             },
             "production": {
-              "browserTarget": "angular-electron:build:production"
+              "buildTarget": "angular-electron:build:production"
             }
           }
         },

electron-builder.json

@@ -1,7 +1,7 @@
 {
   "productName": "Video Hub App 3",
   "appId": "com.videohubapp.videohubapp3",
-  "copyright": "Copyright © 2021 Boris Yakubchik",
+  "copyright": "Copyright © 2023 Boris Yakubchik",
   "directories": {
     "output": "release/"
   },
@@ -38,12 +38,19 @@
       "../node_modules/node-ffprobe-installer"
     ],
     "target": [
-      "nsis"
+      "nsis",
+      "portable"
     ]
   },
   "mac": {
     "category": "public.app-category.video",
-    "target": "dmg",
+    "target": {
+      "target": "dmg",
+      "arch": [
+        "x64",
+        "arm64"
+      ]
+    },
     "icon": "src/assets/icons.icns",
     "asar": true,
     "asarUnpack": [