Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0141eed35 | ||
|
|
492a427458 | ||
|
|
d3bdd1d3a5 | ||
|
|
369d7e889c | ||
|
|
d2e49c16fe | ||
|
|
3beabfca48 |
@@ -2,7 +2,7 @@ name: Tauri Release Build
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [created]
|
||||
types: [published]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
@@ -53,7 +53,13 @@ jobs:
|
||||
with:
|
||||
name: tauri-build-${{ matrix.os }}
|
||||
path: |
|
||||
src-tauri/target/release/bundle/**
|
||||
src-tauri/target/release/bundle/**/!(node_modules)/
|
||||
src-tauri/target/release/bundle/**/*.AppImage
|
||||
src-tauri/target/release/bundle/**/*.dmg
|
||||
src-tauri/target/release/bundle/**/*.msi
|
||||
src-tauri/target/release/bundle/**/*.exe
|
||||
src-tauri/target/release/bundle/**/*.deb
|
||||
src-tauri/target/release/bundle/**/*.rpm
|
||||
|
||||
release:
|
||||
name: Upload to GitHub Release
|
||||
@@ -72,6 +78,7 @@ jobs:
|
||||
- name: Upload to Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ github.event.release.tag_name }}
|
||||
files: artifacts/**/*
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -5,6 +5,7 @@
|
||||
"windows": ["main"],
|
||||
"permissions": [
|
||||
"core:default",
|
||||
"opener:default"
|
||||
"opener:default",
|
||||
"core:window:allow-show"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -50,6 +50,7 @@ pub fn auth_create_link(app: AppHandle) -> Result<String, String> {
|
||||
|
||||
let app_handle = app.clone();
|
||||
|
||||
std::thread::spawn(move || {
|
||||
tauri::WebviewWindowBuilder::new(&app, "auth", tauri::WebviewUrl::External(url))
|
||||
.title("Microsoft Login")
|
||||
.inner_size(500.0, 700.0)
|
||||
@@ -74,7 +75,8 @@ pub fn auth_create_link(app: AppHandle) -> Result<String, String> {
|
||||
true
|
||||
})
|
||||
.build()
|
||||
.map_err(|e| e.to_string())?;
|
||||
.map_err(|e| e.to_string()).unwrap();
|
||||
});
|
||||
|
||||
Ok(link)
|
||||
}
|
||||
|
||||
@@ -14,7 +14,9 @@
|
||||
{
|
||||
"title": "saturn-launcher",
|
||||
"width": 1000,
|
||||
"height": 650
|
||||
"height": 650,
|
||||
"backgroundColor": "#0a0a0a",
|
||||
"visible": false
|
||||
}
|
||||
],
|
||||
"security": {
|
||||
|
||||
@@ -8,6 +8,7 @@ import { versions } from "./lib/launcher";
|
||||
import { GameVersion } from "./lib/types";
|
||||
import { MinecraftAccount } from "./lib/auth";
|
||||
import { getVersion, updateVersion } from "./lib/saturn";
|
||||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
||||
|
||||
type Section = "play" | "mods" | "settings";
|
||||
|
||||
@@ -61,6 +62,12 @@ export default function App() {
|
||||
if (selectedVersion?.id) updateVersion(selectedVersion?.id);
|
||||
}, [selectedVersion]);
|
||||
|
||||
useEffect(() => {
|
||||
const window = getCurrentWindow();
|
||||
|
||||
window.show();
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="flex h-screen">
|
||||
<Sidebar active={active} setActive={setActive} />
|
||||
|
||||
Reference in New Issue
Block a user