Merge pull request #2 from TheLukaszNs/master

Update develop with master

Author: TheLukaszNs

android/app/build.gradle

@@ -140,6 +140,7 @@ dependencies {
     compile "com.google.firebase:firebase-core:11.0.0"
     compile "com.google.firebase:firebase-analytics:11.0.0"
     compile "com.google.firebase:firebase-perf:11.0.0"
+    compile "com.google.firebase:firebase-database:11.0.0"
 
     // If you are receiving Google Play API availability issues, add the following dependency
     // compile "com.google.android.gms:play-services-base:11.0.0"

android/app/src/main/java/org/gdgsrilanka/codelanka/eznet/MainApplication.java

@@ -17,6 +17,9 @@
 import io.invertase.firebase.analytics.RNFirebaseAnalyticsPackage;
 import io.invertase.firebase.crash.RNFirebaseCrashPackage;
 import io.invertase.firebase.perf.RNFirebasePerformancePackage;
+import io.invertase.firebase.database.RNFirebaseDatabasePackage;
+
+import com.google.firebase.database.FirebaseDatabase;
 
 public class MainApplication extends Application implements ReactApplication {
 
@@ -34,6 +37,7 @@ protected List<ReactPackage> getPackages() {
           new RNFirebaseAnalyticsPackage(),
           new RNFirebaseCrashPackage(),
           new RNFirebasePerformancePackage(),
+          new RNFirebaseDatabasePackage(),
             new VectorIconsPackage()
       );
     }
@@ -48,5 +52,6 @@ public ReactNativeHost getReactNativeHost() {
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
+    FirebaseDatabase.getInstance().setPersistenceEnabled(true);
   }
 }

package.json

@@ -18,7 +18,8 @@
     "react-native-responsive-image": "^2.1.0",
     "react-navigation": "^1.0.0-beta.11",
     "react-redux": "^5.0.5",
-    "redux": "^3.7.1"
+    "redux": "^3.7.1",
+    "redux-thunk": "^2.2.0"
   },
   "devDependencies": {
     "babel-eslint": "^7.2.3",

src/actions/index.js

@@ -1,8 +1,11 @@
 import { FETCH_DATA } from './types';
 
-import { categories as data } from './../api/dummy_api';
+import Api from '../api/Api';
 
-export const actionFetchData = () => ({
-  type: FETCH_DATA,
-  payload: data,
-});
+export const actionFetchData = () => (dispatch) => {
+  Api.getCombinedData(Api.getCategories, Api.getSites)
+    .then(data => dispatch({
+      type: FETCH_DATA,
+      payload: data,
+    }));
+};

src/api/Api.js

@@ -0,0 +1,71 @@
+import Firebase from './Firebase';
+
+
+class Api {
+  /**
+   * This method will return Promise containing something like this:
+   {
+    id: '1',
+    title: 'පුවත් පත්',
+    thumbnail: 'CATEGORY_NEWSPAPERS',
+    items: [
+      {
+        id: '1_1',
+        title: 'දිවයින',
+        thumbnail: 'NEWSPAPERS_DIVAINA',
+        url: 'http://www.divaina.com/',
+      },
+    ]
+   }
+   * @param categories [reference to categories Promise]
+   * @param sites [reference to sites Promise]
+   * @returns {Promise}
+   */
+  static getCombinedData = (categories, sites) => new Promise((resolve, reject) => {
+    const finalArr = [];
+    categories()
+      .then((categoriesData) => {
+        Object.keys(categoriesData).map((key, index) => {
+          const title = key;
+          const newTitle = title.charAt(0).toUpperCase() + title.slice(1);
+          return finalArr.push({ id: index + 1, title: newTitle, thumbnail: undefined });
+          // we have to add Thumbnail (both - to Firebase and a[[)
+        });
+        return finalArr;
+      })
+      .then((nextData) => {
+        const newArray = [];
+        nextData.map((key, index) => sites(key.title)
+          .then((siteData) => {
+            const itemsArray = []; // helper Array to store all formatted items
+            Object.keys(siteData).map((key1, index1) => itemsArray.push({
+              id: `${finalArr[index].id}_${index1}`,
+              title: key1,
+              url: `http://${siteData[key1].url}`, // for now it will produce bad URL for links starting with http:// or https:// [needs to be changed in database]
+            }));
+            newArray.push({ ...finalArr[index], items: itemsArray });
+            if (newArray.length === finalArr.length) {
+              resolve(newArray);
+            }
+          }));
+      })
+      .catch(err => reject(err));
+  });
+
+  /**
+   * Returns promise with all sites in given category
+   * @param category
+   * @returns {Promise}
+   */
+  static getSites = category => Firebase.database().ref(`/Sites/${category}`).once('value')
+    .then(snapshot => snapshot.val());
+
+  /**
+   * Returns promise with all categories
+   * @returns {Promise}
+   */
+  static getCategories = () => Firebase.database().ref('/Categories').once('value')
+    .then(snapshot => snapshot.val());
+}
+
+export default Api;

src/api/Firebase.js

@@ -0,0 +1,6 @@
+import firebase from 'react-native-firebase';
+
+const firebseInstance = firebase.initializeApp();
+
+// It's exporting initialized Firebase Instance
+export default firebseInstance;

src/components/App.js

@@ -36,15 +36,18 @@ class Categories extends Component {
   renderCategories() {
     const { navigate } = this.props.navigation;
 
-    const nodes = this.props.categoryData.map(category => (
-      <BoxItem
-        key={category.id}
-        onPress={() => navigate('Detail', { title: category.title, items: category.items })}
-        {...category}
-      />
-    ));
+    let nodes = null;
+    if (this.props.categoryData.length !== 0) {
+      nodes = this.props.categoryData.map(category => (
+        <BoxItem
+          key={category.id}
+          onPress={() => navigate('Detail', { title: category.title, items: category.items })}
+          {...category}
+        />
+      ));
+    }
 
-    return (
+    return nodes === null ? null : (
       <TwoColumnView>
         {nodes}
       </TwoColumnView>

src/index.js

@@ -1,12 +1,19 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { createStore } from 'redux';
+import {
+  createStore,
+  applyMiddleware,
+  compose,
+} from 'redux';
+import thunk from 'redux-thunk';
 import reducers from './reducers';
 
 import EZNetApp from './EZNetApp';
 
+const store = compose(applyMiddleware(thunk))(createStore)(reducers);
+
 export default () => (
-  <Provider store={createStore(reducers)}>
+  <Provider store={store}>
     <EZNetApp />
   </Provider>
 );