Add 'pull-to-refresh' in ListView and ArticleViewHEADmaster

Add host's constant for backend ip-address

5 files changed, 177 insertions, 145 deletions

diff --git a/frontend/app/app.js b/frontend/app/app.js
index f469e15..9ae6dd7 100644
--- a/frontend/app/app.js
+++ b/frontend/app/app.js
@@ -12,7 +12,6 @@ import { withRkTheme } from 'react-native-ui-kitten';
 import { AppRoutes } from './config/navigation/routesBuilder';
 import * as Screens from './screens';
 import { bootstrap } from './config/bootstrap';
-import track from './config/analytics';
 import { data } from './data';
 
 bootstrap();
@@ -53,9 +52,6 @@ export default class App extends React.Component {
             current: this.getCurrentRouteName(current),
             previous: this.getCurrentRouteName(previous),
         };
-        if (screen.previous !== screen.current) {
-            track(screen.current);
-        }
     };
 
     getCurrentRouteName = (navigation) => {
diff --git a/frontend/app/config/analytics.js b/frontend/app/config/analytics.js
deleted file mode 100644
index 6e48218..0000000
--- a/frontend/app/config/analytics.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Analytics, PageHit } from 'expo-analytics';
-
-const analytics = new Analytics('UA-112172761-2');
-
-const track = screen => analytics.hit(new PageHit(screen));
-
-export default track;
diff --git a/frontend/app/constants.js b/frontend/app/constants.js
new file mode 100644
index 0000000..dc38b00
--- /dev/null
+++ b/frontend/app/constants.js
@@ -0,0 +1 @@
+export const HOST = 'http://192.168.0.2:8000';
\ No newline at end of file
diff --git a/frontend/app/screens/articles/article.js b/frontend/app/screens/articles/article.js
index 059ab44..aedeb1d 100644
--- a/frontend/app/screens/articles/article.js
+++ b/frontend/app/screens/articles/article.js
@@ -1,94 +1,117 @@
 import React from 'react';
 import axios from 'axios';
-
-
 import {
-  ScrollView,
-  Image,
-  View,
-  TouchableOpacity,
+    ScrollView,
+    Image,
+    View,
+    RefreshControl,
 } from 'react-native';
+
 import {
-  RkCard,
-  RkText,
-  RkStyleSheet,
+    RkCard,
+    RkText,
+    RkStyleSheet,
 } from 'react-native-ui-kitten';
 import {
-  Avatar,
-  SocialBar,
+    Avatar,
+    SocialBar,
 } from '../../components';
 import NavigationType from '../../config/navigation/propTypes';
+import {HOST} from '../../constants'
 
 
 export class Article extends React.Component {
-  state = {
-    article: {},
-    mounted: false,
-  };
+    state = {
+        article: {},
+        mounted: false,
+        refreshing: false,
+    };
 
-  static propTypes = {
-    navigation: NavigationType.isRequired,
-  };
-  static navigationOptions = {
-    title: 'Current problem'.toUpperCase(),
-  };
+    static propTypes = {
+        navigation: NavigationType.isRequired,
+    };
+    static navigationOptions = {
+        title: 'Current problem'.toUpperCase(),
+    };
+
+
+    componentWillMount() {
+        this.makeRemoteRequest()
+    }
 
+    makeRemoteRequest = () => {
+        const articleId = this.props.navigation.getParam('id', 1);
+        console.log(articleId);
 
-  componentWillMount() {
-    const articleId = this.props.navigation.getParam('id', 1);
-    console.log(articleId);
+        axios.get(`${HOST}/api/articles/${articleId}`)
+            .then(res => {
+                this.setState({
+                    article: res.data,
+                    mounted: true,
+                    refreshing: false,
+                });
+                console.log(this.state.article);
+            });
+    };
 
-    axios.get(`http://192.168.1.43:8000/api/articles/${articleId}`)
-      .then(res => {
+    handleRefresh = () => {
         this.setState({
-          article: res.data,
-          mounted: true,
-        });
-        console.log(this.state.article);
-      });
-  }
-
-  render() {
-    if (this.state.mounted) {
-      return (
-        <ScrollView style={styles.root}>
-          <RkCard rkType='article'>
-            <Image
-              rkCardImg
-              source={{
-              uri: `${this.state.article.image.toString()
-                .replace('http://127.0.0.1:8000/', '')}`,
-            }}
-            />
-            <View rkCardHeader>
-              <View>
-                <RkText style={styles.title} rkType='header4'>{this.state.article.title}</RkText>
-              </View>
-
-
-            </View>
-            <View rkCardContent>
-              <View>
-                <RkText rkType='primary3 bigLine'>{this.state.article.text}</RkText>
-              </View>
-            </View>
-            <View rkCardFooter>
-              <SocialBar comments={this.state.article.n_comments} is_solved={this.state.article.is_solved ? 'Solved' : "Doesn't solved"}/>
-            </View>
-          </RkCard>
-        </ScrollView>
-
-      );
+            refreshing: true,
+        }, () => {
+            setTimeout(() => {
+                this.makeRemoteRequest()
+            }, 500)
+
+        })
+    };
+
+
+    render() {
+        if (this.state.mounted) {
+            return (
+                <ScrollView style={styles.root} refreshControl={
+                    <RefreshControl
+                        refreshing={this.state.refreshing}
+                        onRefresh={this.handleRefresh}
+                    />}>
+                    <RkCard rkType='article'>
+                        <Image
+                            rkCardImg
+                            source={{
+                                uri: `${this.state.article.image.toString()
+                                    .replace('http://127.0.0.1:8000/', '')}`,
+                            }}
+                        />
+                        <View rkCardHeader>
+                            <View>
+                                <RkText style={styles.title} rkType='header4'>{this.state.article.title}</RkText>
+                            </View>
+
+
+                        </View>
+                        <View rkCardContent>
+                            <View>
+                                <RkText rkType='primary3 bigLine'>{this.state.article.text}</RkText>
+                            </View>
+                        </View>
+                        <View rkCardFooter>
+                            <SocialBar comments={this.state.article.n_comments}
+                                       is_solved={this.state.article.is_solved ? 'Solved' : "Doesn't solved"}/>
+                        </View>
+                    </RkCard>
+                </ScrollView>
+
+            );
+        }
+        return null;
     }
-    return null;
-  }
 }
 
 const styles = RkStyleSheet.create(theme => ({
-  root: {
-    backgroundColor: theme.colors.screen.base,
-  },
-  title: {
-    marginBottom: 5,
-  },
+    root: {
+        backgroundColor: theme.colors.screen.base,
+    },
+    title: {
+        marginBottom: 5,
+    },
 }));
diff --git a/frontend/app/screens/articles/articles2.js b/frontend/app/screens/articles/articles2.js
index 0d48812..03a78da 100644
--- a/frontend/app/screens/articles/articles2.js
+++ b/frontend/app/screens/articles/articles2.js
@@ -1,84 +1,103 @@
 import React from 'react';
 import {
-  FlatList,
-  Image,
-  View,
-  TouchableOpacity,
+    FlatList,
+    Image,
+    View,
+    TouchableOpacity,
 } from 'react-native';
 import {
-  RkText,
-  RkCard, RkStyleSheet,
+    RkText,
+    RkCard, RkStyleSheet,
 } from 'react-native-ui-kitten';
 import axios from 'axios';
-import { SocialBar } from '../../components';
+import {SocialBar} from '../../components';
 import NavigationType from '../../config/navigation/propTypes';
+import {HOST} from '../../constants'
 
 
 export class Articles2 extends React.Component {
-  static propTypes = {
-    navigation: NavigationType.isRequired,
-  };
-  static navigationOptions = {
-    title: 'Problems List'.toUpperCase(),
-  };
+    static propTypes = {
+        navigation: NavigationType.isRequired,
+    };
+    static navigationOptions = {
+        title: 'Problems List'.toUpperCase(),
+    };
 
-  state = {
-    articles: [],
-  };
+    state = {
+        articles: [],
+        refreshing: false,
+    };
 
-  componentDidMount() {
-    axios.get('http://192.168.1.43:8000/api/articles')
-      .then(res => {
+    componentDidMount() {
+        this.makeRemoteRequest()
+    };
+
+    makeRemoteRequest = () => {
+        axios.get(`${HOST}/api/articles`)
+            .then(res => {
+                this.setState({
+                    articles: res.data,
+                    refreshing: false,
+                });
+
+            });
+    };
+
+    handleRefresh = () =>{
         this.setState({
-          articles: res.data,
-        });
+            refreshing: true,
+        }, () => {
+            setTimeout(()=>{this.makeRemoteRequest()}, 500)
 
-      });
-  }
+        })
+    };
 
-  extractItemKey = (item) => `${item.id}`;
+    extractItemKey = (item) => `${item.id}`;
 
-  onItemPressed = (item) => {
-    this.props.navigation.navigate('Article', { id: item.id });
-  };
+    onItemPressed = (item) => {
+        this.props.navigation.navigate('Article', {id: item.id});
+    };
 
-  renderItem = ({ item }) => (
-    <TouchableOpacity
-      delayPressIn={70}
-      activeOpacity={0.8}
-      onPress={() => this.onItemPressed(item)}>
-      <RkCard rkType='imgBlock' style={styles.card}>
-        <Image rkCardImg source={{ uri: `${item.image.toString().replace('http://127.0.0.1:8000/', '')}` }} />
-        <View rkCardImgOverlay rkCardContent style={styles.overlay}>
-          <RkText rkType='header4 inverseColor'>{item.title}</RkText>
-        </View>
-        <View rkCardFooter>
-          <SocialBar rkType='space' showLabel likes={item.rating} comments={item.n_comments} is_solved={item.is_solved ? 'Solved' : "Doesn't solved"} />
-        </View>
-      </RkCard>
-    </TouchableOpacity>
-  );
+    renderItem = ({item}) => (
+        <TouchableOpacity
+            delayPressIn={70}
+            activeOpacity={0.8}
+            onPress={() => this.onItemPressed(item)}>
+            <RkCard rkType='imgBlock' style={styles.card}>
+                <Image rkCardImg source={{uri: `${item.image.toString().replace('http://127.0.0.1:8000/', '')}`}}/>
+                <View rkCardImgOverlay rkCardContent style={styles.overlay}>
+                    <RkText rkType='header4 inverseColor'>{item.title}</RkText>
+                </View>
+                <View rkCardFooter>
+                    <SocialBar rkType='space' showLabel likes={item.rating} comments={item.n_comments}
+                               is_solved={item.is_solved ? 'Solved' : "Doesn't solved"}/>
+                </View>
+            </RkCard>
+        </TouchableOpacity>
+    );
 
-  render = () => (
-    <FlatList
-      data={this.state.articles}
-      renderItem={this.renderItem}
-      keyExtractor={this.extractItemKey}
-      style={styles.container}
-    />
-  );
+    render = () => (
+        <FlatList
+            data={this.state.articles}
+            renderItem={this.renderItem}
+            keyExtractor={this.extractItemKey}
+            style={styles.container}
+            refreshing={this.state.refreshing}
+            onRefresh={this.handleRefresh}
+        />
+    );
 }
 
 const styles = RkStyleSheet.create(theme => ({
-  container: {
-    backgroundColor: theme.colors.screen.scroll,
-    paddingVertical: 8,
-    paddingHorizontal: 14,
-  },
-  card: {
-    marginVertical: 8,
-  },
-  time: {
-    marginTop: 5,
-  },
+    container: {
+        backgroundColor: theme.colors.screen.scroll,
+        paddingVertical: 8,
+        paddingHorizontal: 14,
+    },
+    card: {
+        marginVertical: 8,
+    },
+    time: {
+        marginTop: 5,
+    },
 }));