Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Team3132/AttendanceSystem
Browse files Browse the repository at this point in the history
  • Loading branch information
sebasptsch committed Aug 7, 2024
2 parents d0459e6 + 3fe23e7 commit d3dfc97
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 78 deletions.
4 changes: 2 additions & 2 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"cron": "3.1.7",
"discord-api-types": "0.37.93",
"dotenv": "16.4.5",
"drizzle-orm": "0.32.1",
"drizzle-orm": "0.32.2",
"drizzle-zod": "0.5.1",
"eventemitter3": "5.0.1",
"fastify": "4.28.1",
Expand All @@ -67,7 +67,7 @@
"@types/passport-discord": "0.1.13",
"@types/uuid": "10.0.0",
"@types/ws": "8.5.12",
"drizzle-kit": "0.23.1",
"drizzle-kit": "0.23.2",
"prettier": "3.3.3",
"tsup": "8.2.4",
"typescript": "5.5.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@biomejs/biome": "1.8.3",
"@swc/plugin-emotion": "3.0.12",
"@tanstack/router-plugin": "1.46.6",
"@tauri-apps/cli": "2.0.0-rc.1",
"@tauri-apps/cli": "2.0.0-rc.2",
"@trpc/client": "11.0.0-rc.477",
"@trpc/react-query": "11.0.0-rc.477",
"@trpc/server": "11.0.0-rc.477",
Expand Down
30 changes: 15 additions & 15 deletions packages/frontend/src-tauri/Cargo.lock

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

4 changes: 2 additions & 2 deletions packages/frontend/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[build-dependencies]
tauri-build = { version = "=2.0.0-rc.0", features = [] }
tauri-build = { version = "=2.0.0-rc.1", features = [] }

[dependencies]
tauri = { version = "=2.0.0-rc.0", features = ["devtools"] }
tauri = { version = "=2.0.0-rc.1", features = ["devtools"] }
tauri-plugin-shell = "=2.0.0-rc.0"
serde_json = "=1.0.122"
tauri-plugin-websocket = "=2.0.0-rc.0"
Expand Down
116 changes: 58 additions & 58 deletions pnpm-lock.yaml

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

0 comments on commit d3dfc97

Please sign in to comment.