Merge pull request #12 from ferakpeter/rework-bs-moment

Rework bs moment
ReasonVienna · Jul 3, 2017 · 0410386 · 0410386
2 parents e1279e4 + a35e904
commit 0410386
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 31 deletions.
diff --git a/bsconfig.json b/bsconfig.json
@@ -9,7 +9,8 @@
     "reason-react",
     "bs-director",
     "bs-fetch",
-    "bs-json"
+    "bs-json",
+    "bs-moment"
   ],
   "sources": [
     {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "bs-director": "^0.0.1",
     "bs-fetch": "buckletypes/bs-fetch",
     "bs-json": "github:buckletypes/bs-json",
+    "bs-moment": "github:buckletypes/bs-moment",
     "moment": "^2.18.1",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",

diff --git a/src/event.re b/src/event.re
@@ -24,7 +24,7 @@ let make ::event _children => {
   {
     ...component,
     render: fun () _self => {
-      let meetupTime = event.time |> Js.Date.fromFloat |> Js.Date.toISOString;
+      let meetupTime = event.time |> Js.Date.fromFloat |> Js.Date.toISOString |> MomentRe.moment;
       <div key=event.id>
         <h1> (ReactRe.stringToElement "When? ") </h1>
         <time
@@ -39,7 +39,9 @@ let make ::event _children => {
               padding::"10px"
               ()
           )>
-          (ReactRe.stringToElement meetupTime)
+          (ReactRe.stringToElement (MomentRe.Moment.format "dddd, MMMM D, YYYY" meetupTime))
+          <br />
+          (ReactRe.stringToElement (MomentRe.Moment.format "H:mm" meetupTime))
         </time>
         <h1> (ReactRe.stringToElement event.title) </h1>
         <div dangerouslySetInnerHTML={"__html": event.description} />