axios 5-18

app/actions/authActions.js

@@ -0,0 +1,27 @@
+// import axios from 'axios'
+// import * as types from './types'
+// import { AsyncStorage } from 'react-native'
+// import DeviceInfo from 'react-native-device-info'
+// import setAuthorizationToken from '../lib/setAuthorizationToken'
+
+// export function getToken() {
+//   const uuid = DeviceInfo.getUniqueID()
+//   const json = { user: { uuid: uuid } }
+//   return dispatch => {
+//     AsyncStorage.getItem(`userToken`).then(
+//       (res) => {
+//         if (!res) {
+//           axios.post('/users/tourists', json)
+//             .then((res) => {
+//               setAuthorizationToken(res.token)
+//               AsyncStorage.setItem(`userToken`, res.token)
+//             })
+//         }
+//         else{
+//           setAuthorizationToken(res)
+//         }
+//       }
+//     )
+//   }
+// }
+

app/actions/bookshelves.js

@@ -1,27 +1,42 @@
 import axios from 'axios'
 import * as types from './types'
 import { AsyncStorage } from 'react-native'
+import setAuthorizationToken from '../lib/setAuthorizationToken'
 
-export function getBookshelf(uuid) {
+export function getBookshelfFirst() {
   return (dispatch, getState) => {
-    const json = { user: {uuid: uuid}}
-    return AsyncStorage.getItem(`userToken`)
-      .then((data) => {
-        if (!data) {
+    AsyncStorage.getItem(`userToken`).then(
+      (res) => {
+        if (!res) {
           axios.post('/users/tourists', json)
-            .then((_data) => {
-              console.log(_data)
-              AsyncStorage.setItem(`userToken`, _data.token)
-              dispatch(setSearchedBookshelves({bookshelf: ''}));
+            .then((res) => {
+              setAuthorizationToken(res.token)
+              AsyncStorage.setItem(`userToken`, res.token)
             })
         }
-        else {
-          axios.get('/bookshelfs', '', data)
-            .then((_data) => {
-              dispatch(setSearchedBookshelves({bookshelf: _data.list}));
-            })
+        else{
+          setAuthorizationToken(res)
+          axios.get('/bookshelfs')
+            .then(
+              (res) => {
+                dispatch(setSearchedBookshelves({ bookshelf: res.data.list }));
+              },
+              (err) => console.log(err)
+            )
         }
-      })
+      }
+    )
+  }
+}
+
+export function getBookshelf() {
+  return (dispatch) => {
+    axios.get('/bookshelfs').then(
+      (res) => {
+        dispatch(setSearchedBookshelves({ bookshelf: res.data.list }));
+      },
+      (err) => console.log(err)
+    )
   }
 }
 
@@ -34,17 +49,16 @@ export function setSearchedBookshelves({ bookshelf }) {
 
 export function orderNovel(id) {
   return (dispatch, getState) => {
-    // AsyncStorage.getItem('userToken')
-    //   .then((data) => {
-    //     console.log(data)
-    //   })
-    Request.post('/bookshelfs/order', {id: id}, 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjU4Yzk0OTk3ZDE4ZTIwMjRiNjYzNjBmYiIsImlhdCI6MTQ4OTgxMzYwNH0.kgCcISiRUTuagiaQMYO3cQ-R2sTo2z0X6HCpgSEkZq4')
+    return axios.post('/bookshelfs/order', {id: id})
   }
 }
 
 export function delect(id) {
   return (dispatch, getState) => {
-    Request.post('/bookshelfs/delect', {id: id})
-      .then((data) => {})
+    return axios.post('/bookshelfs/delect', {id: id})
   }
 }
+
+
+
+

app/actions/index.js

@@ -2,10 +2,13 @@ import * as BookshelfActions from './bookshelves'
 import * as NavigationActions from './navigation'
 import * as ReaderActions from './reader'
 import * as SearchActions from './search'
+import * as AuthActions from './authActions'
 
 export const ActionCreators = Object.assign({},
-  BookshelfActions,
-  NavigationActions,
+  AuthActions,
   ReaderActions,
   SearchActions,
-);
+  BookshelfActions,
+  NavigationActions,
+)
+

app/actions/reader.js

@@ -1,34 +1,27 @@
-import { AsyncStorage } from 'react-native';
+import { AsyncStorage } from 'react-native'
 import * as types from './types'
-import Request from '../lib/request'
+import axios from 'axios'
 
 export function getFirstRenderChapters(id) {
   return (dispatch, getState) => {
-    AsyncStorage.getItem('userToken')
-      .then((token) => {
-        Request.get(`/chapters/firstRender/${id}`, '', token)
-          .then((res) => {
-            dispatch({
-              type: types.GET_FIRST_RENDER_CHAPTER,
-              firstRenderChapters: res.response
-            });
+    axios.get(`/chapters/firstRender/${id}`).then(
+      (res) => {
+        dispatch({
+            type: types.GET_FIRST_RENDER_CHAPTER,
+            firstRenderChapters: res.data.response
           })
-      })
-      .catch( (e) => {
-        console.log(e);
-      })
+      }
+    )
   }
 }
 
-
-
 export function getChapter(id, num) {
   const json = {
     novelId: id,
     num: num
   }
   return (dispatch, getState) => {
-    return Request.post(`/chapters`, json)
+    return axios.post(`/chapters`, json)
       .then((data) => {
         dispatch({
           type: types.SET_CHAPTER_DETAIL,
@@ -44,9 +37,9 @@ export function setChapterDetail({ chapterContent }) {
 
 export function getNextChatperDetail(id) {
   return (dispatch, getState) => {
-    return Request.get(`/chapters/next/${id}`, '')
-      .then( (data) => {
-        dispatch(setNextChatperDetail({chapterContent: data.detail}));
+    return axios.get(`/chapters/next/${id}`)
+      .then( (res) => {
+        dispatch(setNextChatperDetail({chapterContent: res.data.detail}));
       })
   }
 }
@@ -60,9 +53,9 @@ export function setNextChatperDetail({ chapterContent }) {
 
 export function getLastChapterDetail(id) {
   return (dispatch, getState) => {
-    return Request.get(`/chapters/last/${id}`, '')
-      .then( (data) => {
-        dispatch(setLastChatperDetail({chapterContent: data.detail}));
+    return axios.get(`/chapters/last/${id}`)
+      .then( (res) => {
+        dispatch(setLastChatperDetail({chapterContent: res.data.detail}));
       })
   }
 }
@@ -76,9 +69,9 @@ export function setLastChatperDetail({ chapterContent }) {
 
 export function getDirectory(id, order = 1) {
   return (dispatch, getState) => {
-    Request.get(`/novels/directory/${id}`, {order: order})
-      .then( (data) => {
-        dispatch(setDirectory({results: data.results}));
+    axios.get(`/novels/directory/${id}?order=${order}`)
+      .then( (res) => {
+        dispatch(setDirectory({results: res.data.results}));
       })
   }
 }

app/actions/search.js

@@ -1,14 +1,13 @@
 import { AsyncStorage } from 'react-native'
 import * as types from './types'
-import Request from '../lib/request'
-
+import axios from 'axios'
 
 export function searchNovelWords(text) {
   return (dispatch, getState) => {
-    Request.get('/novels/search/zh', {keyword: text})
-      .then((data) => {
-        dispatch(setSearchNovelWords({novelName: data.response.r}))
-      })
+    axios.get(`/novels/search/zh?keyword=${text}`)
+      .then(
+        (res) => dispatch(setSearchNovelWords({novelName: res.data.response.r}))
+     )
   }
 }
 
@@ -21,10 +20,10 @@ export function setSearchNovelWords({ novelName }) {
 
 export function searchNovelList(name) {
   return (dispatch, getState) => {
-    Request.get('/novels/search/bqk', {name: name})
-      .then((data) => {
-        dispatch(setSearchNovelList({name: data.response}))
-      })
+    axios.get(`/novels/search/bqk?name=${name}`)
+      .then(
+        (res) => dispatch(setSearchNovelList({name: res.data.response}))
+      )
   }
 }
 
@@ -43,16 +42,9 @@ export function searchNovelInfo(name, url) {
     }
   }
   return (dispatch, getState) => {
-    AsyncStorage.getItem('userToken')
-      .then((data) => {
-        Request.post('/novels/acquire', json, data)
-          .then((data) => {
-            dispatch(setSearchNovelInfo({novelInfo: data.novelInfo}))
-          })
-          .catch( (e) => {
-            console.log(e);
-          })
-      })
+    axios.post('/novels/acquire', json).then(
+      (res) => dispatch(setSearchNovelInfo({novelInfo: res.data.novelInfo}))
+    )
   }
 }
 
@@ -65,7 +57,7 @@ export function setSearchNovelInfo({ novelInfo }) {
 
 export function searchImg(type) {
   return (dispatch, getState) => {
-    Request.get('/test/img', {type: type})
+    axios.get('/test/img', {type: type})
       .then((data) => {
         dispatch(getImg({imgUrl: data.url}))
       })

app/containers/About.js

@@ -1,5 +1,5 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
+import React, { Component } from 'react'
+import { connect } from 'react-redux'
 import {
   PixelRatio,
   ScrollView,
@@ -13,12 +13,7 @@ import {
   StyleSheet,
   RefreshControl,
 } from 'react-native';
-import { appStyle } from '../styles';
-
-import DeviceInfo from 'react-native-device-info'
-import Swipeout from 'react-native-swipeout'
-
-
+import { appStyle } from '../styles'
 
 class About extends Component {
   constructor(props) {

app/containers/ApplicationTabs/index.ios.js

@@ -5,6 +5,7 @@ import React, { Component } from 'react'
 import { bindActionCreators } from 'redux'
 import { ActionCreators } from '../../actions'
 import { View, TabBarIOS, TabBarItemIOS } from 'react-native'
+import { AsyncStorage } from 'react-native'
 
 class ApplicationTabs extends Component {
 
@@ -14,7 +15,7 @@ class ApplicationTabs extends Component {
   }
 
   componentWillMount() {
-    this.props.getBookshelf(DeviceInfo.getUniqueID())
+
   }
 
   onPress(index) {
@@ -26,7 +27,7 @@ class ApplicationTabs extends Component {
       <View style={ { flex: 1 } }>
         { React.createElement(component, this.props) }
       </View>
-    );
+    )
   }
 
   render() {
@@ -61,7 +62,7 @@ function mapStateToProps(state) {
 }
 
 function mapDispatchToProps(dispatch) {
-  return bindActionCreators(ActionCreators, dispatch);
+  return bindActionCreators(ActionCreators, dispatch)
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(ApplicationTabs);
+export default connect(mapStateToProps, mapDispatchToProps)(ApplicationTabs)

app/containers/Detail.js

@@ -28,11 +28,14 @@ class Detail extends Component{
 
   orderNovel(id, join)  {
     if (!join) {
-      this.props.orderNovel(id).then(
-        (res) => this.props.getBookshelf(DeviceInfo.getUniqueID()),
-        (err) => { console.log(err) }
-      )
-      this.props.navigateReset([{key: 'ApplicationTabs'}], 0)
+      this.props.orderNovel(id)
+        .then(
+          (res) => {
+            this.props.getBookshelf()
+            this.props.navigateReset([{key: 'ApplicationTabs'}], 0)
+          },
+          (err) => { console.log(err) }
+        )
     }
   }
 

app/containers/Directory.js

@@ -49,9 +49,6 @@ class Directory extends Component{
     AsyncStorage.getItem('userToken')
       .then((token) => {
         Request.post(`/bookshelfs/change`, json, token)
-          .then((res) => {
-            return true
-          })
       })
       .catch( (e) => {
         console.log(e);