diff --git a/frontend/elm.json b/frontend/elm.json index 98ed09c..cacfb61 100755 --- a/frontend/elm.json +++ b/frontend/elm.json @@ -15,6 +15,7 @@ "elm/url": "1.0.0", "elm-community/list-extra": "8.7.0", "elm-community/maybe-extra": "5.3.0", + "hecrj/html-parser": "2.4.0", "mdgriffith/elm-ui": "1.1.8" }, "indirect": { diff --git a/frontend/src/Config/CardFormat.elm b/frontend/src/Config/CardFormat.elm index c584784..2799aef 100755 --- a/frontend/src/Config/CardFormat.elm +++ b/frontend/src/Config/CardFormat.elm @@ -31,12 +31,7 @@ cardMaker = [ E.width <| px 650 , D.width 5 , D.color colourTheme.backgroundDarkGrey - , D.roundEach - { topLeft = 32 - , topRight = 32 - , bottomRight = 32 - , bottomLeft = 32 - } + , D.rounded 32 ] diff --git a/frontend/src/Debate/Gibberish/Domains/Epistemology.elm b/frontend/src/Debate/Gibberish/Domains/Epistemology.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Debate/Gibberish/Domains/Metaphysics.elm b/frontend/src/Debate/Gibberish/Domains/Metaphysics.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Debate/Gibberish/Domains/Normativity.elm b/frontend/src/Debate/Gibberish/Domains/Normativity.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Debate/Gibberish/Domains/Ontology.elm b/frontend/src/Debate/Gibberish/Domains/Ontology.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Debate/Gibberish/Domains/PhilOfLanguage.elm b/frontend/src/Debate/Gibberish/Domains/PhilOfLanguage.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Debate/Gibberish/Domains/PhilOfMind.elm b/frontend/src/Debate/Gibberish/Domains/PhilOfMind.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Debate/Gibberish/Domains/Theology.elm b/frontend/src/Debate/Gibberish/Domains/Theology.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Debate/Gibberish/Helpers.elm b/frontend/src/Debate/Gibberish/Helpers.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Debate/Gibberish/Types.elm b/frontend/src/Debate/Gibberish/Types.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Helpers.elm b/frontend/src/Headers/Helpers.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Pages/Arguments.elm b/frontend/src/Headers/Pages/Arguments.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Pages/Contact.elm b/frontend/src/Headers/Pages/Contact.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Pages/CuckList.elm b/frontend/src/Headers/Pages/CuckList.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Pages/Donate.elm b/frontend/src/Headers/Pages/Donate.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Pages/HyperBlog.elm b/frontend/src/Headers/Pages/HyperBlog.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Pages/Interviews.elm b/frontend/src/Headers/Pages/Interviews.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Pages/NutriDex.elm b/frontend/src/Headers/Pages/NutriDex.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Pages/Services.elm b/frontend/src/Headers/Pages/Services.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Headers/Types.elm b/frontend/src/Headers/Types.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Pages/Nutridex.elm b/frontend/src/Pages/Nutridex.elm old mode 100644 new mode 100755 diff --git a/frontend/src/Products/Helpers.elm b/frontend/src/Products/Helpers.elm old mode 100644 new mode 100755 index 6e1c9e0..9d1f0fe --- a/frontend/src/Products/Helpers.elm +++ b/frontend/src/Products/Helpers.elm @@ -9,6 +9,7 @@ import Effect exposing (Effect) import Element as E exposing (..) import Element.Background as B exposing (..) import Element.Border as D +import Element.Events exposing (onClick) import Element.Font as F import Headers.Types exposing (..) import Html.Attributes as H exposing (style) @@ -46,7 +47,6 @@ nutriDexMaker nutridex = , left = 25 , right = 15 } - , alignBottom , width fill , F.center , D.roundEach @@ -68,9 +68,114 @@ nutriDexMaker nutridex = , F.center ] ) - [ text nutridex.nutriDexTitle ] + [ featureList nutridex ] ] ] ] ] ] + + +makeFeature : Features -> Element msg +makeFeature features = + column + [ E.width fill + , paddingEach + { top = 0 + , right = 0 + , bottom = 0 + , left = 8 + } + ] + [ row [ E.width fill ] + [ column [ E.width fill ] + [ paragraph [ F.regular, F.alignLeft ] + [ text ("‣ " ++ features.feature) ] + ] + ] + ] + + +featureList : NutriDex -> Element msg +featureList nutridex = + column + [ spacing 8 + , width fill + , height fill + ] + [ row + [ spacing 20 + , width fill + , height fill + ] + [ column + [] + [ column + [ spacing 20 + ] + [ row + [ D.rounded 25 + , D.width 5 + , centerX + , D.color colourTheme.backgroundLightGrey + , B.color colourTheme.backgroundLightGrey + ] + [ E.image + [ D.rounded 20 + , clip + , E.width <| px 305 + , E.height <| px 231 + ] + { src = "nutridex/nutridex.png", description = "" } + ] + , row + [ D.width 5 + , D.rounded 25 + , centerX + , D.color colourTheme.backgroundLightGrey + , B.color colourTheme.backgroundLightGrey + ] + [ row + [ B.color colourTheme.textDarkOrange + , D.rounded 30 + , F.size 25 + , F.bold + , paddingEach + { top = 10 + , right = 25 + , bottom = 10 + , left = 25 + } + ] + [ newTabLink [] + { url = "https://the-nutrivore.myshopify.com/cart/31192710807615:1?channel=buy_button" + , label = row [ F.center ] [ text "Purchase!" ] + } + ] + ] + ] + , column + [ centerX ] + [ column + [ F.size 18 + , F.bold + , F.color colourTheme.textLightOrange + ] + [ newTabLink [] + { url = "https://drive.google.com/file/d/1sk7VgjuL2rEqQdnBRdZjr2_Ab9vwrbmo/view?usp=sharing" + , label = + paragraph + [ centerX + , centerY + ] + [ text "Cost Efficiency Score!" ] + } + ] + ] + ] + , column [ width fill, F.size 12, spacing 3 ] <| + List.map2 (\x y -> makeFeature x) + nutridex.nutriDexFeatures + (List.range 1 (List.length nutridex.nutriDexFeatures)) + ] + ] diff --git a/frontend/src/Products/NutriDex/NutriDex.elm b/frontend/src/Products/NutriDex/NutriDex.elm old mode 100644 new mode 100755 index 052f339..91c0308 --- a/frontend/src/Products/NutriDex/NutriDex.elm +++ b/frontend/src/Products/NutriDex/NutriDex.elm @@ -7,7 +7,27 @@ productNutriDex : NutriDex productNutriDex = { nutriDexTitle = "The NutriDex" , nutriDexFeatures = - [ { feature = "feature" + [ { feature = "Nutrient Density Scoring: The essential nutrient yields of over 700 foods are ranked and adjusted for bioavailability, nutrient absorption capacity, and metabolic conversion inefficiencies!" + } + , { feature = "Specialized Nutrition Scoring: Figure out the right foods for you with 30 different nutrition scores that stratify foods by a number of different dietary goals!\n" + } + , { feature = "Custom Nutrition Scoring: Use the included Custom Score tab to help create your own personal nutrition score to plan your own ideal diet!" + } + , { feature = "Diverse Nutrition Data: Custom-tailor your diet with in-depth nutrition data, including oxalates, phytates, glycemic index, glycemic load, satiety, FODMAPs, PCDAAS, price, shelf life, and over 500 polyphenolic compounds!" + } + , { feature = "Hazard Profiles: Avoid potential hazards from certain nutrients and other compounds with the included hazard profile data!" + } + , { feature = "Vegan-Friendly Categorization: Use the included vegan-friendly categorization to help you navigate through the best vegan options!" + } + , { feature = "Keto-Friendly Categorization: Use the included keto-friendly categorization to help you navigate through the best keto options!" + } + , { feature = "Grocery List: Keep expenses in check with an interactive grocery list that can intelligently estimate the cost of your grocery trip.\n" + } + , { feature = "Nutrition Analyser: Use the included nutrition analyser to quantify the nutrient content of your food selection, and minimize anti-nutrients, hunger, calories, sugar, and more!" + } + , { feature = "Meal Schedule: Schedule your meals and workouts, as well as calculate your calorie and macro requirements based on your goals and body composition!" + } + , { feature = "Regular Updates: The Nutri-Dex is also regularly updated with new foods and nutrition data!" } ] , nutriDexReference = diff --git a/frontend/src/Products/Types.elm b/frontend/src/Products/Types.elm old mode 100644 new mode 100755 diff --git a/frontend/static/donate/gibberish.gif b/frontend/static/donate/gibberish.gif old mode 100644 new mode 100755 diff --git a/frontend/static/gibberish/gibberish.png b/frontend/static/gibberish/gibberish.png old mode 100644 new mode 100755 diff --git a/frontend/static/nutridex/nutridex.png b/frontend/static/nutridex/nutridex.png new file mode 100644 index 0000000..d44a66d Binary files /dev/null and b/frontend/static/nutridex/nutridex.png differ