Merge pull request #116 from OpenLitterMap/staging

Merge Staging

Author: xlcrr

actions/auth_actions.js

@@ -2,23 +2,17 @@ import React from 'react';
 import AsyncStorage from '@react-native-community/async-storage';
 import {
     ACCOUNT_CREATED,
-    BAD_PASSWORD,
     CHANGE_SERVER_STATUS_TEXT,
     CLIENT_SECRET,
     CLIENT_ID,
     CHANGE_LANG,
     SUBMIT_START,
-    SERVER_STATUS,
     LOGIN_OR_SIGNUP_RESET,
     LOGIN_SUCCESS,
     LOGIN_FAIL,
     LOGOUT,
     USER_FOUND,
-    USERNAME_CHANGED,
-    TOGGLE_USERNAME_MODAL,
     SUBMIT_END,
-    STORE_CURRENT_APP_VERSION,
-    ON_SEEN_FEATURE_TOUR,
     URL
 } from './types';
 import axios from 'axios';
@@ -73,20 +67,6 @@ export const checkValidToken = token => {
     };
 };
 
-export const storeCurrentAppVersion = text => {
-    return {
-        type: STORE_CURRENT_APP_VERSION,
-        payload: text
-    };
-};
-
-export const onSeenFeatureTour = text => {
-    return {
-        type: ON_SEEN_FEATURE_TOUR,
-        payload: text
-    };
-};
-
 /****
  *** CHECK IF TOKEN EXISTS - log in
  **  - fired on AuthScreen componentDidMount
@@ -155,14 +135,14 @@ export const createAccount = data => {
                 }
 
                 dispatch({
-                    type: SERVER_STATUS,
+                    type: CHANGE_SERVER_STATUS_TEXT,
                     payload: payload
                 });
                 return;
             } else {
                 // handling Network Error
                 dispatch({
-                    type: SERVER_STATUS,
+                    type: CHANGE_SERVER_STATUS_TEXT,
                     payload:
                         'Network error, please check internet connection and try again'
                 });
@@ -326,7 +306,11 @@ export const serverLogin = data => {
             if (error?.response) {
                 if (error?.response?.status === 400) {
                     // handling wrong password response from backend
-                    dispatch({ type: BAD_PASSWORD });
+                    dispatch({
+                        type: LOGIN_FAIL,
+                        payload:
+                            'Your password is incorrect. Please try again or reset it.'
+                    });
                     return;
                 } else {
                     // handling other errors from backend and thrown from try block
@@ -346,18 +330,13 @@ export const serverLogin = data => {
                 return;
             }
         }
+
         // Dispatch success if no errors
-        dispatch({ type: LOGIN_SUCCESS, payload: token });
+        // fetch user object before navigating
         dispatch(fetchUser(token));
     };
 };
 
-export const toggleUsernameModal = () => {
-    return {
-        type: TOGGLE_USERNAME_MODAL
-    };
-};
-
 /**
  * Make an API request to fetch the current user with an access token
  *
@@ -418,16 +397,6 @@ export const userFound = data => {
     };
 };
 
-/**
- * Update the username
- */
-export const usernameChanged = text => {
-    return {
-        type: USERNAME_CHANGED,
-        payload: text
-    };
-};
-
 /**
  * TO DO - FACEBOOK LOGIN
  */

actions/gallery_actions.js

@@ -1,67 +1,7 @@
 import React from 'react';
 import CameraRoll from '@react-native-community/cameraroll';
 
-import {
-    ADD_GEOTAGGED_IMAGES,
-    ADD_TAGS_TO_GALLERY_IMAGE,
-    DELETE_SELECTED_GALLERY,
-    DESELECT_ALL_GALLERY_PHOTOS,
-    GALLERY_UPLOADED_SUCCESSFULLY,
-    TOGGLE_IMAGES_LOADING,
-    PHOTOS_FROM_GALLERY,
-    REMOVE_TAG_FROM_GALLERY_PHOTO,
-    TOGGLE_IMAGE_BROWSER,
-    TOGGLE_SELECTED_GALLERY
-} from './types';
-
-/**
- * Create or Update tags on a gallery image
- */
-export const addTagsToGalleryImage = tags => {
-    return {
-        type: ADD_TAGS_TO_GALLERY_IMAGE,
-        payload: tags
-    };
-};
-
-/**
- * Delete selected gallery / camera roll photo
- */
-export const deleteSelectedGallery = photo => {
-    return {
-        type: DELETE_SELECTED_GALLERY,
-        payload: photo
-    };
-};
-
-/**
- * Change selected => false on all gallery photos
- */
-export const deselectAllGalleryPhotos = () => {
-    return {
-        type: DESELECT_ALL_GALLERY_PHOTOS
-    };
-};
-
-/**
- * A Gallery Index has been uploaded successfully! - can be deleted.
- */
-export const galleryPhotoUploadedSuccessfully = index => {
-    return {
-        type: GALLERY_UPLOADED_SUCCESSFULLY,
-        payload: index
-    };
-};
-
-/**
- * Toggle ActivityIndicator when Photo Albums are finished / loading
- */
-export const setImagesLoading = bool => {
-    return {
-        type: TOGGLE_IMAGES_LOADING,
-        payload: bool
-    };
-};
+import { ADD_GEOTAGGED_IMAGES, TOGGLE_IMAGES_LOADING } from './types';
 
 /**
  * get photos from camera roll
@@ -80,13 +20,14 @@ export const setImagesLoading = bool => {
 
 export const getPhotosFromCameraroll = () => async (dispatch, getState) => {
     const {
-        gallery,
         geotaggedImages,
         camerarollImageFetched,
         lastFetchTime,
         imagesLoading
     } = getState().gallery;
-    let id = gallery?.length === 0 ? 0 : gallery[gallery?.length - 1].id + 1;
+    const { user } = getState().auth;
+
+    let id = geotaggedImages.length;
 
     let camerarollData;
     let fetchType = 'INITIAL';
@@ -132,7 +73,7 @@ export const getPhotosFromCameraroll = () => async (dispatch, getState) => {
         const imagesArray = camerarollData.edges;
         let geotagged = [];
 
-        imagesArray.map(item => {
+        imagesArray.map((item) => {
             id++;
 
             if (
@@ -152,63 +93,17 @@ export const getPhotosFromCameraroll = () => async (dispatch, getState) => {
                     width: item.node.image.width,
                     lat: item.node.location.latitude,
                     lon: item.node.location.longitude,
-                    timestamp: item.node.timestamp,
+                    date: item.node.timestamp,
                     selected: false,
-                    picked_up: false,
                     tags: {},
                     type: 'gallery'
                 });
             }
         });
 
         dispatch({
-            type: 'ADD_GEOTAGGED_IMAGES',
+            type: ADD_GEOTAGGED_IMAGES,
             payload: { geotagged, fetchType }
         });
     }
 };
-/**
- * Add selected photos from gallery to redux
- */
-export const photosFromGallery = photos => {
-    return {
-        type: PHOTOS_FROM_GALLERY,
-        payload: photos
-    };
-};
-
-/**
- * A tag has been selected from a gallery photo
- */
-export const removeTagFromGalleryPhoto = data => {
-    return {
-        type: REMOVE_TAG_FROM_GALLERY_PHOTO,
-        payload: data
-    };
-};
-
-/**
- * Open or Close the Gallery Image Picker
- */
-export const toggleImageBrowser = () => {
-    return {
-        type: TOGGLE_IMAGE_BROWSER
-    };
-};
-
-/**
- * Toggle the value of a photo.selected
- */
-export const toggleSelectedGallery = index => {
-    return {
-        type: TOGGLE_SELECTED_GALLERY,
-        payload: index
-    };
-};
-
-export const addGeotaggedImages = data => {
-    return {
-        type: ADD_GEOTAGGED_IMAGES,
-        payload: data
-    };
-};