diff --git a/README.md b/README.md index 7b2e3ec..972d396 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,16 @@ ## Overview: This is a product API for grocery and item data. It will return information including prices, names, images descriptions, ids, nutrition information, and much more. - I built this API when I tried finding product data for a project, but couldn't find any that worked for my needs. The database is small and only contains 91 products, but new products are added every so often. + I built this API when I tried finding product data for a project, but couldn't find any that worked for my needs. The database is small and only contains 92 products, but new products are added every so often. Newly introduced was the idea of multiple countries. Now, this project will include data from multiple countries. ### By the Numbers: - * 91 total items - * 85 categories + * 92 total items + * 87 categories * 67 different brands * 2 countries - * $235.72 worth of products + * $236.25 worth of products * 119,761 total calories* *some products may not be accounted for due to unreadable or incomplete nutritional information @@ -196,11 +196,13 @@ Available Categories: * candy * wafer + * gummy * (flavors) * orange * chocolate * corn * matcha + * peach * snacks * popcorn * breadsticks diff --git a/data/Japan/data.json b/data/Japan/data.json index 427fb26..71f7765 100644 --- a/data/Japan/data.json +++ b/data/Japan/data.json @@ -100,5 +100,39 @@ "protein": "3 grams" }, "ingredients": "Wheat Flour, Sugar, Blend of Vegetable Oils(Palm Oil, Hydrogenated Palm Kernel Oil, Hydrogenated Palm Oil, Hydrogenated Rapeseed Oil), Whole Milk Powder, Lactose, Vegetable Oil Shortening(Palm Oil, Hydrogenated Palm Oil), Green Tea Powder, Artificial Flavors, Salt, Yeast, Soy Lecithin, Leavening(Sodium Bicarbonate), Mono- And Diglycerides of Fatty Acids, Beta-Carotene Color, Blue 1 Lake Color. Contains Wheat, Milk and Soybeans May Contain Almond and Coconut" + }, + { + "name": "Yaokin Peach Gummy", + "id": "Jfcg004", + "category": ["snacks", "candy", "gummy", "peach"], + "brand": "Yaokin", + "weight": "28 grams", + "hot": false, + "cold": false, + "frozen": false, + "description": "The packet of Peach Gummy is full of delicate aroma that remains in your nose for a while. There are 12 mini gummies in each bag and they easily melt with the warmth of the mouth.", + "price": { + "USD": { + "default": "0.53", + "formatted": "$0.53/each" + }, + "JPY": { + "default": "53", + "formatted": "¥53/each" + } + }, + "image": "http://localhost:8080/Japan/Jfcg004.jpg", + "nutrition": { + "serving size": "", + "servings per container": "", + "calories": "", + "fat": "", + "cholesterol": "", + "sodium": "", + "potassium": "", + "carbohydrates": "", + "protein": "" + }, + "ingredients": "Concentrated Fruit Juice, Acidulant, Cellulose, Collagen, Fragrance, Glycerin, Potassium, Starch, Sugar, Vegetable Oil" } ] \ No newline at end of file diff --git a/data/Japan/masterList.txt b/data/Japan/masterList.txt index 9283cab..1061246 100644 --- a/data/Japan/masterList.txt +++ b/data/Japan/masterList.txt @@ -3,11 +3,13 @@ Country Code: JP Categories: - candy - wafer + - gummy - (flavors) - orange - chocolate - corn - matcha + - peach - snacks - popcorn - breadsticks @@ -23,6 +25,7 @@ Items: - KitKat Chocolate Orange* - Yaokin Salty Popcorn** +- Yaokin Peach Gummy** - Glico Pocky Matcha Chocolate diff --git a/data/Japan/statsTemplate.json b/data/Japan/statsTemplate.json index 837e9e8..bc86c48 100644 --- a/data/Japan/statsTemplate.json +++ b/data/Japan/statsTemplate.json @@ -9,6 +9,8 @@ "popcorn": 0, "corn": 0, "breadsticks": 0, - "matcha": 0 + "matcha": 0, + "gummy": 0, + "peach": 0 } } \ No newline at end of file diff --git a/data/masterList b/data/masterList index 3063520..fc630f6 100644 --- a/data/masterList +++ b/data/masterList @@ -47,6 +47,7 @@ Categories: - bar-candy - bagged-candy - wafer + - gummy - seafood - tuna - crackers @@ -68,6 +69,7 @@ Categories: - fruit - corn - matcha + - peach - pasta - ravioli - meatballs @@ -160,6 +162,7 @@ Brands: - Totino's - Glico - Pocky +- Yaokin Items: - apple @@ -227,7 +230,7 @@ Items: - Aquafina Purified Water, 32 count - Nestle Pure Life Purified Water, 32 count - - KitKat Chocolate Orange + - KitKat Chocolate Orange* - Crystal Geyser Alpine Spring Water, 1 Gallon @@ -305,4 +308,11 @@ Items: - Totino's Party Pizza Pack! 4 Combination Party Pizzas -- Glico Pocky Matcha Chocolate \ No newline at end of file +- Glico Pocky Matcha Chocolate + +- Yaokin Salty Popcorn** +- Yaokin Peach Gummy** + +Due to language barriers, some products may not have complete nutritional information: +*incomplete nutritional information +**incomplete nutritional information and calories not logged in Readme Stats \ No newline at end of file diff --git a/data/masterStatsTemplate.json b/data/masterStatsTemplate.json index 98ae65e..4f5c226 100644 --- a/data/masterStatsTemplate.json +++ b/data/masterStatsTemplate.json @@ -87,6 +87,8 @@ "orange": 0, "corn": 0, "breadsticks": 0, - "matcha": 0 + "matcha": 0, + "gummy": 0, + "peach": 0 } } \ No newline at end of file diff --git a/images/Japan/Jfcg004.jpg b/images/Japan/Jfcg004.jpg new file mode 100644 index 0000000..b310c08 Binary files /dev/null and b/images/Japan/Jfcg004.jpg differ