Explorar el Código

code formated.

miskson hace 3 años
padre
commit
256216cef3
Se han modificado 2 ficheros con 49 adiciones y 51 borrados
  1. 24 25
      src/actions/index.js
  2. 25 26
      src/reducers/index.js

+ 24 - 25
src/actions/index.js

@@ -1,40 +1,39 @@
-import {jwtDecode, gql} from '../App'
-
+import { jwtDecode, gql } from '../App'
 
 const actionPending = name => ({ type: 'PROMISE', status: 'PENDING', name })
+
 const actionResolved = (name, payload) => ({ type: 'PROMISE', status: 'RESOLVED', name, payload })
 const actionRejected = (name, error) => ({ type: 'PROMISE', status: 'REJECTED', name, error })
-
 export const actionPromise = (name, promise) =>
-  async dispatch => {
-    dispatch(actionPending(name))
-    try {
-      let payload = await promise
-      dispatch(actionResolved(name, payload))
-      return payload
-    }
-    catch (error) {
-      dispatch(actionRejected(name, error))
+    async dispatch => {
+        dispatch(actionPending(name))
+        try {
+            let payload = await promise
+            dispatch(actionResolved(name, payload))
+            return payload
+        }
+        catch (error) {
+            dispatch(actionRejected(name, error))
+        }
     }
-  }
 
 export const actionAuthLogin = token => ({ type: 'AUTH_LOGIN', token })
 export const actionAuthLogout = () => ({ type: 'AUTH_LOGOUT' })
 
 export const actionLogin = (login, password) =>
-  actionPromise('login', gql(`
+    actionPromise('login', gql(`
   query log($login:String!, $password:String!) {
       login(login: $login, password: $password)
     }`, { login, password }))
 
 export const actionFullLogin = (login = 'tst', password = '123') =>
-  async dispatch => {
-    let token = await dispatch(actionLogin(login, password))
-    if (token) {
-      await dispatch(actionAuthLogin(token))
-      dispatch(actionGetUserData())
+    async dispatch => {
+        let token = await dispatch(actionLogin(login, password))
+        if (token) {
+            await dispatch(actionAuthLogin(token))
+            dispatch(actionGetUserData())
+        }
     }
-  }
 
 export const actionRegister = (login, password) =>
     actionPromise('registration', gql(`
@@ -47,10 +46,10 @@ export const actionRegister = (login, password) =>
     )
 
 export const actionFullRegister = (login = 'tst', password = '123') =>
-  async dispatch => {
-    await dispatch(actionRegister(login, password))
-    await dispatch(actionFullLogin(login, password))
-  }
+    async dispatch => {
+        await dispatch(actionRegister(login, password))
+        await dispatch(actionFullLogin(login, password))
+    }
 
 export const actionGetUserData = () => {
     let _id = jwtDecode(localStorage.authToken).sub.id
@@ -61,7 +60,7 @@ export const actionGetUserData = () => {
                     login, _id, avatar {_id, url, originalFileName}
                 }
             }
-        `, { userId: JSON.stringify([{_id}]) }))
+        `, { userId: JSON.stringify([{ _id }]) }))
     )
 }
 

+ 25 - 26
src/reducers/index.js

@@ -2,33 +2,32 @@ import { jwtDecode } from '../App'
 
 export function authReducer(state, { type, token }) {
     if (!state) {
-      if (localStorage.authToken) {
-        type = 'AUTH_LOGIN'
-        token = localStorage.authToken
-      } else {
-        return {}
-      }
+        if (localStorage.authToken) {
+            type = 'AUTH_LOGIN'
+            token = localStorage.authToken
+        } else {
+            return {}
+        }
     }
     if (type === 'AUTH_LOGIN') {
-      let auth = jwtDecode(token)
-      if (auth) {
-        localStorage.authToken = token
-        return { token, payload: auth }
-      }
+        let auth = jwtDecode(token)
+        if (auth) {
+            localStorage.authToken = token
+            return { token, payload: auth }
+        }
     }
     if (type === 'AUTH_LOGOUT') {
-      localStorage.authToken = ''
-      return {}
+        localStorage.authToken = ''
+        return {}
     }
-  
     return state
 }
-  
+
 export function promiseReducer(state = {}, { type, name, status, payload, error }) {
     if (type === 'PROMISE') {
         return {
-        ...state,
-        [name]: { status, payload: (state === 'PENDING' && state[name] && state[name].payload) || payload, error }
+            ...state,
+            [name]: { status, payload: (state === 'PENDING' && state[name] && state[name].payload) || payload, error }
         }
     }
     return state
@@ -37,15 +36,15 @@ export function promiseReducer(state = {}, { type, name, status, payload, error
 export const localStoreReducer = (reducer, localStorageName) => {
     return (
         (state, action) => {
-        let newState
-        if(!state && localStorage.getItem(localStorageName)) {
-            newState =  JSON.parse(localStorage.getItem(localStorageName))
-            console.log(newState)
-        } else {
-            newState = reducer(state, action)
-            localStorage.setItem(localStorageName, JSON.stringify(newState))
-        }
-        return newState 
+            let newState
+            if (!state && localStorage.getItem(localStorageName)) {
+                newState = JSON.parse(localStorage.getItem(localStorageName))
+                console.log(newState)
+            } else {
+                newState = reducer(state, action)
+                localStorage.setItem(localStorageName, JSON.stringify(newState))
+            }
+            return newState
         }
     )
 }