Skip to content

Commit d8d3527

Browse files
authored
Merge pull request #42 from UBC-MDS/prep_submission
Added link to readme
2 parents 24bbbb2 + a1df42b commit d8d3527

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# MacroView
22

3+
Available at: https://macroview.shinyapps.io/MacroView-v1/
4+
35
## Group Members
46

57
- Austin Shih @austin-shih
@@ -9,24 +11,24 @@
911

1012
## Overview
1113

12-
This repository contains the MacroView dashboard project. The project aims to create an application that allows potential users track their daily calorie/ macronutrient intake by using the `Nutrient Value of Some Common Foods` dataset (accessed [here](https://open.canada.ca/data/en/dataset/a289fd54-060c-4a96-9fcf-b1c6e706426f).
14+
This repository contains the MacroView dashboard project. The project aims to create an application that allows potential users track their daily calorie/ macronutrient intake by using the `Nutrient Value of Some Common Foods` dataset (accessed [here](https://open.canada.ca/data/en/dataset/a289fd54-060c-4a96-9fcf-b1c6e706426f).
1315

1416

1517
## Who are we and who should use this dashboard?
1618

17-
We are a team of 5 [UBC MDS](https://masterdatascience.ubc.ca/) students who created this Shiny app as part of the masters program and hope to empowering individuals to make informed and healthy lifestyle choices.
19+
We are a team of 5 [UBC MDS](https://masterdatascience.ubc.ca/) students who created this Shiny app as part of the masters program and hope to empowering individuals to make informed and healthy lifestyle choices.
1820

1921
This dashboard is essentially a nutrition tracking dashboard that enables health-conscious individuals to accurately track and visualize their macronutrient intake. Our intended users are anyone who wants to track their nutrition easily, for free, and with reliable nutrition data. MacroView will be accessible for both experienced body-builders and individuals who are new to nutrition tracking and don't know where to start.
2022

21-
## Dashboard Functionality
23+
## Dashboard Functionality
2224

23-
The dashboard will have four tabs, `Main Dashboard`, `About`, `Data`, `Download`, and `Statistics`, with the `Main Dashboard` tab containing the main app funcionality. The live app can be accessed [here](https://macroview.shinyapps.io/MacroView-v1/).
25+
The dashboard will have four tabs, `Main Dashboard`, `About`, `Data`, `Download`, and `Statistics`, with the `Main Dashboard` tab containing the main app funcionality. The live app can be accessed [here](https://macroview.shinyapps.io/MacroView-v1/).
2426

25-
The `Main Dashboard` layout will have user input on the left and visualizations on the right.
27+
The `Main Dashboard` layout will have user input on the left and visualizations on the right.
2628
![](img/dashboard.png)
2729

2830

29-
On the left hand columns there are two input categories, one for setting up macro nutrient targets either by slider bars or direct user input, and the other for inputting actual food intake items by weight to visually determine if targets are met.
31+
On the left hand columns there are two input categories, one for setting up macro nutrient targets either by slider bars or direct user input, and the other for inputting actual food intake items by weight to visually determine if targets are met.
3032
![](img/user_input.png)
3133

3234
Once targets and food items are populated, two graphics will be displayed to visualize targets and inputs. The top 'Totals' figure will display the user input information as a bar plot indicating total calories, and caloric breakdown by macro nutrients (protein, carbs, fat) as well as user targets.
@@ -35,7 +37,7 @@ Once targets and food items are populated, two graphics will be displayed to vis
3537
The bottom figure will plot the specific caloric intake and targets as a stacked bar plot showing the proportional breakdown of user inputs.
3638
![](img/proportions.png)
3739

38-
## Continuous Development
40+
## Continuous Development
3941

4042
Want to help improve this app? Please check out the [contributing guidelines](https://github.com/UBC-MDS/MacroView/blob/main/CONTRIBUTING.md) and [code of conduct](https://github.com/UBC-MDS/MacroView/blob/main/CODE_OF_CONDUCT.md).
4143

src/server.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ observeEvent(input$carbSlider, {
5353
})
5454

5555
# read data and select relevent columns
56-
data <- read.csv('../data/cleaned_dataset.csv') |>
56+
data <- read.csv('https://raw.githubusercontent.com/UBC-MDS/MacroView/main/data/cleaned_dataset.csv') |>
5757
select(c('Food.name', 'Weight', 'Energy', 'Protein', 'Carbohydrate', 'Total.Fat'))
5858
data[nrow(data)+1,] <- c('None', 1, 0, 0, 0, 0)
5959

@@ -316,7 +316,7 @@ observeEvent(input$selectText,{
316316

317317
#Statistics/ Ranking Plot Tab
318318
output$sortedChart <- renderPlotly({
319-
data <- read.csv('../data/cleaned_dataset.csv') |> rename(name = Food.name)
319+
data <- read.csv('https://raw.githubusercontent.com/UBC-MDS/MacroView/main/data/cleaned_dataset.csv') |> rename(name = Food.name)
320320
specCol <- data[, gsub(" ", ".", input$component, fixed=TRUE)]
321321
data$colByWeight <- ifelse(data$Weight == 0, 0, specCol / data$Weight)
322322

0 commit comments

Comments
 (0)