Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tauri integration #63

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Tauri integration #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a54d9e0
Tauri integration
zelytra Jul 25, 2024
6a78b58
It boot ! But not working... But it boot !
zelytra Jul 25, 2024
9fb4e31
Now it work ! Well not compltely but it progress !
zelytra Jul 28, 2024
8b1e499
Add http plugin
zelytra Aug 7, 2024
f88a7ff
Update CLI and regenerate the android files
zelytra Aug 7, 2024
38d410f
Update conf files
zelytra Aug 7, 2024
52eb21c
Patch build problems
zelytra Aug 1, 2024
f958856
Integrate android to tauri
zelytra Aug 19, 2024
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
14 changes: 14 additions & 0 deletions backend/src/main/java/fr/zelytra/Public.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package fr.zelytra;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.Response;

@Path("ping")
public class Public {

@GET
public Response get(){
return Response.ok("Pong").build();
}
}
4 changes: 2 additions & 2 deletions webapp/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VITE_BACKEND_HOST="http://127.0.0.1:8080"
VITE_KEYCLOAK_HOST="http://127.0.0.1:24904/auth"
VITE_BACKEND_HOST="http://10.0.2.2:8080"
VITE_KEYCLOAK_HOST="http://10.0.2.2:24904/auth"
VITE_VERSION=$npm_package_version
691 changes: 475 additions & 216 deletions webapp/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,17 @@
"scripts": {
"dev": "vite --host",
"build": "vue-tsc && vite build",
"preview": "vite preview"
"preview": "vite preview",
"tauri": "tauri",
"tauri-dev": "npm run tauri dev",
"tauri-build": "npm run tauri build",
"tauri-android-build": "npm run tauri android build",
"tauri-android-dev": "npm run tauri android dev"
},
"dependencies": {
"@tauri-apps/api": "^2.0.0-beta-rc.3",
"@tauri-apps/cli": "^2.0.0-beta-rc.3",
"@tauri-apps/plugin-http": "^2.0.0-beta-rc.3",
"@types/matter-js": "^0.19.6",
"axios": "^1.7.2",
"drag-drop-touch": "^1.3.1",
Expand All @@ -17,12 +25,14 @@
"mitt": "^3.0.1",
"pinia": "^2.1.7",
"sass": "^1.77.6",
"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v2",
"vue": "^3.4.31",
"vue-i18n": "^9.13.1"
},
"devDependencies": {
"@interactjs/types": "^1.10.27",
"@vitejs/plugin-vue": "^5.0.5",
"eruda": "^3.2.1",
"typescript": "^5.5.3",
"vite": "^5.3.2",
"vue-router": "^4.4.0",
Expand Down
4 changes: 4 additions & 0 deletions webapp/src-tauri/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[build]
target = "x86_64-pc-windows-msvc"

[target]
4 changes: 4 additions & 0 deletions webapp/src-tauri/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Generated by Cargo
# will have compiled files and executables
/target/
/gen/schemas
Loading
Loading