feat: added mackdown parser

frontend/src/Pages/Blog.elm

@@ -1,4 +1,4 @@
-module Pages.HyperBlog exposing (Model, Msg, page)
+module Pages.Blog exposing (Model, Msg, page)
 
 import Config.Data.Identity exposing (pageNames)
 import Config.Helpers.CardFormat

frontend/src/Pages/Blog/Seedoils.elm

@@ -0,0 +1,166 @@
+module Pages.Blog.Seedoils exposing (Model, Msg, page)
+
+import Config.Data.Identity exposing (pageNames)
+import Config.Helpers.CardFormat
+    exposing
+        ( cardContentSpacing
+        , cardFormatter
+        , cardMaker
+        , cardSubTitleMaker
+        , cardTitleMaker
+        , desktopCardMaker
+        , desktopImageBoxSize
+        , desktopImageSize
+        , fieldSpacer
+        , mobileCardMaker
+        , mobileImageBoxSize
+        , mobileImageSize
+        , topLevelBox
+        )
+import Config.Helpers.Format exposing (..)
+import Config.Helpers.Header
+    exposing
+        ( Header
+        , headerMaker
+        )
+import Config.Helpers.Markdown exposing (..)
+import Config.Helpers.Response
+    exposing
+        ( pageList
+        , topLevelContainer
+        )
+import Config.Helpers.StrengthBar
+    exposing
+        ( barMaker
+        , barPadding
+        )
+import Config.Helpers.ToolTip exposing (..)
+import Config.Helpers.Viewport exposing (resetViewport)
+import Config.Pages.Blog.Records.SeedOils exposing (articleSeedOils)
+import Config.Pages.Contact.Types exposing (..)
+import Config.Pages.Interviews.Types exposing (..)
+import Config.Pages.Products.Types exposing (..)
+import Config.Style.Colour exposing (colourTheme)
+import Config.Style.Transitions
+    exposing
+        ( hoverFontDarkOrange
+        , transitionStyleFast
+        , transitionStyleSlow
+        )
+import Effect exposing (Effect)
+import Element as E exposing (..)
+import Element.Background as B
+import Element.Border as D
+import Element.Font as F
+import Html
+import Html.Attributes as H exposing (style)
+import Layouts
+import Page exposing (Page)
+import Route exposing (Route)
+import Shared exposing (..)
+import View exposing (View)
+
+
+page : Shared.Model -> Route () -> Page Model Msg
+page shared route =
+    Page.new
+        { init = init
+        , update = update
+        , subscriptions = subscriptions
+        , view = view shared
+        }
+        |> Page.withLayout toLayout
+
+
+toLayout : Model -> Layouts.Layout Msg
+toLayout model =
+    Layouts.Navbar {}
+
+
+
+-- INIT
+
+
+type alias Model =
+    {}
+
+
+init : () -> ( Model, Effect Msg )
+init () =
+    ( {}
+    , Effect.none
+    )
+
+
+
+-- UPDATE
+
+
+type Msg
+    = NoOp
+
+
+update : Msg -> Model -> ( Model, Effect Msg )
+update msg model =
+    case msg of
+        NoOp ->
+            ( model
+            , Effect.none
+            )
+
+
+
+-- SUBSCRIPTIONS
+
+
+subscriptions : Model -> Sub Msg
+subscriptions model =
+    Sub.none
+
+
+
+-- VIEW
+
+
+view : Shared.Model -> Model -> View Msg
+view shared model =
+    { title = pageNames.pageContact
+    , attributes = []
+    , element = articleContainer shared.device
+    }
+
+
+articleContainer : Device -> Element msg
+articleContainer device =
+    topLevelContainer (articleList device)
+
+
+articleList : Device -> Element msg
+articleList device =
+    column pageList <|
+        List.concat
+            (case ( device.class, device.orientation ) of
+                _ ->
+                    [ [ articleMaker ] ]
+            )
+
+
+articleMaker : Element msg
+articleMaker =
+    column
+        topLevelBox
+        [ cardMaker
+            [ cardTitleMaker (String.toUpper articleSeedOils.articleName)
+            , cardFormatter
+                [ cardContentSpacing
+                    [ column
+                        fieldSpacer
+                        [ cardSubTitleMaker
+                            [ articleImage articleSeedOils.articleImage
+                            , renderDeviceMarkdown articleSeedOils.articleBody
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]

frontend/src/Pages/Contact.elm

@@ -18,6 +18,11 @@ import Config.Helpers.CardFormat
         , topLevelBox
         )
 import Config.Helpers.Format exposing (..)
+import Config.Helpers.Header
+    exposing
+        ( Header
+        , headerMaker
+        )
 import Config.Helpers.Response
     exposing
         ( pageList
@@ -31,11 +36,6 @@ import Config.Helpers.StrengthBar
 import Config.Helpers.ToolTip exposing (..)
 import Config.Helpers.Viewport exposing (resetViewport)
 import Config.Pages.Contact.Types exposing (..)
-import Config.Helpers.Header
-    exposing
-        ( Header
-        , headerMaker
-        )
 import Config.Pages.Interviews.Types exposing (..)
 import Config.Pages.Products.Types exposing (..)
 import Config.Style.Colour exposing (colourTheme)
@@ -365,13 +365,15 @@ rounding =
 
 termsAndConditions : List (List (Element msg))
 termsAndConditions =
-    [ [ paragraph [ alignLeft ]
-            [ text "You will register an account with "
-            , newTabLink []
-                { url = "https://discord.com/login"
-                , label = el orangeFormat <| text "Discord"
-                }
-            , text " (if you haven't already)."
+    [ [ row []
+            [ paragraph [ alignLeft ]
+                [ text "You will register an account with "
+                , newTabLink []
+                    { url = "https://discord.com/login"
+                    , label = el orangeFormat <| text "Discord"
+                    }
+                , text " (if you haven't already)."
+                ]
             ]
       ]
     , [ row [ alignLeft ]
@@ -383,7 +385,10 @@ termsAndConditions =
             , text " Discord Server (if you haven't already)."
             ]
       ]
-    , [ el [ alignLeft ] <| text "You will click the \"😃\" emoji to enter the server (if you haven't already)." ]
+    , [ row [ alignLeft ]
+            [ text "You will click the \"😃\" emoji to enter the server (if you haven't already)."
+            ]
+      ]
     , [ paragraph [ alignLeft ]
             [ text "You will locate the "
             , newTabLink []

frontend/src/Pages/NotFound_.elm

@@ -137,3 +137,155 @@ notFoundList device =
                     Landscape ->
                         none
         ]
+
+-- import Config.Data.Identity exposing (pageNames)
+-- import Config.Helpers.CardFormat
+--     exposing
+--         ( cardContentSpacing
+--         , cardFormatter
+--         , cardMaker
+--         , cardTitleMaker
+--         , desktopCardMaker
+--         , desktopImageBoxSize
+--         , desktopImageSize
+--         , fieldSpacer
+--         , mobileCardMaker
+--         , mobileImageBoxSize
+--         , mobileImageSize
+--         , topLevelBox
+--         )
+-- import Config.Helpers.Header
+--     exposing
+--         ( Header
+--         , headerMaker
+--         )
+-- import Config.Helpers.Markdown exposing (..)
+-- import Config.Helpers.Response
+--     exposing
+--         ( pageList
+--         , pageListCenter
+--         , topLevelContainer
+--         )
+-- import Effect exposing (Effect)
+-- import Element as E exposing (..)
+-- import Element.Background as B
+-- import Element.Border as D
+-- import Element.Font as F
+-- import Html exposing (br)
+-- import Html.Attributes as H exposing (style)
+-- import Layouts
+-- import Markdown.Block as Block
+-- import Markdown.Html
+-- import Markdown.Parser
+-- import Markdown.Renderer
+-- import Page exposing (Page)
+-- import Route exposing (Route)
+-- import Route.Path
+-- import Shared
+-- import View exposing (View)
+
+
+-- page : Shared.Model -> Route () -> Page Model Msg
+-- page shared route =
+--     Page.new
+--         { init = init
+--         , update = update
+--         , subscriptions = subscriptions
+--         , view = view shared
+--         }
+--         |> Page.withLayout toLayout
+
+
+-- toLayout : Model -> Layouts.Layout Msg
+-- toLayout model =
+--     Layouts.Navbar {}
+
+
+
+-- -- INIT
+
+
+-- type alias Model =
+--     { markdown : String }
+
+
+-- init : () -> ( Model, Effect Msg )
+-- init () =
+--     ( { markdown = """
+
+-- markdown goes here!
+
+-- """ }
+--     , Effect.none
+--     )
+
+
+
+-- -- UPDATE
+
+
+-- type Msg
+--     = NoOp
+--     | UpdateMarkdown String
+
+
+-- update : Msg -> Model -> ( Model, Effect Msg )
+-- update msg model =
+--     case msg of
+--         NoOp ->
+--             ( model, Effect.none )
+
+--         UpdateMarkdown newMarkdown ->
+--             ( { model | markdown = newMarkdown }, Effect.none )
+
+
+
+-- -- SUBSCRIPTIONS
+
+
+-- subscriptions : Model -> Sub Msg
+-- subscriptions model =
+--     Sub.none
+
+
+
+-- -- VIEW
+
+
+-- view : Shared.Model -> Model -> View Msg
+-- view shared model =
+--     { title = pageNames.pageNotFound
+--     , attributes = []
+--     , element = notFoundContainer shared.device model
+--     }
+
+
+-- notFoundContainer : Device -> Model -> Element Msg
+-- notFoundContainer device model =
+--     topLevelContainer (notFoundList device model)
+
+
+-- notFoundList : Device -> Model -> Element Msg
+-- notFoundList device model =
+--     column pageListCenter
+--         [ case renderMarkdown model.markdown of
+--             Ok renderedMarkdown ->
+--                 column
+--                     [ E.spacing 30
+--                     , E.padding 20
+--                     , E.width E.fill
+--                     , E.centerX
+--                     ]
+--                     renderedMarkdown
+
+--             Err error ->
+--                 E.text error
+--         ]
+
+
+-- renderMarkdown : String -> Result String (List (Element Msg))
+-- renderMarkdown markdown =
+--     markdown
+--         |> Markdown.Parser.parse
+--         |> Result.mapError (\error -> error |> List.map Markdown.Parser.deadEndToString |> String.join "\n")
+--         |> Result.andThen (Markdown.Renderer.render elmUiRenderer)

frontend/src/Pages/Services/Analysis.elm

@@ -3,13 +3,13 @@ module Pages.Services.Analysis exposing (Model, Msg, page)
 import Config.Helpers.ArticleFormat exposing (..)
 import Config.Helpers.CardFormat exposing (..)
 import Config.Helpers.Format exposing (..)
-import Config.Helpers.Response exposing (pageList, topLevelContainer)
-import Config.Helpers.ToolTip exposing (..)
 import Config.Helpers.Header
     exposing
         ( Header
         , headerMaker
         )
+import Config.Helpers.Response exposing (pageList, topLevelContainer)
+import Config.Helpers.ToolTip exposing (..)
 import Config.Pages.Services.Records.DebateAnalysis exposing (..)
 import Config.Style.Colour exposing (colourTheme)
 import Config.Style.Transitions
@@ -134,8 +134,6 @@ serviceMaker =
                                 , chunkMaker
                                     servicesDebateAnalysis.serviceArticle.articleParagraph.paragraph2
                                 , titleMaker servicesDebateAnalysis.serviceArticle.articleTitles.title1
-
-                                -- , highlightedBlockMaker
                                 , numberMaker servicesDebateAnalysis.serviceArticle.articleListEntries.list1
                                 , titleMaker servicesDebateAnalysis.serviceArticle.articleTitles.title2
                                 , bulletPointMaker servicesDebateAnalysis.serviceArticle.articleListEntries.list2

frontend/src/Pages/Services/Nutrition.elm

@@ -3,17 +3,17 @@ module Pages.Services.Nutrition exposing (Model, Msg, page)
 import Config.Helpers.ArticleFormat exposing (..)
 import Config.Helpers.CardFormat exposing (..)
 import Config.Helpers.Format exposing (..)
+import Config.Helpers.Header
+    exposing
+        ( Header
+        , headerMaker
+        )
 import Config.Helpers.Response
     exposing
         ( pageList
         , topLevelContainer
         )
 import Config.Helpers.ToolTip exposing (..)
-import Config.Helpers.Header
-    exposing
-        ( Header
-        , headerMaker
-        )
 import Config.Pages.Services.Records.NutritionScience exposing (servicesNutritionScience)
 import Config.Style.Colour exposing (colourTheme)
 import Config.Style.Transitions
@@ -137,8 +137,6 @@ serviceMaker =
                                 [ chunkMaker servicesNutritionScience.serviceArticle.articleParagraph.paragraph1
                                 , chunkMaker servicesNutritionScience.serviceArticle.articleParagraph.paragraph2
                                 , titleMaker servicesNutritionScience.serviceArticle.articleTitles.title1
-
-                                -- , highlightedBlockMaker
                                 , numberMaker servicesNutritionScience.serviceArticle.articleListEntries.list1
                                 , titleMaker servicesNutritionScience.serviceArticle.articleTitles.title2
                                 , bulletPointMaker servicesNutritionScience.serviceArticle.articleListEntries.list2