feat: add markdown support for description

believer · Aug 23, 2019 · de671c7 · de671c7
1 parent 5fa7c26
commit de671c7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1 @@
+[@bs.module] external make: string => string = "marked";