Skip to content

Commit

Permalink
Merge pull request #11 from lu2000luk/main
Browse files Browse the repository at this point in the history
Update to 0.9.5
  • Loading branch information
lu2000luk authored Jun 30, 2024
2 parents c248338 + 7c1908a commit 5602d20
Show file tree
Hide file tree
Showing 20 changed files with 699 additions and 168 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# ETB Rocket
Im rly tired so i aint writing a long ahh readme for this. Ill do it in the future, for now ill just make some base UI stuff so i can get hype from the guys on the ds while i learn rust.
This CURRENTLY IN BETA mod installer will simplify the process of installing EscapeTheBackrooms mods with a mod hosting system and nexus integration for the authors that want to stick with them (I understand). Lots of features are still missing so dont expect much. Plans for social integrations, profiles (packs) & in-game inegrations are scheduled for past stable. The app is made with a SvelteKit (TS, Tailwind & Bits UI) frontend and a (scuffed) Rust backend. Contributing to the project whould be actually amazing, expecially for the Rust side.

# Building the app by yourself
Step 1: Download repo
Step 1: Download repo (Possibly the [Release Branch](https://github.com/lu2000luk/ETBRocket/tree/release))

Step 2: Install Rust, NodeJS (comes with NPM) and PNPM

Expand All @@ -13,4 +13,6 @@ Step 4: In the terminal type "pnpm tauri build"
Then you'll suffer for my shitty code but it should build the app, for any questions ask on Discord or make an Issue
(You might need to disable the antivirus to build, check tauri's ds for an exaplanation)

For the ones that understand JS package managers & runtimes PNPM should not be necessary but to avoid any errors, since i use it, i suggest using it but it should also work with NPM, Yarn and Bun (The runtime should be supported)

Github Actions will also build the app for you automatically when i merge to the release branch
Binary file added bun.lockb
Binary file not shown.
70 changes: 36 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
{
"name": "etbrocket",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
},
"devDependencies": {
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@tauri-apps/cli": "^1.5.11",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"svelte": "^4.2.7",
"svelte-check": "^3.6.0",
"tailwindcss": "^3.4.1",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.0.3"
},
"type": "module",
"dependencies": {
"@tauri-apps/api": "^1.5.3",
"appwrite": "^14.0.0",
"bits-ui": "^0.20.1",
"crypto-js": "^4.2.0",
"lucide-svelte": "^0.363.0",
"svelte-persisted-store": "^0.9.1"
}
"name": "etbrocket",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
},
"devDependencies": {
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@tauri-apps/cli": "^1.5.11",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"svelte": "^4.2.7",
"svelte-check": "^3.6.0",
"tailwindcss": "^3.4.1",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.0.3"
},
"type": "module",
"dependencies": {
"@tauri-apps/api": "^1.5.3",
"appwrite": "^14.0.0",
"bits-ui": "^0.20.1",
"crypto-js": "^4.2.0",
"gsap": "^3.12.5",
"lucide-svelte": "^0.363.0",
"svelte-persisted-store": "^0.9.1",
"unzipit": "^1.4.3"
}
}
7 changes: 7 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

85 changes: 85 additions & 0 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "app"
version = "0.1.0"
description = "A Tauri App"
authors = ["you"]
authors = ["lu2000luk"]
license = ""
repository = ""
default-run = "app"
Expand All @@ -17,6 +17,7 @@ tauri-build = { version = "1.5.1", features = [] }
[dependencies]
serde_json = "1.0"
winreg = "0.52"
tauri-plugin-deep-link = "0.1.2"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.6.1", features = [ "shell-open", "path-all", "http-all", "devtools", "dialog-all", "fs-all"] }
reqwest = { version = "0.11", features = ["json"] }
Expand Down
27 changes: 26 additions & 1 deletion src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,30 @@ use std::io::ErrorKind;
use winreg::RegKey;

fn main() {
tauri_plugin_deep_link::prepare("de.fabianlars.deep-link-test");

tauri::Builder::default()
.setup(|app| {
let handle = app.handle();
tauri_plugin_deep_link::register(
"nxm",
move |request| {
dbg!(&request);
handle.emit_all("scheme-request-received", request).unwrap();
},
)
.unwrap();

// If you also need the url when the primary instance was started by the custom scheme, you currently have to read it yourself
/*
#[cfg(not(target_os = "macos"))] // on macos the plugin handles this (macos doesn't use cli args for the url)
if let Some(url) = std::env::args().nth(1) {
app.emit_all("scheme-request-received", url).unwrap();
}
*/

Ok(())
})
.invoke_handler(tauri::generate_handler![expand_scope,get_steam_path])
.run(tauri::generate_context!())
.expect("error while running tauri application");
Expand Down Expand Up @@ -36,4 +59,6 @@ fn get_steam_path() -> String {
});

path.into()
}
}


6 changes: 3 additions & 3 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "ETB Rocket",
"version": "0.8.8"
"version": "0.9.5"
},
"tauri": {
"allowlist": {
Expand Down Expand Up @@ -76,10 +76,10 @@
"windows": [
{
"fullscreen": false,
"height": 600,
"height": 650,
"resizable": true,
"title": "ETB Rocket",
"width": 800
"width": 1000
}
]
}
Expand Down
31 changes: 31 additions & 0 deletions src/app.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,37 @@
<!doctype html>
<html lang="en">
<!--
Hey, psst! You can help the project by contributing to the repository on GitHub!
The app is made in Rust (Tauri) and SvelteKit (TS, Bits UI, Tailwind). You can find the repo here:
-> https://github.com/lu2000luk/ETBRocket/
-->
<head>
<style>
[ui-debug="true"] > * {
outline: 1px solid red;
}

[ui-debug="true"] > * > * {
outline: 1px solid red;
}

[ui-debug="true"] > * > * >* {
outline: 1px solid red;
}

[ui-debug="true"] > * > * > * > * {
outline: 1px solid red;
}

[ui-debug="true"] > * > * > * > * > * {
outline: 1px solid red;
}

[ui-debug="true"] > * > * > * > * > * > * {
outline: 1px solid red;
}
</style>
<meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand Down
Loading

0 comments on commit 5602d20

Please sign in to comment.