topic pull refresh ci

soliury · soliury · commit 0a0db6b3dfe9 · 2016-04-06T19:42:16.000+08:00
diff --git a/app/containers/Home.js b/app/containers/Home.js
@@ -16,10 +16,8 @@ var {
     View,
     Component,
     PropTypes,
-    Text,
     StyleSheet,
     Image,
-    ActivityIndicatorIOS
     } = React
 
 class Home extends Component {
diff --git a/ios/noder/AppDelegate.m b/ios/noder/AppDelegate.m
@@ -31,7 +31,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
    * on the same Wi-Fi network.
    */
 
-  jsCodeLocation = [NSURL URLWithString:@"http://172.18.141.131:8081/index.ios.bundle?platform=ios&dev=true"];
+  jsCodeLocation = [NSURL URLWithString:@"http://169.254.221.161:8081/index.ios.bundle?platform=ios&dev=true"];
 
   /**
    * OPTION 2
diff --git a/src/components/TopicList.js b/src/components/TopicList.js
@@ -5,13 +5,14 @@ import React, {
 	Text,
 	ListView,
 	Dimensions,
-	PropTypes
+	PropTypes,
+	RefreshControl
 } from 'react-native';
 import TopicRow from './TopicRow';
 import moment from 'moment';
 
 
-const { height, width } = Dimensions.get('window');
+const {height, width} = Dimensions.get('window');
 
 
 class TopicList extends Component {
@@ -43,8 +44,9 @@ class TopicList extends Component {
 		}
 	}
 
-	_onScroll(e) {
 
+	_onRefresh() {
+		
 	}
 
 
@@ -133,7 +135,16 @@ class TopicList extends Component {
 					scrollRenderAheadDistance={90}
 					dataSource={this.state.ds}
 					renderRow={this.renderRow.bind(this)}
-					onScroll={this._onScroll.bind(this)}
+					refreshControl={
+						<RefreshControl
+							refreshing={this.state.isRefreshing}
+							onRefresh={this._onRefresh.bind(this)}
+							tintColor="rgba(241,196,15, 1)"
+							title="Loading..."
+							colors={['#ff0000', '#00ff00', '#0000ff']}
+							progressBackgroundColor="#ffff00"
+						  />
+					}
 				/>
 			</View>
 		)
diff --git a/src/layouts/Home.js b/src/layouts/Home.js
@@ -13,7 +13,6 @@ import UserOverlay from '../components/UserOverlay';
 import MessageOverlay from '../components/MessageOverlay';
 import ScrollableTabs from '../components/ScrollableTabs';
 import TopicList from '../components/TopicList';
-import config from '../configs';
 
 
 const { height, width } = Dimensions.get('window');
diff --git a/src/reducers/home.js b/src/reducers/home.js
@@ -1,13 +1,23 @@
 import * as types from '../constants/ActionTypes';
 
+const tabs = ['good', 'ask', 'all', 'share', 'job'];
 
-const initialState = {
-	loginModalVisible: false
+let initialState = {
+	tabStatus: {}
 };
 
+tabs.forEach((item)=> {
+	initialState.tabStatus[item] = {
+		pullRefreshPending: false,
+		reachedEndPending: false,
+		page: 0,
+		limit: 10
+	}
+});
+
 
 export default function (state = initialState, action) {
-	const { payload, error, meta, type } = action;
+	const {payload, error, meta, type} = action;
 
 	switch (type) {
 		case types.OPEN_LOGIN_MODAL:
diff --git a/src/reducers/topicUI.js b/src/reducers/topicUI.js
@@ -8,9 +8,9 @@ const initialState = {
 };
 
 export default function (state = initialState, action) {
-	const { type, meta={} } = action;
-	const { sequence={} } = meta;
-	const { id } = meta;
+	const {type, meta={}} = action;
+	const {sequence={}} = meta;
+	const {id} = meta;
 	const status = sequence.type;
 
 	switch (type) {
diff --git a/src/store/configureStore.js b/src/store/configureStore.js
@@ -16,7 +16,7 @@ var middlewares = [
 
 
 if (__DEV__) {
-	middlewares.push(logger());
+	// middlewares.push(logger());
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ var middlewares = [`
`16`	`16`
`17`	`17`
`18`	`18`	`if (__DEV__) {`
`19`		`- middlewares.push(logger());`
	`19`	`+ // middlewares.push(logger());`
`20`	`20`	`}`
`21`	`21`
`22`	`22`