Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

FitUrRing
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5a6f1f3c

Commit 5a6f1f3c authored 6 months ago by 문경호

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feat;식단관리' into feat/diet-merged

parents e1ca022e 8021b6d8

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

front/src/pages/Home.css 116 additions, 7 deletions

front/src/pages/Home.css
front/src/pages/Home.jsx 23 additions, 4 deletions

front/src/pages/Home.jsx
front/src/pages/diet/BmrDisplay.jsx 3 additions, 3 deletions

front/src/pages/diet/BmrDisplay.jsx
front/src/pages/diet/Checkactivity.css 17 additions, 0 deletions

front/src/pages/diet/Checkactivity.css
front/src/pages/diet/Checkactivity.jsx 29 additions, 0 deletions

front/src/pages/diet/Checkactivity.jsx
front/src/pages/diet/Diet.jsx 11 additions, 3 deletions

front/src/pages/diet/Diet.jsx
front/src/pages/diet/MealRecord.jsx 6 additions, 8 deletions

front/src/pages/diet/MealRecord.jsx
front/src/pages/diet/WeightBar.jsx 1 addition, 1 deletion

front/src/pages/diet/WeightBar.jsx
front/src/pages/diet/WeightChart.jsx 50 additions, 11 deletions

front/src/pages/diet/WeightChart.jsx

with 256 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr