Dispaly the description of the projects again

* updating `innerHTML` not working since elm@0.19.0: elm/html#172 * used proper HTML parsing from string to generate nodes * correct unparsable description
Pamplemousse · May 23, 2020 · f64d937 · f64d937
1 parent d1e1298
commit f64d937
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/back/models/db.json b/back/models/db.json
@@ -6,10 +6,10 @@
     "dates": "may 2018 - today",
     "tags": "web security, javascript, R&D",
     "links": [{
-      "target": "internship_report_2018.pdf",
-      "value": "See my internship report for a more in depth presentation"
+      "target": "https://blog.xaviermaso.com/2018/10/01/Scanning-modern-web-applications-with-OWASP-ZAP.html",
+      "value": "See the write-up on my blog for a more in-depth presentation."
     }],
-    "description": "Intern at Mozilla during the summer of 2018 in the <a href='https://wiki.mozilla.org/Security/FirefoxOperations' target='_blank'>FoxSec</a> team. I worked on improving <a href='https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project'>OWASP ZAP</a>, for it to be able to scan \"modern\" web applications.<br/>The effort has been focused around two keys areas: write the <a href='https://github.com/zaproxy/zaproxy/issues/4939' target='_blank'>FrontEndScanner addon</a> (not yet released) for ZAP to allow users to run \"client-side scripts\"; and create a front-end library to help debug modern web pages: the <a href='https://www.npmjs.com/package/@zaproxy/front-end-tracker' target='_blank'>@zaproxy/front-end-tracker."
+    "description": "Intern at Mozilla during the summer of 2018 in the <a href='https://wiki.mozilla.org/Security/FirefoxOperations' target='_blank'>FoxSec</a> team. I worked on improving <a href='https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project'>OWASP ZAP</a>, for it to be able to scan \"modern\" web applications.<br/>The effort has been focused around two keys areas: write the <a href='https://github.com/zaproxy/zaproxy/issues/4939' target='_blank'>FrontEndScanner addon</a> (not yet released) for ZAP to allow users to run \"client-side scripts\"; and create a front-end library to help debug modern web pages: the <a href='https://www.npmjs.com/package/@zaproxy/front-end-tracker' target='_blank'>@zaproxy/front-end-tracker</a>."
   }, {
     "id": "1",
     "tileContent": "redshield",

diff --git a/elm.json b/elm.json
@@ -15,11 +15,14 @@
             "elm/url": "1.0.0",
             "elm-community/list-extra": "8.1.0",
             "elm-explorations/markdown": "1.0.0",
+            "hecrj/html-parser": "2.3.4",
             "krisajenkins/remotedata": "5.0.0"
         },
         "indirect": {
+            "elm/parser": "1.1.0",
             "elm/time": "1.0.0",
-            "elm/virtual-dom": "1.0.2"
+            "elm/virtual-dom": "1.0.2",
+            "rtfeldman/elm-hex": "1.0.0"
         }
     },
     "test-dependencies": {

diff --git a/front/elm/Projects/Show.elm b/front/elm/Projects/Show.elm
@@ -3,6 +3,8 @@ module Projects.Show exposing (formatLink, view)
 import Html exposing (..)
 import Html.Attributes exposing (class, href, id, property, style, target)
 import Html.Events exposing (onClick)
+import Html.Parser exposing (run)
+import Html.Parser.Util exposing (toVirtualDom)
 import Json.Encode exposing (string)
 import Messages exposing (..)
 import Projects.Models exposing (Link, Project)
@@ -11,13 +13,16 @@ import Projects.Models exposing (Link, Project)
 view : Project -> Html Msg
 view project =
     let
-        descriptionValue =
+        descriptionNode =
             case project.description of
-                Nothing ->
-                    ""
-
                 Just description ->
-                    description
+                    case Html.Parser.run description of
+                        Ok parsedNodes ->
+                            Html.Parser.Util.toVirtualDom parsedNodes
+                        _ ->
+                            []
+                Nothing ->
+                    []
     in
     div [ class "row" ]
         [ div [ class "col-md-12" ]
@@ -32,10 +37,8 @@ view project =
                 , h4 [] [ text project.tags ]
                 , div [ class "row" ]
                     [ div
-                        [ class "col-md-12 textDesc"
-                        , property "innerHTML" <| string descriptionValue
-                        ]
-                        []
+                        [ class "col-md-12 textDesc" ]
+                        descriptionNode
                     ]
                 , div [] (List.map formatLink project.links)
                 , i