Skip to content

Commit

Permalink
Merge branch 'main' of github.com:lukas-holzner/codefusion-hackathon
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert committed Oct 1, 2024
2 parents 17ed84b + 2afff37 commit a749860
Show file tree
Hide file tree
Showing 5 changed files with 395 additions and 11 deletions.
208 changes: 208 additions & 0 deletions frontend/package-lock.json

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

3 changes: 3 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"@emotion/styled": "^11.13.0",
"@mui/base": "^5.0.0-beta.58",
"@mui/icons-material": "^6.1.1",
"@mui/lab": "^6.0.0-beta.10",
"@mui/material": "^6.1.1",
"@mui/x-date-pickers": "^7.18.0",
"@tanstack/react-query": "^5.56.2",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
Expand All @@ -16,6 +18,7 @@
"@types/node": "^22.7.4",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"date-fns": "^4.1.0",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/MeetingsDrawer/MeetingsDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export const MeetingsDrawer = ({
<div>
<Toolbar />
<div className="ButtonWrapper">
<Button variant="outlined" href="#/prep-now">
<Button variant="outlined" href="#/create-meeting">
Create New Meeting
</Button>
</div>
Expand Down
Loading

0 comments on commit a749860

Please sign in to comment.