Merge pull request #28 from stellar-comet/main

Release v2.0.4

Author: Thavarshan

.github/FUNDING.yml

@@ -1 +1,2 @@
 github: thavarshan
+buy_me_a_coffee: thavarshan

.github/SECURITY.md

@@ -7,6 +7,7 @@
 | Version | Security Fixes Until |
 | ------- | -------------------- |
 | 1.0.0   | August 17th, 2024    |
+| 2.0.1   | September 17th, 2024 |
 
 ## Reporting a Vulnerability
 

.github/workflows/build.yml

@@ -0,0 +1,120 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - main
+      - release
+      - feature/*
+  pull_request:
+    branches:
+      - main
+      - release
+      - feature/*
+
+jobs:
+  build-macos:
+    strategy:
+      matrix:
+        arch: [x64, arm64]
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build Electron app
+        run: |
+          npm run make -- --arch=${{ matrix.arch }}
+        env:
+          ELECTRON_CACHE: ${{ runner.temp }}/electron
+          npm_config_arch: ${{ matrix.arch }}
+          npm_config_platform: darwin
+
+      - name: Verify build output
+        run: ls out/make
+
+  build-linux:
+    strategy:
+      matrix:
+        arch: [x64, arm64]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build Electron app
+        run: |
+          npm run make -- --arch=${{ matrix.arch }}
+        env:
+          ELECTRON_CACHE: ${{ runner.temp }}/electron
+          npm_config_arch: ${{ matrix.arch }}
+          npm_config_platform: linux
+
+      - name: Verify build output
+        run: ls out/make
+
+  build-windows:
+    strategy:
+      matrix:
+        arch: [x64, arm64]
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Install Microsoft Build Tools
+        run: |
+          choco install microsoft-build-tools -y
+        shell: pwsh
+
+      - name: Verify makeappx.exe and build & sign the appx
+        run: |
+          # Verify makeappx.exe
+          $makeappxPath = 'C:\Program Files (x86)\Windows Kits\10\App Certification Kit\makeappx.exe'
+
+          if (Test-Path $makeappxPath) {
+            echo "makeappx.exe found at $makeappxPath"
+            $env:WINDOWS_KIT_PATH="C:\Program Files (x86)\Windows Kits\10\App Certification Kit"
+          } else {
+            Write-Error "makeappx.exe not found."
+            exit 1
+          }
+
+          # Install dependencies
+          npm install
+
+          # Build and sign the appx using Electron Forge
+          npm run publish -- --arch=${{ matrix.arch }}
+        env:
+          WINDOWS_KIT_PATH: ${{ env.WINDOWS_KIT_PATH }}
+          CERT_PASSWORD: ${{ secrets.CERT_PASSWORD }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        shell: pwsh
+
+      - name: Verify build output
+        run: dir out\make
+        shell: pwsh

.github/workflows/test.yml

@@ -4,12 +4,16 @@ on:
   push:
     branches:
       - main
+      - release
+      - feature/*
   pull_request:
     branches:
       - main
+      - release
+      - feature/*
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
 
     steps:
@@ -19,7 +23,7 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: '18'
+        node-version: '20'
 
     - name: Install dependencies
       run: npm install

.gitignore

@@ -93,3 +93,4 @@ out/
 note.md
 cert.pem
 key.pem
+temp

.nvmrc

@@ -0,0 +1 @@
+v20.11.1

.prettierrc

@@ -1,9 +1,9 @@
 {
-    "semi": true,
-    "trailingComma": "all",
-    "singleQuote": true,
-    "printWidth": 120,
-    "tabWidth": 2,
-    "useTabs": false,
-    "endOfLine": "auto"
+  "semi": true,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 120,
+  "tabWidth": 2,
+  "useTabs": false,
+  "endOfLine": "auto"
 }

README.md

@@ -1,16 +1,20 @@
-<p align="center"><a href="https://comet.thavarshan.com" target="_blank"><img src="https://github.com/stellar-comet/comet/blob/main/src/assets/images/logo.png" width="400" height="400" alt="Comet"></a></p>
+<p align="center"><a href="https://comet.thavarshan.com" target="_blank"><img src="./assets/logo.png" width="400" height="400" alt="Comet"></a></p>
 
-## About Comet
+[![Test](https://github.com/stellar-comet/comet/actions/workflows/test.yml/badge.svg)](https://github.com/stellar-comet/comet/actions/workflows/test.yml)
+[![Build](https://github.com/stellar-comet/comet/actions/workflows/build.yml/badge.svg)](https://github.com/stellar-comet/comet/actions/workflows/build.yml)
+[![Release](https://github.com/stellar-comet/comet/actions/workflows/release.yml/badge.svg?branch=release)](https://github.com/stellar-comet/comet/actions/workflows/release.yml)
 
-**Comet** is a cross-platform video converter application designed to make video conversion as easy and accessible as possible. Leveraging the power of [FFmpeg](https://ffmpeg.org/), Comet allows users to convert video files into a variety of formats, all within a simple, intuitive interface.
+> [!WARNING]
+> We don't have an Apple Developer account yet, and the application is not code-signed for both Mac and Windows. Therefore, the applications will show a warning popup on the first start. On Mac, click **Okay**, then go to **Settings / Privacy & Security** and scroll down until you see a button **Open anyway**. You'll have to do this once. On Windows, you may see a warning message indicating that the app is from an unknown publisher. Click **More info** and then **Run anyway** to proceed.
 
-![Comet UI 1](./src/assets/images/screenshot_1.png)
-![Comet UI 2](./src/assets/images/screenshot_2.png)
-![Comet UI 3](./src/assets/images/screenshot_3.png)
+## About Comet
 
-<p align="center"><a href="https://comet.thavarshan.com" target="_blank"><img src="./src/assets/images/demo.gif" width="600" alt="Comet Demo"></a></p>
+**Comet** is a cross-platform video converter application designed to make video conversion as easy and accessible as possible. Leveraging the power of [FFmpeg](https://ffmpeg.org/), Comet allows users to convert video files into a variety of formats, all within a simple, intuitive interface.
 
-[![Release](https://github.com/stellar-comet/comet/actions/workflows/release.yml/badge.svg?branch=release)](https://github.com/stellar-comet/comet/actions/workflows/release.yml)
+![Comet UI 1](./assets/screenshot_1.png)
+![Comet UI 2](./assets/screenshot_2.png)
+![Comet UI 3](./assets/screenshot_3.png)
+![Comet UI 4](./assets/screenshot_4.png)
 
 ## Project Overview
 
@@ -41,57 +45,8 @@ The project has made significant progress:
 - **Node.js:** Backend services and script automation.
 - **Vite:** For fast and modern build tooling.
 - **Tailwind CSS:** For styling and responsive design.
-
-## Project Structure
-
-```bash
-comet/
-│
-├── .github/                        # GitHub-specific files, including workflows
-├── .vite/                          # Vite cache directory
-├── .vscode/                        # VSCode settings directory
-├── bin/                            # Custom scripts and binaries
-│   └── converter.sh                # Shell script for video conversion
-├── node_modules/                   # Node.js dependencies
-├── out/                            # Build output directory
-├── scripts/                        # Custom scripts
-│   └── postinstall.js              # Script to run after installation
-├── src/
-│   ├── assets/
-│   │   ├── css/                    # Global CSS file
-│   │   └── images/                 # Image assets for the application
-│   ├── lib/
-│   │   └── utils.ts                # Utility functions
-│   ├── ui/
-│   │   ├── blocks/                 # Main components for the app
-│   │   └── components/             # UI-related components
-│   ├── main.ts                     # Main process file
-│   ├── preload.ts                  # Preload script
-│   ├── renderer.ts                 # Renderer process entry point
-│   └── app.vue                     # Main Vue component
-│
-├── .editorconfig                   # Editor configuration
-├── .eslintrc.json                  # ESLint configuration
-├── .gitattributes                  # Git attributes configuration
-├── .gitignore                      # Git ignore file
-├── .prettierrc                     # Prettier configuration
-├── LICENSE                         # License file
-├── index.html                      # Entry HTML file
-├── postcss.config.js               # PostCSS configuration
-├── tailwind.config.js              # Tailwind CSS configuration
-├── components.json                 # Component configuration
-├── package-lock.json               # Lockfile for npm dependencies
-├── package.json                    # Node.js project configuration
-├── tsconfig.json                   # TypeScript configuration
-├── README.md                       # Project README file
-├── forge.config.ts                 # Electron Forge configuration
-├── forge.env.d.ts                  # Environment type declarations
-├── shims-vue.d.ts                  # TypeScript shims for Vue
-├── vite.base.config.ts             # Vite base configuration
-├── vite.main.config.ts             # Vite main process configuration
-├── vite.preload.config.ts          # Vite preload script configuration
-└── vite.renderer.config.ts         # Vite renderer process configuration
-```
+- **Jest:** For unit testing.
+- **GitHub Actions:** For CI/CD and release automation.
 
 ## How to Contribute
 
@@ -174,7 +129,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 ## Support
 
-If you find this project helpful or interesting, please consider giving it a ⭐ on GitHub. Your support and feedback are greatly appreciated!
+If you find this project helpful or interesting, please consider giving it a ⭐. Your support and feedback are greatly appreciated!
 
 ---
 

src/assets/images/Banner.jpg assets/Banner.jpg

@@ -5,13 +5,13 @@
   "tsConfigPath": "./tsconfig.json",
   "tailwind": {
     "config": "tailwind.config.js",
-    "css": "src/assets/css/index.css",
+    "css": "src/ui/css/index.css",
     "baseColor": "slate",
     "cssVariables": true
   },
   "framework": "vite",
   "aliases": {
     "components": "@/ui/components",
-    "utils": "@/lib/utils"
+    "utils": "@/ui/utils"
   }
-}
+}