From 21cd1112de9ffc23ff48df990cdaf4b54dfb511f Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Tue, 20 Sep 2022 23:35:47 +0200 Subject: build: add new tauri configuration --- src-tauri/tauri.conf.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src-tauri/tauri.conf.json') diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 712e1856..ff4a4761 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,9 +1,9 @@ { "$schema": "../node_modules/@tauri-apps/cli/schema.json", "build": { - "beforeBuildCommand": "", - "beforeDevCommand": "", - "devPath": "http://localhost:8080/", + "beforeBuildCommand": "cd src-vue && npm run build", + "beforeDevCommand": "cd src-vue && npm run dev", + "devPath": "http://localhost:5173/", "distDir": "../dist" }, "package": { -- cgit v1.2.3 From 089062ebd785aaf2b822baf183f116c9f23d4582 Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Fri, 23 Sep 2022 01:21:57 +0200 Subject: build: fix minimum window dimensions --- src-tauri/tauri.conf.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src-tauri/tauri.conf.json') diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index a1a83c2e..9789b5d0 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -62,7 +62,11 @@ { "fullscreen": false, "resizable": true, - "title": "FlightCore" + "title": "FlightCore", + "height": 600, + "minHeight": 600, + "width": 1000, + "minWidth": 1000 } ] } -- cgit v1.2.3 From e31f9bc40cda2a384e9f839c8c3cbcff8f90dadd Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Fri, 23 Sep 2022 18:42:34 +0200 Subject: feat: remove window decorations --- src-tauri/tauri.conf.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src-tauri/tauri.conf.json') diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 9789b5d0..8818ee79 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -62,6 +62,7 @@ { "fullscreen": false, "resizable": true, + "decorations": false, "title": "FlightCore", "height": 600, "minHeight": 600, -- cgit v1.2.3 From 6e330e457efff228f7094cab8ac1d7518a6bcb9e Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Mon, 3 Oct 2022 00:52:29 +0200 Subject: build: move front files on build step --- src-tauri/tauri.conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-tauri/tauri.conf.json') diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 8818ee79..4b60c843 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/schema.json", "build": { - "beforeBuildCommand": "cd src-vue && npm run build", + "beforeBuildCommand": "cd src-vue && npm run build && cp dist/* ../dist -r", "beforeDevCommand": "cd src-vue && npm run dev", "devPath": "http://localhost:5173/", "distDir": "../dist" @@ -71,4 +71,4 @@ } ] } -} \ No newline at end of file +} -- cgit v1.2.3 From e2c80985c41fb4833bf418a00aa7661bdf42bf70 Mon Sep 17 00:00:00 2001 From: GeckoEidechse Date: Mon, 3 Oct 2022 15:06:41 +0200 Subject: fix: Temp. disable updater to avoid failing builds Should be re-enabled before merging and in the longterm disabled in CI if private key is missing. --- src-tauri/tauri.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-tauri/tauri.conf.json') diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 4b60c843..2860d1a1 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -51,7 +51,7 @@ "csp": null }, "updater": { - "active": true, + "active": false, "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEVBNjM3NzJGRDgxMTU4NUUKUldSZVdCSFlMM2RqNmdhK3pIZjhEYWg2WnZGSFJqdkhLSHNOSjNhaW5VQVFLaHV3YWFDTnFKWWQK", "endpoints": [ "https://github.com/GeckoEidechse/FlightCore/releases/latest/download/latest-release.json" -- cgit v1.2.3 From 9964859f05e2137712ea7a0028a01eb6ce1f6de1 Mon Sep 17 00:00:00 2001 From: Rémy Raes Date: Tue, 4 Oct 2022 07:47:15 +0200 Subject: feat: set minimum window dimensions to 600x300 Co-authored-by: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> --- src-tauri/tauri.conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-tauri/tauri.conf.json') diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 2860d1a1..26946644 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -65,9 +65,9 @@ "decorations": false, "title": "FlightCore", "height": 600, - "minHeight": 600, + "minHeight": 300, "width": 1000, - "minWidth": 1000 + "minWidth": 600 } ] } -- cgit v1.2.3 From a549c4e87b4d9dada8cd63568833cb8ff77ea7d5 Mon Sep 17 00:00:00 2001 From: GeckoEidechse Date: Tue, 4 Oct 2022 14:20:41 +0200 Subject: refactor: Change dist dir path Instead of copying dist to different directory as before build step --- src-tauri/tauri.conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-tauri/tauri.conf.json') diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 26946644..8a57c93e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,10 +1,10 @@ { "$schema": "../node_modules/@tauri-apps/cli/schema.json", "build": { - "beforeBuildCommand": "cd src-vue && npm run build && cp dist/* ../dist -r", + "beforeBuildCommand": "cd src-vue && npm run build", "beforeDevCommand": "cd src-vue && npm run dev", "devPath": "http://localhost:5173/", - "distDir": "../dist" + "distDir": "../src-vue/dist" }, "package": { "productName": "flightcore", -- cgit v1.2.3 From 5912e98a02e799b7ad6c910567fe18988ab84798 Mon Sep 17 00:00:00 2001 From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> Date: Tue, 4 Oct 2022 22:03:44 +0200 Subject: fix: Re-enable self updating mechanism --- src-tauri/tauri.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-tauri/tauri.conf.json') diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 8a57c93e..e81faee5 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -51,7 +51,7 @@ "csp": null }, "updater": { - "active": false, + "active": true, "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEVBNjM3NzJGRDgxMTU4NUUKUldSZVdCSFlMM2RqNmdhK3pIZjhEYWg2WnZGSFJqdkhLSHNOSjNhaW5VQVFLaHV3YWFDTnFKWWQK", "endpoints": [ "https://github.com/GeckoEidechse/FlightCore/releases/latest/download/latest-release.json" -- cgit v1.2.3