@@ -158,22 +107,18 @@ const mapStateToProps = (state) => {
return {
profilePic,
- feedback: state.feedback,
notifications : state.notifications.notifications
}
}
const mapDispatchToProps = dispatch => bindActionCreators(
- { showProfileMenu, openFeedbackModal, closeFeedbackModal, userSettings,openNotificationMenu }
+ { showProfileMenu, userSettings,openNotificationMenu }
, dispatch)
TopContent.propTypes = {
userSettings: PropTypes.func.isRequired,
- openFeedbackModal: PropTypes.func.isRequired,
- closeFeedbackModal: PropTypes.func.isRequired,
showProfileMenu: PropTypes.func.isRequired,
openNotificationMenu : PropTypes.func.isRequired,
- feedback: PropTypes.object.isRequired,
profilePic: PropTypes.oneOfType([
PropTypes.string,
PropTypes.oneOf([null,undefined])
diff --git a/admin-dashboard/src/constants/feedback.js b/admin-dashboard/src/constants/feedback.js
deleted file mode 100644
index f7ba3dfbe2..0000000000
--- a/admin-dashboard/src/constants/feedback.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export const OPEN_FEEDBACK_MODAL = 'OPEN_FEEDBACK_MODAL';
-export const CLOSE_FEEDBACK_MODAL = 'CLOSE_FEEDBACK_MODAL';
-// Create new project
-
-export const CREATE_FEEDBACK_SUCCESS = 'feedback/CREATE_FEEDBACK_SUCCESS';
-export const CREATE_FEEDBACK_FAILED = 'feedback/CREATE_FEEDBACK_FAILED';
-export const CREATE_FEEDBACK_REQUEST = 'feedback/CREATE_FEEDBACK_REQUEST';
-export const CREATE_FEEDBACK_RESET = 'feedback/CREATE_FEEDBACK_RESET';
\ No newline at end of file
diff --git a/admin-dashboard/src/pages/DashboardView.js b/admin-dashboard/src/pages/DashboardView.js
deleted file mode 100644
index 380c658338..0000000000
--- a/admin-dashboard/src/pages/DashboardView.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, { Component } from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import { destroy } from 'redux-form';
-import Dashboard from '../components/Dashboard';
-import PropTypes from 'prop-types';
-
-class DashboardView extends Component {
-
- componentDidMount() {
- if(window.location.href.indexOf('localhost') <= -1){
- this.context.mixpanel.track('Main page Loaded');
- }
- }
-
- render() {
- return (
-
-
-
- );
- }
-}
-
-const mapDispatchToProps = (dispatch) => {
- return bindActionCreators({ destroy }, dispatch)
-}
-
-const mapStateToProps = state => {
-
- return {
- };
-}
-
-DashboardView.contextTypes = {
- mixpanel: PropTypes.object.isRequired
-};
-
-DashboardView.propTypes = {
-}
-
-DashboardView.displayName = 'DashboardView'
-
-export default connect(mapStateToProps, mapDispatchToProps)(DashboardView);
\ No newline at end of file
diff --git a/admin-dashboard/src/pages/Users.js b/admin-dashboard/src/pages/Users.js
new file mode 100644
index 0000000000..e546b2cbfc
--- /dev/null
+++ b/admin-dashboard/src/pages/Users.js
@@ -0,0 +1,134 @@
+import React, { Component } from 'react';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import { destroy } from 'redux-form';
+import Dashboard from '../components/Dashboard';
+import PropTypes from 'prop-types';
+
+class Users extends Component {
+
+ componentDidMount() {
+ if(window.location.href.indexOf('localhost') <= -1){
+ this.context.mixpanel.track('Main page Loaded');
+ }
+ }
+
+ render() {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Users
+
+
+ Here are all the members who belong to.
+
+
+
+
+
+
+
+
+
+
+ User
+
+
+ Projects
+
+
+ Status
+
+
+
+
+
+
+
{this.props.name}
+
+ hello@fyipe.com
+
+
+
+
+ Fyipe Project and 2 other
+
+
+
+
+
+
+
+ Online a few seconds ago
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+}
+
+const mapDispatchToProps = (dispatch) => {
+ return bindActionCreators({ destroy }, dispatch)
+}
+
+const mapStateToProps = state => {
+
+ return {
+ };
+}
+
+Users.contextTypes = {
+ mixpanel: PropTypes.object.isRequired
+};
+
+Users.propTypes = {
+}
+
+Users.displayName = 'Users'
+
+export default connect(mapStateToProps, mapDispatchToProps)(Users);
\ No newline at end of file
diff --git a/admin-dashboard/src/pages/index.js b/admin-dashboard/src/pages/index.js
index 662110caf2..5c47bd2ee0 100644
--- a/admin-dashboard/src/pages/index.js
+++ b/admin-dashboard/src/pages/index.js
@@ -1,7 +1,7 @@
-import DashboardView from './DashboardView';
+import Users from './Users';
import Profile from './Profile';
export default {
- DashboardView,
+ Users,
Profile
}
diff --git a/admin-dashboard/src/reducers/feedback.js b/admin-dashboard/src/reducers/feedback.js
deleted file mode 100644
index 1e05f97383..0000000000
--- a/admin-dashboard/src/reducers/feedback.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { OPEN_FEEDBACK_MODAL, CLOSE_FEEDBACK_MODAL, CREATE_FEEDBACK_FAILED, CREATE_FEEDBACK_REQUEST, CREATE_FEEDBACK_SUCCESS } from '../constants/feedback'
-
-const initialState = {
- feedback:{
- error:null,
- requesting: false,
- success:false
- },
- feedbackModalVisble:false
-};
-
-export default (state = initialState, action) => {
- switch (action.type) {
- case OPEN_FEEDBACK_MODAL:
- return Object.assign({}, state, {
- feedbackModalVisble: true
- });
-
- case CLOSE_FEEDBACK_MODAL:
- return Object.assign({}, state, {
- feedbackModalVisble: false
- });
-
- case CREATE_FEEDBACK_FAILED:
- return Object.assign({}, state, {
- feedback: {
- requesting: false,
- error: action.payload,
- success: false,
-
- },
- });
-
- case CREATE_FEEDBACK_SUCCESS:
- return Object.assign({}, state, {
- feedback: {
- requesting: false,
- success: true,
- error: null
- }
- });
-
- case CREATE_FEEDBACK_REQUEST:
- return Object.assign({}, state, {
- feedback: {
- requesting: true,
- error: null,
- success: false,
- },
- });
-
- default: return state;
- }
-}
\ No newline at end of file
diff --git a/admin-dashboard/src/reducers/index.js b/admin-dashboard/src/reducers/index.js
index f06ecd8ff4..4c68ad4f44 100644
--- a/admin-dashboard/src/reducers/index.js
+++ b/admin-dashboard/src/reducers/index.js
@@ -3,7 +3,6 @@ import { routerReducer } from 'react-router-redux';
import { reducer as formReducer } from 'redux-form';
import modal from './modal';
import profileSettings from './profile';
-import feedback from './feedback';
import notifications from './notifications';
const appReducer = combineReducers({
@@ -11,7 +10,6 @@ const appReducer = combineReducers({
form: formReducer,
modal,
profileSettings,
- feedback,
notifications,
});
diff --git a/admin-dashboard/src/routes.js b/admin-dashboard/src/routes.js
index d5dc88f519..3598ee6037 100644
--- a/admin-dashboard/src/routes.js
+++ b/admin-dashboard/src/routes.js
@@ -1,7 +1,7 @@
import pages from './pages';
const {
- DashboardView
+ Users
} = pages;
export const groups = [
@@ -10,10 +10,10 @@ export const groups = [
visible: true,
routes: [
{
- title: 'Dashboard',
+ title: 'Users',
path: '/',
icon: 'atlas',
- component: DashboardView,
+ component: Users,
visible: true,
subRoutes: [],
index: 1