From 19534b4770b4f4097b02f5fa021a24822b12d907 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Fri, 26 Jan 2018 20:30:34 +0100
Subject: Add week selector

---
 .../react/components/container/WeekSelector.js     | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/client/react/components/container/WeekSelector.js

(limited to 'src/client/react/components/container/WeekSelector.js')

diff --git a/src/client/react/components/container/WeekSelector.js b/src/client/react/components/container/WeekSelector.js
new file mode 100644
index 0000000..9f308f0
--- /dev/null
+++ b/src/client/react/components/container/WeekSelector.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import moment from 'moment';
+import momentPropTypes from 'react-moment-proptypes';
+import queryString from 'query-string';
+import { withRouter } from 'react-router-dom';
+
+const WeekSelector = ({ urlWeek, location, history }) => {
+  const updateWeek = (change) => {
+    const newWeek = moment().week(urlWeek.week() + change);
+    const isCurrentWeek = moment().week() === newWeek.week();
+    history.push(`${location.pathname}?${queryString.stringify({ week: isCurrentWeek ? undefined : newWeek.week() })}`);
+  };
+
+  return (
+    <div>
+      <button onClick={() => updateWeek(-1)}>Prev</button>
+      Week {urlWeek.week()}
+      <button onClick={() => updateWeek(+1)}>Next</button>
+    </div>
+  );
+};
+
+WeekSelector.propTypes = {
+  urlWeek: momentPropTypes.momentObj.isRequired,
+  history: PropTypes.shape({
+    push: PropTypes.func.isRequired,
+  }).isRequired,
+  location: PropTypes.shape({
+    pathname: PropTypes.string.isRequired,
+  }).isRequired,
+};
+
+export default withRouter(WeekSelector);
-- 
cgit v1.1


From 0c99c0b4d84f53675cc3d42fa518879789cc86b0 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Fri, 26 Jan 2018 20:34:35 +0100
Subject: Make updateWeek sub 80 chars

---
 src/client/react/components/container/WeekSelector.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/client/react/components/container/WeekSelector.js')

diff --git a/src/client/react/components/container/WeekSelector.js b/src/client/react/components/container/WeekSelector.js
index 9f308f0..c9174ca 100644
--- a/src/client/react/components/container/WeekSelector.js
+++ b/src/client/react/components/container/WeekSelector.js
@@ -9,7 +9,11 @@ const WeekSelector = ({ urlWeek, location, history }) => {
   const updateWeek = (change) => {
     const newWeek = moment().week(urlWeek.week() + change);
     const isCurrentWeek = moment().week() === newWeek.week();
-    history.push(`${location.pathname}?${queryString.stringify({ week: isCurrentWeek ? undefined : newWeek.week() })}`);
+
+    const query = queryString.stringify({
+      week: isCurrentWeek ? undefined : newWeek.week(),
+    });
+    history.push(`${location.pathname}?${query}`);
   };
 
   return (
-- 
cgit v1.1


From 3b98d4c4f13424c89a10580065075998d37ae857 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Sun, 28 Jan 2018 16:06:56 +0100
Subject: Improve week logic

---
 src/client/react/components/container/WeekSelector.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/client/react/components/container/WeekSelector.js')

diff --git a/src/client/react/components/container/WeekSelector.js b/src/client/react/components/container/WeekSelector.js
index c9174ca..eef8d8d 100644
--- a/src/client/react/components/container/WeekSelector.js
+++ b/src/client/react/components/container/WeekSelector.js
@@ -1,17 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
-import momentPropTypes from 'react-moment-proptypes';
 import queryString from 'query-string';
 import { withRouter } from 'react-router-dom';
 
+import purifyWeek from '../../lib/purifyWeek';
+
 const WeekSelector = ({ urlWeek, location, history }) => {
   const updateWeek = (change) => {
-    const newWeek = moment().week(urlWeek.week() + change);
-    const isCurrentWeek = moment().week() === newWeek.week();
+    const newWeek = purifyWeek(urlWeek + change);
+    const isCurrentWeek = moment().week() === newWeek;
 
     const query = queryString.stringify({
-      week: isCurrentWeek ? undefined : newWeek.week(),
+      week: isCurrentWeek ? undefined : newWeek,
     });
     history.push(`${location.pathname}?${query}`);
   };
@@ -19,14 +20,14 @@ const WeekSelector = ({ urlWeek, location, history }) => {
   return (
     <div>
       <button onClick={() => updateWeek(-1)}>Prev</button>
-      Week {urlWeek.week()}
+      Week {urlWeek}
       <button onClick={() => updateWeek(+1)}>Next</button>
     </div>
   );
 };
 
 WeekSelector.propTypes = {
-  urlWeek: momentPropTypes.momentObj.isRequired,
+  urlWeek: PropTypes.number.isRequired,
   history: PropTypes.shape({
     push: PropTypes.func.isRequired,
   }).isRequired,
-- 
cgit v1.1