Tidying

RawToast · Mar 30, 2018 · 70444d1 · 70444d1
1 parent e62d441
commit 70444d1
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 96 deletions.
diff --git a/dokusho/src/app/DateSelector.re b/dokusho/src/app/DateSelector.re
@@ -1,10 +1,8 @@
 let component = ReasonReact.reducerComponent("DateSelector");
 
-let getDate = Js.Date.make;
-
 let make = (~onChangeSelect, ~enabledDates, _children) => {
   ...component,
-  initialState: () => getDate(),
+  initialState: () => Js.Date.make(),
   reducer: (state, _ext) => 
     ReasonReact.Update({ state }),
   render: (

diff --git a/dokusho/src/app/Day.re b/dokusho/src/app/Day.re
@@ -38,5 +38,5 @@ module Day {
         |> List.map(i => float_of_int(i.value) *. PageType.pageScore(i.kind))
         |> List.fold_left((a, b) => a +. b, 0.);
 
-  let entries = (d: day) => d.entries 
+  let entries = (d: day) => d.entries;
 }
diff --git a/dokusho/src/app/DokuUtil.re b/dokusho/src/app/DokuUtil.re
@@ -21,4 +21,20 @@ module DokuUtil = {
     };
     Bytes.sub_string(buf, 0, j^);
   };
-};
+};
+
+module DateUtil = {
+  open Types; 
+
+  let availableDates = (d: readingHistory) => d.days |> List.map(d => Js.Date.fromString(d.date)) |> (ls) => [Js.Date.make(), ...ls] |> Array.of_list;
+
+  let dateWithoutTime = selectedDate => Js.Date.fromFloat(Js.Date.utcWithYMDHMS(
+        ~year=Js.Date.getFullYear(selectedDate),
+        ~month=Js.Date.getMonth(selectedDate), 
+        ~date=Js.Date.getDate(selectedDate),
+        ~hours=0.,
+        ~minutes=0.,
+        ~seconds=0.)());
+
+  let asDateKey = (date) => Js.String.slice(~from=0, ~to_=16, Js.Date.toISOString(date));
+}
diff --git a/dokusho/src/app/Dokusho.re b/dokusho/src/app/Dokusho.re
@@ -1,10 +1,8 @@
 open Input;
 open Types;
 open Day;
-open PageTypeSelection;
 open Actions;
-open Entries;
-open Footer;
+open DokuUtil;
 open Rationale;
 
 module Dokusho {
@@ -35,21 +33,13 @@ module Dokusho {
       Actions.loadUserData(testUser);
     },
     render: (self) => {
-      let calendarDate = Js.Date.fromFloat(Js.Date.utcWithYMDHMS(
-        ~year=Js.Date.getFullYear(self.state.selectedDate),
-        ~month=Js.Date.getMonth(self.state.selectedDate), 
-        ~date=Js.Date.getDate(self.state.selectedDate),
-        ~hours=0.,
-        ~minutes=0.,
-        ~seconds=0.)());
-
-      let dateKey = Js.String.slice(0, 16, Js.Date.toISOString(calendarDate));
-
+      let dateKey = self.state.selectedDate |> DateUtil.dateWithoutTime |> DateUtil.asDateKey;
+
       let day = RList.find(d => d.date == dateKey, self.state.readingData.days);
       let pageCount = day |> Option.fmap(Day.pageCount) |> Option.default(0.);
-      let ents = day |> Option.fmap(d => d.entries) |> Option.default([]);
+      let entries = day |> Option.fmap(d => d.entries) |> Option.default([]);
 
-      let dats = self.state.readingData.days |> List.map(d => Js.Date.fromString(d.date)) |> (ls) => [Js.Date.make(), ...ls] |> Array.of_list;
+      let availableDates = DateUtil.availableDates(self.state.readingData);
 
           <div>
             <div className="title"> 
@@ -60,11 +50,14 @@ module Dokusho {
                 selection=self.state.selectedEntry
                 onSubmit=(self.reduce((text) => AddEntry(self.state.selectedEntry, int_of_string(text))))
                 />
+
               <PageTypeSelection onChangeSelect=(self.reduce(selected => ChangeSelection(selected))) />
 
-              <DateSelector onChangeSelect=(self.reduce(dt => SelectDate(dt))) enabledDates=(dats) />  
+              <DateSelector 
+                onChangeSelect=(self.reduce(date => SelectDate(date))) 
+                enabledDates=(availableDates) />  
 
-              <Entries entries=(ents) />
+              <Entries entries=(entries) />
 
               <Footer pageCount=(pageCount) />
             </div>

diff --git a/dokusho/src/app/Entries.re b/dokusho/src/app/Entries.re
@@ -1,18 +1,18 @@
 open Types;
-open Entry;
 
-module Entries = {
+let component = ReasonReact.statelessComponent("Entry");
 
-  let component = ReasonReact.statelessComponent("Entry");
-
-  let make = (~entries: list(entry), _children) => {
-    ...component,
-    render: (_) =>
-      <div className="entries">
-          (entries
-              |> List.map((entry: entry) => <Entry key=(string_of_int(entry.id)) entry=entry />) 
-              |> Array.of_list
-              |> ReasonReact.arrayToElement)
-      </div>
-  };
+let make = (~entries: list(entry), _children) => {
+  ...component,
+  render: (_) =>
+    <div className="entries">
+      (
+        entries
+        |> List.map((entry: entry) =>
+             <Entry key=(string_of_int(entry.id)) entry />
+           )
+        |> Array.of_list
+        |> ReasonReact.arrayToElement
+      )
+    </div>
 };
diff --git a/dokusho/src/app/Entry.re b/dokusho/src/app/Entry.re
@@ -1,17 +1,18 @@
 open Types;
+
 open PageType;
 
-module Entry = {
-  let component = ReasonReact.statelessComponent("Entry");
-  
-  let make = (~entry: entry, _children) => {
-    ...component,
-    render: (_) =>
-      <div className="entry">
-          (entry.kind |> 
-          PageType.toString |> 
-          (str) => str ++ ": " ++ string_of_int(entry.value) |>
-          ReasonReact.stringToElement)
-      </div>
-  };
+let component = ReasonReact.statelessComponent("Entry");
+
+let make = (~entry: entry, _children) => {
+  ...component,
+  render: (_) =>
+    <div className="entry">
+      (
+        entry.kind
+        |> PageType.toString
+        |> ((str) => str ++ ": " ++ string_of_int(entry.value) 
+          |> ReasonReact.stringToElement)
+      )
+    </div>
 };
diff --git a/dokusho/src/app/Footer.re b/dokusho/src/app/Footer.re
@@ -1,12 +1,9 @@
-module Footer = {
+let component = ReasonReact.statelessComponent("Footer");
 
-  let component = ReasonReact.statelessComponent("Footer");
-
-  let make = (~pageCount: float, _children) => {
-    ...component,
-    render: (_) =>
-      <div className="footer">
-        (ReasonReact.stringToElement(string_of_float(pageCount) ++ " pages"))
-      </div>
-  };
+let make = (~pageCount: float, _children) => {
+  ...component,
+  render: (_) =>
+    <div className="footer">
+      (ReasonReact.stringToElement(string_of_float(pageCount) ++ " pages"))
+    </div>
 };
diff --git a/dokusho/src/app/PageTypeSelection.re b/dokusho/src/app/PageTypeSelection.re
@@ -2,34 +2,30 @@ open PageType;
 
 open Types;
 
-module PageTypeSelection = {
+let component = ReasonReact.reducerComponent("PageTypeSelection");
 
-  type inputS = {text: string};
-
-  let str = ReasonReact.stringToElement;
-  let ptArray = PageType.pageTypes |> List.map(i => {"value": i.name, "label": i.name});
-
-  let component = ReasonReact.reducerComponent("PageTypeSelection");
-
-  let make = (~onChangeSelect, _) => {
-    ...component,
-    initialState: () => {text: "Book"},
-    reducer: (state: inputS, _ext) => ReasonReact.Update({text: state.text}),
-    render: ({state, reduce}) =>
-        <ReactToolbox.Dropdown
-          className="pageselect"
-          auto=true
-          source=(Array.of_list(ptArray))
-          value=(`String(state.text))
-          onChange=(
-            (txt, _mse) =>
-              switch (txt |> PageType.findOptType) {
-              | Some(pt) =>
-                (reduce(() => {text: PageType.toString(pt)}))();
-                onChangeSelect(pt);
-              | None => ()
-              }
-          )
-        />
-  };
+let make = (~onChangeSelect, _) => {
+  ...component,
+  initialState: () => "Book",
+  reducer: (state, _ext) => ReasonReact.Update(state),
+  render: ({state, reduce}) =>
+    <ReactToolbox.Dropdown
+      className="pageselect"
+      auto=true
+      source=(
+        PageType.pageTypes
+        |> List.map(i => {"value": i.name, "label": i.name})
+        |> Array.of_list
+      )
+      value=(`String(state))
+      onChange=(
+        (txt, _mse) =>
+          switch (txt |> PageType.findOptType) {
+          | Some(pt) =>
+            (reduce(() => PageType.toString(pt)))();
+            onChangeSelect(pt);
+          | None => ()
+          }
+      )
+    />
 };
diff --git a/dokusho/src/styles/index.css b/dokusho/src/styles/index.css
@@ -36,7 +36,7 @@ body {
   flex-direction: column;
   font-size: 20px;
   align-items: center;
-  padding: 20px;
+  padding: 15px 20px 0px 20px;
 }
 
 .dokusho {

diff --git a/dokusho/src/test/PageTypeSelection_test.re b/dokusho/src/test/PageTypeSelection_test.re
@@ -1,7 +1,5 @@
 open Jest;
 
-open PageTypeSelection;
-
 describe("PageTypeSelection", () => {
   open ExpectJs;
 
@@ -13,9 +11,4 @@ describe("PageTypeSelection", () => {
 
     expect(Js.Undefined.return(component)) |> toBeDefined;
   });
-
-  describe("PageTypeSelection.str", () => {  
-    test("Is an alias for ReasonReact.stringToElement", () =>
-      expect(PageTypeSelection.str("Hello")) |> toBe(ReasonReact.stringToElement("Hello")));
-  });  
 });