Merge pull request #5 from AllenFang/app-alert

Implement for App Alert

Author: CYBAI

package.json

@@ -32,6 +32,7 @@
     "bootstrap-sass": "^3.3.7",
     "color": "~1.0.3",
     "cookie-parser": "~1.4.3",
+    "cors": "^2.8.3",
     "crossroads": "~0.12.2",
     "diff2html": "^2.3.0",
     "express": "~4.15.2",
@@ -60,6 +61,7 @@
     "react-dom": "^15.5.4",
     "react-redux": "^5.0.4",
     "redux": "^3.6.0",
+    "redux-thunk": "^2.2.0",
     "rimraf": "~2.6.1",
     "semver": "~5.3.0",
     "serve-static": "~1.12.2",

source/server.js

@@ -3,6 +3,7 @@ const BugTracker = require('./bugtracker');
 const bugtracker = new BugTracker('server');
 const usageStatistics = require('./usage-statistics');
 const express = require('express');
+const cors = require('cors')
 const gitApi = require('./git-api');
 const winston = require('winston');
 const sysinfo = require('./sysinfo');
@@ -107,6 +108,7 @@ const noCache = (req, res, next) => {
 app.use(noCache);
 
 app.use(require('body-parser').json());
+app.use(cors());  // we should consider to remove it when we complete this project
 
 if (config.autoShutdownTimeout) {
   let autoShutdownTimeout;
@@ -270,6 +272,20 @@ app.get('/serverdata.js', (req, res) => {
     });
 });
 
+app.get('/ungit/config', (req, res) => {
+  sysinfo.getUserHash()
+    .then((hash) => {
+      const ungitConfig = {
+        config,
+        userHash: hash,
+        version: config.ungitDevVersion,
+        platform: os.platform(),
+        pluginApiVersion: require('../package.json').ungitPluginApiVersion
+      };
+      res.send(JSON.stringify(ungitConfig));
+    });
+});
+
 app.get('/api/latestversion', (req, res) => {
   sysinfo.getUngitLatestVersion()
     .then((latestVersion) => {

src-react/actions/bootstrap.js

@@ -0,0 +1,12 @@
+import { fetchUngitConfig } from './ungit-config';
+import { fetchLatestVersion, fetchGitVersion } from './version';
+import { pending } from './common';
+
+export function bootstrap() {
+  return dispatch => {
+    dispatch(pending(3));
+    dispatch(fetchUngitConfig());
+    dispatch(fetchLatestVersion());
+    dispatch(fetchGitVersion());
+  };
+}

src-react/actions/common.js

@@ -0,0 +1,16 @@
+/* This export common using actionCreator */
+import * as types from 'constants/action-types';
+
+export function pending(count) {
+  return {
+    type: types.PATH_PAGE_PENDING,
+    payload: count || 1
+  };
+};
+
+export function apiError(message) {
+  return {
+    type: types.PATH_PAGE_API_ERR,
+    payload: message
+  };
+}

src-react/actions/ungit-config.js

@@ -0,0 +1,29 @@
+import * as types from 'constants/action-types';
+import { fetchUserConfig } from './user-config';
+import { apiError, pending } from './common';
+
+export function fetchUngitConfig() {
+  return dispatch => {
+    // consider wrap API call in separate modules
+    // it will be easy to stub module's function when testing
+    fetch('http://localhost:8448/ungit/config')
+      .then(response => response.json())
+      .then(json => {
+        if (!json.config.bugtracking) {
+          dispatch(pending());
+          dispatch(fetchUserConfig());
+        }
+        dispatch(receiveUngitConfig(json));
+      })
+      .catch(e => {
+        dispatch(apiError(e.message));
+      });
+  };
+};
+
+function receiveUngitConfig(ungitConfig) {
+  return {
+    type: types.RECEIVE_UNGIT_CONFIG,
+    payload: ungitConfig
+  };
+};

src-react/actions/user-config.js

@@ -0,0 +1,25 @@
+import * as types from 'constants/action-types';
+import { apiError } from './common';
+
+export function fetchUserConfig() {
+  return dispatch => {
+    // consider wrap API call in separate modules
+    // it will be easy to stub module's function when testing
+    fetch('http://localhost:8448/api/userconfig')
+      .then(response => response.json())
+      .then(json => {
+        dispatch(receiveUserConfig(json));
+      })
+      .catch(e => {
+        dispatch(apiError(e.message));
+      });
+  };
+};
+
+
+function receiveUserConfig(userConfig) {
+  return {
+    type: types.RECEIVE_USER_CONFIG,
+    payload: userConfig
+  };
+};

src-react/actions/version.js

@@ -0,0 +1,46 @@
+import * as types from 'constants/action-types';
+import { apiError } from './common';
+
+export function fetchLatestVersion() {
+  return dispatch => {
+    // consider wrap API call in separate modules
+    // it will be easy to stub module's function when testing
+    fetch('http://localhost:8448/api/latestversion')
+      .then(response => response.json())
+      .then(json => {
+        dispatch(receiveLatestVersion(json));
+      })
+      .catch(e => {
+        dispatch(apiError(e.message));
+      });
+  };
+}
+
+export function fetchGitVersion() {
+  return dispatch => {
+    // consider wrap API call in separate modules
+    // it will be easy to stub module's function when testing
+    fetch('http://localhost:8448/api/gitversion')
+      .then(response => response.json())
+      .then(json => {
+        dispatch(receiveGitVersion(json));
+      })
+      .catch(e => {
+        dispatch(apiError(e.message));
+      });
+  };
+}
+
+function receiveGitVersion(gitVersion) {
+  return {
+    type: types.RECEIVE_GIT_VERSION,
+    payload: gitVersion
+  };
+}
+
+function receiveLatestVersion(latestVersion) {
+  return {
+    type: types.RECEIVE_LATEST_VERSION,
+    payload: latestVersion
+  };
+};

src-react/components/alert-area/bug-tracking-nag-screen.js

@@ -0,0 +1,17 @@
+import React, { Component } from 'react';
+
+class BugTrackingNagScreen extends Component {
+  render() {
+    return (
+      <div className="alert alert-info clearfix">
+        <button type="button" className="close" data-bind="click: dismissBugtrackingNagscreen">&times;</button>
+        <p><strong>Help make ungit better with the press of a button!</strong></p>
+        <button className="btn btn-primary" data-bind="click: enableBugtrackingAndStatistics">Enable automatic bug reports + anonymous usage statistics</button>
+        <button className="btn btn-primary" data-bind="click: enableBugtracking">Enable automatic bug reports</button>
+        <button className="btn btn-default" data-bind="click: dismissBugtrackingNagscreen">Naah, I&#39;ll skip that</button>
+      </div>
+    );
+  }
+}
+
+export default BugTrackingNagScreen;

src-react/components/alert-area/git-version-error.js

@@ -0,0 +1,18 @@
+import React, { Component, PropTypes } from 'react';
+
+class GitVersionError extends Component {
+  static propTypes = {
+    gitVersionError: PropTypes.string
+  }
+
+  render() {
+    return (
+      <div class="alert alert-danger">
+        <span>{ this.props.gitVersionError }</span>
+        <button type="button" className="close" data-bind="click: dismissGitVersionError">&times;</button>
+      </div>
+    );
+  }
+}
+
+export default GitVersionError;

src-react/components/alert-area/index.js

@@ -0,0 +1,62 @@
+import React, { Component, PropTypes } from 'react';
+
+import GitVersionError from './git-version-error';
+import NewVersionAvailable from './new-version-available';
+import BugTrackingNagScreen from './bug-tracking-nag-screen';
+import NPSSurvey from './nps-survey';
+
+class AlertArea extends Component {
+  static propTypes = {
+    config: PropTypes.object.isRequired,
+    gitVersionErrorVisible: PropTypes.bool.isRequired,
+    showNewVersionAvailable: PropTypes.bool.isRequired,
+    showBugtrackingNagscreen: PropTypes.bool.isRequired,
+    showNPSSurvey: PropTypes.bool.isRequired
+  }
+
+  render() {
+    const {
+      config: {
+        ungitConfig: { platform },
+        versions: {
+          gitVersion: { error },
+          latestVersion: {
+            latestVersion
+          }
+        }
+      },
+      gitVersionErrorVisible,
+      showNewVersionAvailable,
+      showBugtrackingNagscreen,
+      showNPSSurvey
+    } = this.props;
+    return (
+      <div className="container" data-ta-container="app">
+        {
+          gitVersionErrorVisible ? (
+            <GitVersionError gitVersionError={ error }/>
+          ) : null
+        }
+        {
+          showNewVersionAvailable ? (
+            <NewVersionAvailable
+              latestVersion={ latestVersion }
+              platform={ platform }/>
+          ) : null
+        }
+        {
+          showBugtrackingNagscreen ? (
+            <BugTrackingNagScreen />
+          ) : null
+        }
+        {
+          showNPSSurvey ? (
+            <NPSSurvey />
+          ) : null
+        }
+      </div>
+    );
+  }
+}
+
+export default AlertArea;