Merge pull request #36 from wasedatime/staging

Merge staging to master

README.md

@@ -25,6 +25,7 @@ npm install
 ### Running the app for developing
 
 ```bash
+cd wasedatime-web
 npm run dev
 ```
 

client/src/js/components/Bus.js

@@ -15,13 +15,13 @@ import ModalContainer from "../containers/ModalContainer";
 import { media } from "../styled-components/utils";
 import { Wrapper } from "../styled-components/Wrapper";
 import { Overlay } from "../styled-components/Overlay";
-import busSchedule from "../data/busSchedule.json";
+import { busSchedule } from "../data/busSchedule.js";
 import safariExport from "../../img/safari-export.svg";
 import a2hsChrome from "../../img/bus_a2hs_chrome.png";
 import a2hsSafari from "../../img/bus_a2hs_safari.png";
 
 const wasedaNishiwasedaBusUri =
-  "https://www.waseda.jp/fsci/assets/uploads/2018/03/2018waseda-nishiwaseda-shuttle-bus-timetable.pdf";
+  "https://www.waseda.jp/fsci/assets/uploads/2019/03/2019waseda-nishiwaseda-shuttlebus-timetable03.pdf";
 
 const ExtendedOverlay = styled(Overlay)`
   align-items: center;
@@ -129,7 +129,7 @@ const getSchduleType = (month, date, day) => {
     monthString in outOfService &&
     binarySearch(date, outOfService[monthString])
   ) {
-    return "no";
+    return "noSchedule";
   } else if (
     monthString in weekdaySchedule &&
     binarySearch(date, weekdaySchedule[monthString])
@@ -147,7 +147,7 @@ const getSchduleType = (month, date, day) => {
     return "special";
   } else {
     if (day === 0) {
-      return "no";
+      return "noSchedule";
     } else if (day === 6) {
       return "saturday";
     } else {
@@ -220,7 +220,7 @@ const getBusStatuses = (now, lng, t) => {
   nishiStatus = t("bus.Out of service");
   const scheduleType = getSchduleType(month, date, day);
   // No buses or special schedule
-  if (scheduleType === "no") {
+  if (scheduleType === "noSchedule") {
     return { wasedaStatus, nishiStatus };
   } else if (scheduleType === "special") {
     wasedaStatus = t("bus.Special Schedule");

client/src/js/components/BusModal.js

@@ -7,6 +7,7 @@ import styled, {keyframes} from 'styled-components';
 
 import { media } from '../styled-components/utils';
 import {Overlay} from '../styled-components/Overlay';
+import PropTypes from 'prop-types';
 
 const show = keyframes`
   0% {
@@ -190,3 +191,12 @@ class BusModal extends React.Component {
 }
 
 export default BusModal;
+
+BusModal.propTypes = {
+  onClose: PropTypes.func.isRequired,
+  children: PropTypes.element.isRequired
+}
+
+ExtendedOverlay.propTypes = {
+  animation: PropTypes.object.isRequired,
+}

client/src/js/components/CourseListSummary.js

@@ -5,6 +5,7 @@ import SortingOptions from './SortingOptions';
 import { RowWrapper } from '../styled-components/Wrapper';
 import { InvisibleButton } from '../styled-components/Button';
 import { withNamespaces } from "react-i18next";
+import PropTypes from 'prop-types';
 
 const CourseAddedMessageWrapper = styled(RowWrapper)`
   justify-content: space-between;
@@ -62,3 +63,15 @@ const CourseListSummary = ({
 };
 
 export default withNamespaces("translation")(CourseListSummary);
+
+CourseListSummary.propTypes = {
+  courses: PropTypes.array.isRequired,
+  isSortingOptionOpen: PropTypes.bool.isRequired,
+  handleToggleSortingOptions: PropTypes.func.isRequired,
+  selectedSortingOption: PropTypes.string.isRequired,
+  handleChangeSortingOption: PropTypes.func.isRequired
+}
+
+SortByButton.propTypes = {
+  isSortingOptionOpen: PropTypes.bool.isRequired
+}

client/src/js/components/Footer.js

@@ -1,4 +1,5 @@
 import React from "react";
+import PropTypes from "prop-types";
 import styled from "styled-components";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faGithub, faTwitter } from "@fortawesome/free-brands-svg-icons";
@@ -109,3 +110,9 @@ const Footer = ({ finishTime, t, lng }) => {
 };
 
 export default withNamespaces("translation")(Footer);
+
+Footer.propTypes = {
+  finishTime: PropTypes.string.isRequired,
+  t: PropTypes.func.isRequired,
+  lng: PropTypes.string.isRequired
+}

client/src/js/components/LanguageMenu.js

@@ -1,4 +1,5 @@
 import React from "react";
+import PropTypes from "prop-types";
 import i18n from "./i18n";
 import Menu from "@material-ui/core/Menu";
 import MenuItem from "@material-ui/core/MenuItem";
@@ -91,3 +92,8 @@ class LanguangeMenu extends React.Component {
 }
 
 export default withNamespaces("translation")(LanguangeMenu);
+
+LanguangeMenu.propTypes = {
+  lng: PropTypes.string.isRequired,
+  t: PropTypes.func.isRequired
+}

client/src/js/components/LoadingSpinner.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from "prop-types";
 import styled, { keyframes } from 'styled-components';
 
 import { Wrapper } from '../styled-components/Wrapper';
@@ -51,3 +52,7 @@ const LoadingSpinner = props => {
 };
 
 export default LoadingSpinner;
+
+LoadingSpinner.propTypes = {
+  message: PropTypes.string.isRequired
+}

client/src/js/components/Navigation.js

@@ -1,4 +1,5 @@
 import React from "react";
+import PropTypes from 'prop-types';
 import { Link } from "react-router-dom";
 import { withNamespaces } from "react-i18next";
 import { withRouter } from "react-router";
@@ -99,3 +100,12 @@ const Navigation = props => {
 };
 
 export default withRouter(withNamespaces("translation")(Navigation));
+
+Navigation.propTypes = {
+  location: PropTypes.object.isRequired,
+  t: PropTypes.func.isRequired
+}
+
+StyledButton.propTypes = {
+  isClicked: PropTypes.bool.isRequired
+}

client/src/js/components/syllabus/CourseChunk.js

@@ -1,7 +1,8 @@
-import React from 'react';
+import React from "react";
+import PropTypes from "prop-types";
 
-import FetchedCourseItem from '../../containers/syllabus/FetchedCourseItem';
-import { UnstyledUList } from '../../styled-components/List';
+import FetchedCourseItem from "../../containers/syllabus/FetchedCourseItem";
+import { UnstyledUList } from "../../styled-components/List";
 
 const CourseChunk = ({ chunk, searchTerm, searchLang }) => {
   return (
@@ -19,3 +20,9 @@ const CourseChunk = ({ chunk, searchTerm, searchLang }) => {
 };
 
 export default CourseChunk;
+
+CourseChunk.propTypes = {
+  chunk: PropTypes.array.isRequired,
+  searchTerm: PropTypes.string.isRequired,
+  searchLang: PropTypes.string.isRequired
+};

client/src/js/components/syllabus/CourseItem.js

@@ -307,5 +307,7 @@ export default withNamespaces("translation")(CourseItem);
 
 CourseItem.propTypes = {
   searchTerm: PropTypes.string.isRequired,
-  course: PropTypes.object.isRequired
+  course: PropTypes.object.isRequired,
+  isAddable: PropTypes.bool.isRequired,
+  handleOnClick: PropTypes.func.isRequired,
 };

client/src/js/components/syllabus/FetchedCourseList.js

@@ -128,5 +128,6 @@ class FetchedCourseList extends React.Component {
 export default withNamespaces("translation")(FetchedCourseList);
 
 FetchedCourseList.propTypes = {
-  searchTerm: PropTypes.string.isRequired
+  searchTerm: PropTypes.string.isRequired,
+  results: PropTypes.array.isRequired
 };

client/src/js/components/syllabus/FilterButton.js

@@ -1,9 +1,10 @@
-import React from 'react';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faFilter, faTimes } from '@fortawesome/free-solid-svg-icons';
-import styled from 'styled-components';
+import React from "react";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faFilter, faTimes } from "@fortawesome/free-solid-svg-icons";
+import styled from "styled-components";
+import PropTypes from "prop-types";
 
-import { InvisibleButton } from '../../styled-components/Button';
+import { InvisibleButton } from "../../styled-components/Button";
 
 const ExtendedInvisibleButton = styled(InvisibleButton)`
   position: fixed;
@@ -36,3 +37,8 @@ const FilterButton = ({ isModalOpen, handleToggleModal }) => {
 };
 
 export default FilterButton;
+
+FilterButton.propTypes = {
+  isModalOpen: PropTypes.bool.isRequired,
+  handleToggleModal: PropTypes.func.isRequired
+};

client/src/js/components/syllabus/SearchBar.js

@@ -124,3 +124,20 @@ SearchBar.propTypes = {
   inputText: PropTypes.string.isRequired,
   onInputChange: PropTypes.func.isRequired
 };
+
+StyledForm.propTypes = {
+  onSubmit: PropTypes.func.isRequired
+};
+
+StyledInput.propTypes = {
+  type: PropTypes.string.isRequired,
+  placeholder: PropTypes.string.isRequired,
+  value: PropTypes.string.isRequired,
+  onChange: PropTypes.func.isRequired
+}
+
+StyledClearButton.propTypes = {
+  role: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+  onClick: PropTypes.func.isRequired
+};

client/src/js/components/syllabus/SemesterTabs.js

@@ -4,6 +4,7 @@ import stickybits from 'stickybits';
 
 import { headerHeight } from '../../styled-components/variables';
 import { RowWrapper } from '../../styled-components/Wrapper';
+import PropTypes from 'prop-types';
 
 
 const ExtendedWrapper = styled(RowWrapper)`
@@ -99,3 +100,14 @@ class SemesterTabs extends React.Component {
   }
 }
 export default SemesterTabs;
+
+SemesterTabs.propTypes = {
+  handleChangeSemester: PropTypes.func.isRequired,
+  semester: PropTypes.string.isRequired
+}
+
+SemesterButton.propTypes = {
+  id: PropTypes.string.isRequired,
+  onClick: PropTypes.func.isRequired,
+  isSelected: PropTypes.bool.isRequired,
+}