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 e78fc46 + b294354 commit 9843170
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion backend/app/routers/meetings.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def read_meetings(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)
meetings = get_meetings(db, skip=skip, limit=limit)
return meetings

@router.get("/meetings/{user_id}", response_model=List[schemas.MeetingStatusUser])
@router.get("/meetings/by_user/{user_id}", response_model=List[schemas.MeetingStatusUser])
def read_meetings_by_user(user_id: int, db: Session = Depends(get_db)):
status_meetings = []
meetings = get_meetings(db)
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/MeetingsDrawer/MeetingsDrawer.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.ButtonWrapper {
display: flex;
justify-content: center;
justify-content: flex-start;
align-items: center;
margin: 16px;
margin-left: 32px;
margin-top: 32px;
}
2 changes: 1 addition & 1 deletion frontend/src/components/MeetingsDrawer/MeetingsDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export const MeetingsDrawer = ({
<Toolbar />
<div className="ButtonWrapper">
<Button variant="outlined" href="#/prep-now">
Prep Now
Create New Meeting
</Button>
</div>
<List>
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/container/PrepNow/PrepNow.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from "react"

export const PrepNow = () => {
return (
<div>
<h1>Prep Now</h1>
<h1>Create New meetings</h1>
</div>
)
}

0 comments on commit 9843170

Please sign in to comment.