Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/392-f24/OHours
Browse files Browse the repository at this point in the history
  • Loading branch information
jannacylee committed Nov 22, 2024
2 parents 4f5d6ee + 9f08546 commit c2a6eaf
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
6 changes: 6 additions & 0 deletions package-lock 2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "OHours",
"lockfileVersion": 3,
"requires": true,
"packages": {}
}
21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@
"cy:open": "cypress open"
},
"dependencies": {
"@radix-ui/react-alert-dialog": "^1.1.2",
"@radix-ui/react-alert-dialog": "^1.0.5",
"@shadcn/ui": "^0.0.4",
"axios": "^1.7.7",
"firebase": "^10.14.0",
"lucide-react": "^0.447.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.2"
"axios": "^1.6.7",
"firebase": "^10.8.0",
"lucide-react": "^0.330.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.22.0"
},
"devDependencies": {
"@eslint/js": "^9.9.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
Expand All @@ -48,4 +47,4 @@
"vite": "^5.4.1",
"vitest": "^2.1.5"
}
}
}

0 comments on commit c2a6eaf

Please sign in to comment.