From d7411d2ea12acb085601e60ee3676728475866f2 Mon Sep 17 00:00:00 2001 From: Hugo Bois Date: Sun, 12 Apr 2026 23:23:55 +0200 Subject: [PATCH 1/2] fixed infinite load on tauri and macos workflow --- .github/workflows/deploy-macos.yaml | 2 +- components/home/HomeClient.tsx | 11 +++++++---- package.json | 2 +- ...tauri.macos.conf.json => tauri.appstore.conf.json} | 0 src-tauri/tauri.conf.json | 5 +++++ src-tauri/tauri.windows.conf.json | 11 ----------- 6 files changed, 14 insertions(+), 17 deletions(-) rename src-tauri/{tauri.macos.conf.json => tauri.appstore.conf.json} (100%) diff --git a/.github/workflows/deploy-macos.yaml b/.github/workflows/deploy-macos.yaml index 14cb905..e03c8cb 100644 --- a/.github/workflows/deploy-macos.yaml +++ b/.github/workflows/deploy-macos.yaml @@ -44,7 +44,7 @@ jobs: run: npm install - name: Build and sign .app with Tauri - run: npm run tauri build -- --bundles app --target universal-apple-darwin + run: npm run tauri build -- --bundles app --target universal-apple-darwin --config src-tauri/tauri.appstore.conf.json env: APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} diff --git a/components/home/HomeClient.tsx b/components/home/HomeClient.tsx index e2e5c15..6d007a0 100644 --- a/components/home/HomeClient.tsx +++ b/components/home/HomeClient.tsx @@ -2,22 +2,25 @@ import { useEffect } from "react"; import HomePageContainer from "@components/home/HomePageContainer"; -import Loading from "@components/utils/Loading"; import LandingPageNavbar from "@components/navbar/LandingPageNavbar"; import { isTauri } from "@tauri-apps/api/core"; import { useTheme } from "next-themes"; +import { useRouter } from "next/navigation"; export default function HomeClient() { const { setTheme } = useTheme(); + const router = useRouter(); useEffect(() => { - if (!isTauri()) { + if (isTauri()) { + router.replace("/projects"); + } else { setTheme("dark"); } - }, [setTheme]); + }, [setTheme, router]); if (isTauri()) { - return ; + return null; } // Guest - show landing page with LandingPageNavbar diff --git a/package.json b/package.json index 9a1fcc6..7caabc6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "scriptio", "private": true, - "version": "2.0.2", + "version": "2.0.3", "scripts": { "dev": "docker compose --profile dev up -d --wait && npx prisma db push && next dev", "build": "npx prisma generate && next build", diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.appstore.conf.json similarity index 100% rename from src-tauri/tauri.macos.conf.json rename to src-tauri/tauri.appstore.conf.json diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 3eb9f38..9b815b6 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -15,6 +15,11 @@ }, "windows": [ { + "title": "Scriptio", + "width": 1350, + "height": 900, + "resizable": true, + "maximized": true, "incognito": true, "dragDropEnabled": false } diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index dc1e8a3..6535378 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -1,16 +1,5 @@ { "identifier": "ArkoLogic.Scriptio", - "app": { - "windows": [ - { - "title": "Scriptio", - "width": 1350, - "height": 900, - "resizable": true, - "maximized": true - } - ] - }, "bundle": { "publisher": "CN=B3E169FD-9F36-409A-8CED-F0B22D3EA253", "windows": { From 59a216bd1a9720b8e02d81b6a228649e6c786471 Mon Sep 17 00:00:00 2001 From: Hugo Bois Date: Sun, 12 Apr 2026 23:25:14 +0200 Subject: [PATCH 2/2] added missing info.plist --- src-tauri/Info.plist | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src-tauri/Info.plist diff --git a/src-tauri/Info.plist b/src-tauri/Info.plist new file mode 100644 index 0000000..a22c465 --- /dev/null +++ b/src-tauri/Info.plist @@ -0,0 +1,8 @@ + + + + + ITSAppUsesNonExemptEncryption + + + \ No newline at end of file