From de671c770d1a03337e013a789465f403091daf4a Mon Sep 17 00:00:00 2001
From: Rickard Laurin <rickard.laurin@gmail.com>
Date: Fri, 23 Aug 2019 11:18:40 +0200
Subject: [PATCH] feat: add markdown support for description

---
 package-lock.json     | 5 +++++
 package.json          | 5 +++--
 src/App.re            | 7 ++++---
 src/index.css         | 8 ++++++++
 src/models/Wod.re     | 6 +++++-
 src/utils/Markdown.re | 1 +
 6 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 src/utils/Markdown.re

diff --git a/package-lock.json b/package-lock.json
index 31624e2..0ee8229 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4786,6 +4786,11 @@
         "object-visit": "^1.0.0"
       }
     },
+    "marked": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
+      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
+    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
diff --git a/package.json b/package.json
index 8ac8baf..ffc5022 100644
--- a/package.json
+++ b/package.json
@@ -22,15 +22,16 @@
   "dependencies": {
     "bs-css": "9.0.1",
     "js-cookie": "2.2.1",
+    "marked": "^0.7.0",
     "re-classnames": "4.0.0",
     "react": "16.9.0",
     "react-dom": "16.9.0",
     "reason-react": "0.7.0"
   },
   "devDependencies": {
-    "@semantic-release/changelog": "^3.0.4",
+    "@semantic-release/changelog": "3.0.4",
     "@semantic-release/commit-analyzer": "6.3.0",
-    "@semantic-release/git": "^7.0.16",
+    "@semantic-release/git": "7.0.16",
     "@semantic-release/release-notes-generator": "7.3.0",
     "autoprefixer": "9.6.1",
     "bs-platform": "5.0.6",
diff --git a/src/App.re b/src/App.re
index c56383c..5db3909 100644
--- a/src/App.re
+++ b/src/App.re
@@ -318,9 +318,10 @@ let make = () => {
                   }}
                  {switch (wod.description) {
                   | Some(desc) =>
-                    <div className="mt-4 text-xs text-gray-500">
-                      {React.string(desc)}
-                    </div>
+                    <div
+                      className="mt-4 text-xs text-gray-500"
+                      dangerouslySetInnerHTML={"__html": Markdown.make(desc)}
+                    />
                   | None => React.null
                   }}
                </div>
diff --git a/src/index.css b/src/index.css
index 5521717..a26d272 100644
--- a/src/index.css
+++ b/src/index.css
@@ -6,3 +6,11 @@ html,
 body {
   @apply font-normal m-0 p-0 text-gray-900 bg-gray-100;
 }
+
+p {
+  @apply mb-2;
+}
+
+p:last-of-type {
+  @apply mb-0;
+}
diff --git a/src/models/Wod.re b/src/models/Wod.re
index f7b981c..ca8849d 100644
--- a/src/models/Wod.re
+++ b/src/models/Wod.re
@@ -657,7 +657,11 @@ let wods = [
     category: Some(`Hero),
     description:
       Some(
-        "Wear a weighted west if available. On the last round, do 15 air squats. This Firefighter Hero WOD is dedicated to Keithroy Maynard, FDNY, Engine 33, who was killed on September 11, 2001.",
+        {j|
+Wear a weighted west if available. On the last round, do 15 air squats.
+
+This Firefighter Hero WOD is dedicated to Keithroy Maynard, FDNY, Engine 33, who was killed on September 11, 2001.
+        |j},
       ),
     timeCap: None,
     rounds: Some(5),
diff --git a/src/utils/Markdown.re b/src/utils/Markdown.re
new file mode 100644
index 0000000..3f3c99d
--- /dev/null
+++ b/src/utils/Markdown.re
@@ -0,0 +1 @@
+[@bs.module] external make: string => string = "marked";