Fix merge

Author: cazetto

src/dashboard/Dashboard.js

@@ -52,6 +52,8 @@ import { setBasePath }    from 'lib/AJAX';
 import Header             from 'components/back4App/Header/Header.react';
 import Sidebar            from 'components/back4App/Sidebar/Sidebar.react';
 import ServerSettings     from 'dashboard/ServerSettings/ServerSettings.react';
+import { ActionTypes }    from 'lib/stores/back4App/AppsStore';
+import subscribeTo        from 'lib/subscribeTo';
 
 import {
   Router,
@@ -61,12 +63,17 @@ import {
 
 const ShowSchemaOverview = false; //In progress features. Change false to true to work on this feature.
 
+// @subscribeTo('Apps', 'apps')
+// @subscribeTo('Schema', 'schema')
+// @subscribeTo('Jobs', 'jobs')
 class App extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
       sidebarIsOpen: false
     };
+
+    console.log(this.props.apps)
   }
 
   handleSidebarToggle(isOpen) {
@@ -197,11 +204,17 @@ class Dashboard extends React.Component {
       });
       return Parse.Promise.when(appInfoPromises);
     }).then(function(resolvedApps) {
+<<<<<<< HEAD
       if(resolvedApps && resolvedApps.length) {
         resolvedApps.forEach(app => {
           AppsManager.addApp(app);
         });
       }
+=======
+      resolvedApps.forEach(app => {
+        AppsManager.addApp(app);
+      });
+>>>>>>> apps-notification
       this.setState({ configLoadingState: AsyncStatus.SUCCESS });
     }.bind(this)).fail(({ error }) => {
       this.setState({

src/dashboard/Data/Jobs/Jobs.react.js

@@ -59,7 +59,7 @@ function scheduleString(data) {
 }
 
 // TODO: create scrollable view component that handles lazy fetch container on scroll
-@subscribeTo('Jobs', 'jobs')
+@subscribeTo('Jobs', 'jobss')
 export default class Jobs extends TableView {
   constructor() {
     super();

src/lib/stores/back4App/AppsStore.js

@@ -0,0 +1,21 @@
+import keyMirror         from 'lib/keyMirror';
+import Parse             from 'parse';
+import { Map, List }     from 'immutable';
+import { registerStore } from 'lib/stores/StoreManager';
+
+export const ActionTypes = keyMirror([
+  'FETCH'
+]);
+  
+// Apps state should be an Immutable Map with the following fields:
+//   - lastFetch: the last time all data was fetched from the server
+//   - apps: An Immutable Map of schedule ids to Maps of apps details
+
+function AppsStore(state, action) {
+  switch (action.type) {
+    case ActionTypes.FETCH:
+      console.log('AppsStore:FETCH');
+  }
+}
+
+registerStore('Apps', AppsStore);