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.

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

feat: add tauri #881

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open
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: 2 additions & 0 deletions .talismanrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ fileignoreconfig:
checksum: 5a6da61da0549a02ea89b3fc899e9c655a4455a72d33b0b80024b6af85e1a897
- filename: dashboard/.yarnrc.yml
checksum: 6b12c3fee90382d0b475cdd6e33b78871ba826a1e50564ee3ef4e2ab4100c3f6
- filename: dashboard/src-tauri/Cargo.lock
checksum: 21f9f09e7bdc1949cf463f0956ebe8f7a1202e0a8f7ac141eff469dfb72fb91d
- filename: dashboard/src/components/drawer.js
checksum: fb4bb430f0756b68a9be72fc54e29bfbcd8a22a5a87661fd9cc033f4632dd254
- filename: dashboard/src/recoil/evolutiveStats.ts
Expand Down
10 changes: 9 additions & 1 deletion api/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,15 @@ if (process.env.NODE_ENV === "production") {
app.use(
cors({
credentials: true,
origin: ["http://localhost:1420", "http://localhost:4145", "http://localhost:8083", "http://localhost:8090", "http://localhost:3000"],
origin: [
"tauri://localhost",
"http://localhost:1420",
"http://localhost:4145",
"http://localhost:8083",
"http://localhost:8084",
"http://localhost:8090",
"http://localhost:3000",
],
})
);
}
Expand Down
2 changes: 0 additions & 2 deletions dashboard/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

/src-tauri

# Sentry Auth Token
.sentryclirc

Expand Down
5 changes: 5 additions & 0 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
"@sentry/browser": "^6.19.7",
"@sentry/react": "^7.116.0",
"@sentry/vite-plugin": "^2.17.0",
"@tauri-apps/cli": "^2.2.2",
"@tauri-apps/plugin-http": "~2",
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-sql": "^2.2.0",
"@ungap/structured-clone": "^1.2.0",
"@zip.js/zip.js": "^2.7.48",
"base-64": "^1.0.0",
Expand Down Expand Up @@ -90,6 +94,7 @@
},
"scripts": {
"dev": "vite --port 8083",
"dev-tauri": "vite --port 8084",
"dev-test": "vite --port 8090",
"test": "jest",
"start": "serve -s build -l 8083",
Expand Down
4 changes: 4 additions & 0 deletions dashboard/src-tauri/.gitignore
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