From 4eec46c822b050da154e875fce065471ae7493a0 Mon Sep 17 00:00:00 2001 From: WhoCode Date: Wed, 3 Dec 2025 22:34:54 +0100 Subject: [PATCH 1/7] Rudimental github flow for windows build --- .github/workflows/build-windows.yml | 44 +++++++++++++++++++++++++++++ src/package.json | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-windows.yml diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml new file mode 100644 index 0000000..51a4613 --- /dev/null +++ b/.github/workflows/build-windows.yml @@ -0,0 +1,44 @@ +name: Windows Build + +on: + push: + branches: [ "master", "feature/*" ] + pull_request: + branches: [ "master" ] + +jobs: + build-windows: + runs-on: windows-latest + defaults: + run: + working-directory: ./src + + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + cache: 'npm' + cache-dependency-path: src/package-lock.json + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + targets: x86_64-pc-windows-msvc + + - name: Install dependencies + run: npm ci + + - name: Build the app + run: npm run tauri build + + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: Temprix-Windows-Installer + path: | + src/src-tauri/target/release/bundle/nsis/*.exe + src/src-tauri/target/release/bundle/msi/*.msi + if-no-files-found: warn diff --git a/src/package.json b/src/package.json index a8c9c07..cc24e32 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "name": "temprix", "private": true, - "version": "0.1.0", + "version": "0.2.0", "type": "module", "scripts": { "tauri": "tauri" From cfb64dda3465885d58b4a38188009c668fa78ba0 Mon Sep 17 00:00:00 2001 From: WhoCode Date: Wed, 3 Dec 2025 22:40:31 +0100 Subject: [PATCH 2/7] Prepared rudimental mac os build pipeline --- .github/workflows/build-macos.yml | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/build-macos.yml diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml new file mode 100644 index 0000000..72d14a6 --- /dev/null +++ b/.github/workflows/build-macos.yml @@ -0,0 +1,42 @@ +name: macOS Build + +on: + push: + branches: [ "master", "feature/*" ] + pull_request: + branches: [ "master" ] + +jobs: + build-macos: + runs-on: macos-latest + defaults: + run: + working-directory: ./src + + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + cache: 'npm' + cache-dependency-path: src/package-lock.json + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Install dependencies + run: npm ci + + - name: Build the app + run: npm run tauri build + + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: Temprix-macOS-App + path: | + src/src-tauri/target/release/bundle/dmg/*.dmg + src/src-tauri/target/release/bundle/macos/*.app + if-no-files-found: warn From ba4ab0c56c122f92120da16558a4564b28a09af1 Mon Sep 17 00:00:00 2001 From: WhoCode Date: Wed, 3 Dec 2025 22:42:42 +0100 Subject: [PATCH 3/7] Added windows ico fix to ensure run even with missing ico --- .github/workflows/build-windows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 51a4613..eb18ef0 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -31,6 +31,10 @@ jobs: - name: Install dependencies run: npm ci + - name: Fix Icon for Windows + run: | + magick convert src-tauri/icons/icon.png -define icon:auto-resize=256,128,64,48,32,16 src-tauri/icons/icon.ico + - name: Build the app run: npm run tauri build From 961b269a087b602b8603ae516db94ed7f1aefe9a Mon Sep 17 00:00:00 2001 From: WhoCode Date: Thu, 4 Dec 2025 07:49:37 +0100 Subject: [PATCH 4/7] Prepared extraction of source files for cleaner project structure --- src/src-tauri/src/lib.rs | 2 +- src/src/index.html | 39 --------------- src/src/main.js | 18 ------- src/src/settings.html | 101 +++++++++++---------------------------- src/src/settings.js | 60 +++++++++++++++++++++++ src/src/styles.css | 13 ++--- 6 files changed, 94 insertions(+), 139 deletions(-) delete mode 100644 src/src/index.html delete mode 100644 src/src/main.js create mode 100644 src/src/settings.js diff --git a/src/src-tauri/src/lib.rs b/src/src-tauri/src/lib.rs index f88d7e2..80bb7aa 100644 --- a/src/src-tauri/src/lib.rs +++ b/src/src-tauri/src/lib.rs @@ -81,7 +81,7 @@ pub fn run() { tauri::WebviewUrl::App("settings.html".into()), ) .title("Activity Tracker Settings") - .inner_size(650.0, 700.0) + .inner_size(650.0, 400.0) .build(); } } diff --git a/src/src/index.html b/src/src/index.html deleted file mode 100644 index 9f801d7..0000000 --- a/src/src/index.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Temprix - - - - -
-

Welcome to Temprix

- - -

Click on the Tauri logo to learn more about the framework

- -
- - -
-

-
- - diff --git a/src/src/main.js b/src/src/main.js deleted file mode 100644 index 55d5f93..0000000 --- a/src/src/main.js +++ /dev/null @@ -1,18 +0,0 @@ -const { invoke } = window.__TAURI__.core; - -let greetInputEl; -let greetMsgEl; - -async function greet() { - // Learn more about Tauri commands at https://tauri.app/develop/calling-rust/ - greetMsgEl.textContent = await invoke("greet", { name: greetInputEl.value }); -} - -window.addEventListener("DOMContentLoaded", () => { - greetInputEl = document.querySelector("#greet-input"); - greetMsgEl = document.querySelector("#greet-msg"); - document.querySelector("#greet-form").addEventListener("submit", (e) => { - e.preventDefault(); - greet(); - }); -}); diff --git a/src/src/settings.html b/src/src/settings.html index 6aa7bd4..ae80324 100644 --- a/src/src/settings.html +++ b/src/src/settings.html @@ -10,83 +10,38 @@
-

Settings

+

Temprix

-
- Configure Regex patterns to identify ticket IDs from window titles.
- Use standard Regex syntax. Capture group 1 will be used as the ID. +
+

ID Detection Patterns

+
+ Configure Regex patterns to identify ticket IDs from window titles.
+ Use standard Regex syntax. Capture group 1 will be used as the ID. +
+ +
+ +
+ +
+ + +
- -
- -
- -
- - +
+

Activity log folder

+
+ Define the directory where you wan't the activity logs to be stored. +
+
+ +
+
+ +
- +