Sets up reservation pages AND makes the other side panels look better with grid

Author: Sean Paterson

native/.expo/packager-info.json

@@ -1,9 +1,9 @@
 {
   "devToolsPort": 19002,
-  "expoServerPort": null,
-  "packagerPort": null,
-  "packagerPid": null,
+  "expoServerPort": 19000,
+  "packagerPort": 19001,
+  "packagerPid": 4944,
   "expoServerNgrokUrl": "https://ia-6ey.ssp6.native.exp.direct",
   "packagerNgrokUrl": "https://packager.ia-6ey.ssp6.native.exp.direct",
-  "ngrokPid": 71700
+  "ngrokPid": 4959
 }

native/ios/.expo/packager-info.json

@@ -0,0 +1,3 @@
+{
+  "devToolsPort": 19002
+}

native/ios/.expo/settings.json

@@ -0,0 +1,7 @@
+{
+  "hostType": "lan",
+  "lanType": "ip",
+  "dev": true,
+  "minify": false,
+  "urlRandomness": null
+}

native/shared/api/firebase.js

@@ -33,6 +33,7 @@ export const firebaseLoginEmail = async (email, password) => {
  *
  * @param id
  * @param name
+ * @param type - manager/operators/user
  * @returns {Promise<void>}
  */
 export const firebaseUpdateProfile = ({ id, name }) =>

native/shared/api/tap2go.js

@@ -105,18 +105,17 @@ export const apiUserDelete = authToken => axiosBaseUrl.delete('/users/me', getCo
  * @param stripeToken
  * @returns {AxiosPromise<any>}
  */
-export const apiUserSetPaymentDetails = (authToken, stripeToken) => {
-  // const dbId = Firebase.auth().currentUser.photoURL;
-  console.log(stripeToken);
+export const apiUserSetPaymentDetails = async (authToken, stripeToken) => {
+  const dbId = Firebase.auth().currentUser.photoURL;
   try {
-    // return axiosBaseUrl.post(
-    //   `/users/${dbId}/payment`,
-    //   {
-    //     stripe_source_token: stripeToken,
-    //   },
-    //   getConfig(authToken)
-    // );
-    // return;
+    await axiosBaseUrl.put(
+      `/users/${dbId}/payment`,
+      {
+        token: stripeToken,
+      },
+      getConfig(authToken)
+    );
+    return null;
   } catch (e) {
     throw e;
   }
@@ -131,7 +130,6 @@ export const apiUserSetPaymentDetails = (authToken, stripeToken) => {
  * @returns {Promise<*>}
  */
 export const apiRentalStartId = async (authToken, bikeId) => {
-  // throw new Error('NO PAYMENT METHOD'); // TESTING
   try {
     const result = await axiosBaseUrl.post(`/bikes/${bikeId}/rentals`, {}, getConfig(authToken));
 
@@ -148,7 +146,6 @@ export const apiRentalStartId = async (authToken, bikeId) => {
  * @returns {Promise<result.data.rental|{estimated_price, start_time, bike_id, current_location}>}
  */
 export const apiRentalFetchCurrent = async authToken => {
-  // console.log(authToken);
   const dbId = Firebase.auth().currentUser.photoURL;
   try {
     const result = await axiosBaseUrl.get(`/users/${dbId}/rentals/current`, getConfig(authToken));
@@ -203,7 +200,6 @@ export const apiRentalEndCurrent = async (authToken, cancel = false) => {
  * @param authToken
  * @returns {Promise<void>}
  */
-// eslint-disable-next-line camelcase
 export const apiIssueCreate = async (authToken, data) => {
   const dbId = Firebase.auth().currentUser.photoURL;
   try {
@@ -215,6 +211,16 @@ export const apiIssueCreate = async (authToken, data) => {
   }
 };
 
+/**
+ * Gets all pickup points - at some point will
+ * be in order of closes to current location and
+ * within the range
+ *
+ * @param latitude
+ * @param longitude
+ * @param range
+ * @returns {Promise<pickupsReducer|Array>}
+ */
 export const apiPickupPointsFetch = async (latitude = 55.949159, longitude = -3.199293, range = 4) => {
   try {
     const result = await axiosBaseUrl.get(`/pickups?latitude=${latitude}&longitude=${longitude}&range=${range}miles`);
@@ -236,6 +242,11 @@ export const apiPickupFetchSingle = async (authToken, id) => {
   return result.data.data.pickup;
 };
 
+export const apiPickupFetchBikes = async (authToken, pickupId) => {
+  const result = await axiosBaseUrl.get(`/pickups/${pickupId}/bikes`);
+  return result.data.data.bikes;
+};
+
 /**
  * Api end point to create a reservation at a location
  * for a set date date and time
@@ -246,7 +257,7 @@ export const apiPickupFetchSingle = async (authToken, id) => {
  * @returns {Promise<void>}
  */
 export const apiReservationCreate = async (authToken, pickupId, datetime) => {
-  // throw new Error('NO PAYMENT METHOD');
+  // throw new Error('NO PAYMENT METHOD'); // TESTING
   try {
     const result = await axiosBaseUrl.post(
       `/pickups/${pickupId}/reservations`,
@@ -255,6 +266,7 @@ export const apiReservationCreate = async (authToken, pickupId, datetime) => {
       },
       getConfig(authToken)
     );
+
     return result.data.data.reservation;
   } catch (e) {
     throw e;
@@ -270,22 +282,56 @@ export const apiReservationCreate = async (authToken, pickupId, datetime) => {
  */
 export const apiReservationCancel = async (authToken, reservationId) => {
   try {
-    await axiosAuth.delete(`/reservations/${reservationId}`, getConfig(authToken));
-    return null;
+    const result = await axiosBaseUrl.delete(`/reservations/${reservationId}`, getConfig(authToken));
+    return result.data.data.reservation;
   } catch (e) {
     throw e;
   }
 };
 
 /**
- * Api end point to fetch all rentals for a user that
+ * Api end point to fetch all reservations for a user that
  * have not been collected and are in the future
  *
  * @param authToken
  * @returns {Promise<*>}
  */
-export const apiReservationsFetch = async authToken => {
+export const apiReservationsUserFetch = async authToken => {
   const dbId = Firebase.auth().currentUser.photoURL;
-  const result = await axiosAuth.get(`/users/${dbId || 'me'}/reservations/current`, getConfig(authToken));
+  const result = await axiosBaseUrl.get(`/users/${dbId || 'me'}/reservations/current`, getConfig(authToken));
+  return result.data.data.reservations;
+};
+
+/**
+ * Api end point to fetch all reservations
+ * must be an admin to access
+ *
+ * @param authToken
+ * @returns {Promise<*>}
+ */
+export const apiReservationsAdminFetch = async authToken => {
+  const result = await axiosBaseUrl.get('/reservations', getConfig(authToken));
   return result.data.data.reservations;
 };
+
+/**
+ * Api end point to fetch all of the bikes on the system
+ * @returns {Promise<*>}
+ */
+export const apiBikesFetch = async authToken => {
+  const result = await axiosBaseUrl.get('/bikes', getConfig(authToken));
+  return result.data.data.bikes;
+};
+
+/**
+ * Api end point for a single bike based on its
+ * identifier 6 digit hex number
+ *
+ * @param authToken
+ * @param bikeId
+ * @returns {Promise<BikeListItem.propTypes.bike|{}>}
+ */
+export const apiBikeSingleFetch = async (authToken, bikeId) => {
+  const result = await axiosBaseUrl.get(`/bikes/${bikeId}`, getConfig(authToken));
+  return result.data.data.bike;
+};

native/shared/redux/containers/BikesContainer.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import { bikesFetch, BikePropTypes } from '../ducks/bikes';
+import { setBike, bikeSingleFetch } from '../ducks/bikeSingle';
 
 export const BikesProps = {
   locale: PropTypes.string.isRequired,
@@ -11,21 +12,37 @@ export const BikesProps = {
       ...BikePropTypes,
     })
   ).isRequired,
+  bike: PropTypes.shape({
+    ...BikePropTypes,
+  }),
   loading: PropTypes.bool.isRequired,
   fetchBikes: PropTypes.func.isRequired,
+  fetchSingleBike: PropTypes.func.isRequired,
 };
 
 export default function withBikes(WrappedComponent) {
   // Pure function always auto re-loads children on prop change!
   class BikesContainer extends React.PureComponent {
     render() {
-      const { locale, loading, bikes, fetchBikes, ...restProps } = this.props;
+      const {
+        locale,
+        loading,
+        bikes,
+        bike,
+        fetchBikes,
+        fetchSingleBike,
+        setSingleReservationDisplay,
+        ...restProps
+      } = this.props;
       return (
         <WrappedComponent
           locale={locale}
           loading={loading} // from bikes reducer
           bikes={bikes}
+          bike={bike}
           fetchBikes={fetchBikes}
+          fetchSingleBike={fetchSingleBike}
+          setSingleBikeDisplay={setSingleReservationDisplay}
           {...restProps} // passes any others through
         />
       );
@@ -40,10 +57,13 @@ export default function withBikes(WrappedComponent) {
     locale: state.locale.country,
     loading: state.bikes.loading,
     bikes: state.bikes.bikes,
+    bike: state.bikeSingle,
   });
 
   const mapDispatchToProp = {
     fetchBikes: bikesFetch,
+    setSingleReservationDisplay: setBike,
+    fetchSingleBike: bikeSingleFetch,
   };
 
   return connect(

native/shared/redux/containers/LoginAndOutContainer.js

@@ -21,7 +21,7 @@ export const LoginAndOutProps = {
 
 export default function withLogin(WrappedComponent) {
   const LoginAndOutContainer = ({ locale, login, logout, ...restProps }) => (
-    <WrappedComponent locale={locale} login={login} logout={logout} test={userSignOut} {...restProps} />
+    <WrappedComponent locale={locale} login={login} logout={logout} {...restProps} />
   );
 
   LoginAndOutContainer.propTypes = {

native/shared/redux/containers/PickupPointsContainer.js

@@ -12,6 +12,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import { pickupPointsFetch, PickupPropTypes } from '../ducks/pickups';
+import { setPickup, pickupSingleFetch, pickupBikesFetch } from '../ducks/pickupSingle';
+import { BikePropTypes } from '../ducks/bikeSingle';
 
 export const PickupProps = {
   locale: PropTypes.string.isRequired,
@@ -22,19 +24,44 @@ export const PickupProps = {
   ).isRequired,
   loading: PropTypes.bool.isRequired,
   getPickupPoints: PropTypes.func.isRequired,
+  setSinglePickupDisplay: PropTypes.func.isRequired,
+  fetchSinglePickup: PropTypes.func.isRequired,
+  fetchPickupBikes: PropTypes.func.isRequired,
+  pickupPointBikes: PropTypes.arrayOf(
+    PropTypes.shape({
+      ...BikePropTypes,
+    })
+  ).isRequired,
+  // fetchPickupReservation: PropTypes.func.isRequired,
 };
 
 export default function withPickupPoints(WrappedComponent) {
   // Pure function always auto re-loads children on prop change!
   class PickupPointsContainer extends React.PureComponent {
     render() {
-      const { locale, pickups, loading, getPickupPoints, ...restProps } = this.props;
+      const {
+        locale,
+        pickups,
+        pickup,
+        loading,
+        getPickupPoints,
+        fetchSinglePickup,
+        fetchPickupBikes,
+        setSinglePickupDisplay,
+        pickupPointBikes,
+        ...restProps
+      } = this.props;
       return (
         <WrappedComponent
           locale={locale}
           pickups={pickups}
+          pickup={pickup}
           loading={loading} // from pickups reducer
           getPickupPoints={getPickupPoints}
+          fetchSinglePickup={fetchSinglePickup}
+          fetchPickupBikes={fetchPickupBikes}
+          setSinglePickupDisplay={setSinglePickupDisplay}
+          pickupPointBikes={pickupPointBikes}
           {...restProps} // passes any others through
         />
       );
@@ -48,11 +75,17 @@ export default function withPickupPoints(WrappedComponent) {
   const mapStateToProps = state => ({
     locale: state.locale.country,
     pickups: state.pickups.pickups,
+    pickup: state.pickupSingle.pickup,
+    pickupPointBikes: state.pickupSingle.bikes,
     loading: state.pickups.loading,
   });
 
   const mapDispatchToProp = {
     getPickupPoints: pickupPointsFetch,
+    setSinglePickupDisplay: setPickup,
+    fetchSinglePickup: pickupSingleFetch,
+    fetchPickupBikes: pickupBikesFetch,
+    // fetchPickupReservation: pickupReservationsFetch,
   };
 
   return connect(