Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
11 changes: 7 additions & 4 deletions components/home/HomeClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Loading />;
return null;
}

// Guest - show landing page with LandingPageNavbar
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 8 additions & 0 deletions src-tauri/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
</dict>
</plist>
File renamed without changes.
5 changes: 5 additions & 0 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
},
"windows": [
{
"title": "Scriptio",
"width": 1350,
"height": 900,
"resizable": true,
"maximized": true,
"incognito": true,
"dragDropEnabled": false
}
Expand Down
11 changes: 0 additions & 11 deletions src-tauri/tauri.windows.conf.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Loading