diff --git a/src/app.js b/src/app.js index a13b632..d4da58f 100644 --- a/src/app.js +++ b/src/app.js @@ -51,7 +51,7 @@ import Scenario from './scenario/scenario'; import SimulationModel from './simulationmodel/simulation-model'; import Users from './user/users'; import User from './user/user'; -import ExDashboard from './dashboard/exdashboard'; + import './styles/app.css'; @@ -153,7 +153,6 @@ class App extends React.Component { - diff --git a/src/common/api/rest-api.js b/src/common/api/rest-api.js index d515079..4fb5395 100644 --- a/src/common/api/rest-api.js +++ b/src/common/api/rest-api.js @@ -73,7 +73,6 @@ class RestAPI { } post(url, body, token) { - console.log(url); return new Promise(function (resolve, reject) { var req = request.post(url).send(body).timeout({ response: 5000 }); // Simple response start timeout (3s) diff --git a/src/common/menu-sidebar.js b/src/common/menu-sidebar.js index be42a68..5f43425 100644 --- a/src/common/menu-sidebar.js +++ b/src/common/menu-sidebar.js @@ -35,7 +35,6 @@ class SidebarMenu extends React.Component {
  • Home
  • Scenarios
  • Simulators
  • -
  • Example Dashboard
  • { this.props.currentRole === 'Admin' ?
  • User Management
  • : '' } diff --git a/src/dashboard/exdashboard.js b/src/dashboard/exdashboard.js deleted file mode 100644 index 54ab039..0000000 --- a/src/dashboard/exdashboard.js +++ /dev/null @@ -1,66 +0,0 @@ -import React, { Component } from 'react'; -import { Container } from 'flux/utils'; -import DashboardStore from './dashboard-store'; -import AppDispatcher from '../common/app-dispatcher'; -import Table from '../common/table'; -import TableColumn from '../common/table-column'; -import UserStore from '../user/user-store' - - - - - - - -class ExDashboard extends Component { - static getStores() { - return [ DashboardStore ]; - } - - static calculateState(prevState, props) { - prevState = prevState || {}; - - console.log("calculateState has been called"); - const dashboards = DashboardStore.getState(); - let tokenState = UserStore.getState().token; - console.log(dashboards); - - return{ - dashboards, - tokenState - } - - } - - componentDidMount() { - AppDispatcher.dispatch({ - type: 'dashboards/start-load', - token: this.state.tokenState, - param: 'scenarioID=1' - }); - } - - - - - render() { - - return ( -
    -

    Dashboards

    - - - - - -
    -
    - ); - } -} - - - - -let fluxContainerConverter = require('../common/FluxContainerConverter'); -export default Container.create(fluxContainerConverter.convert(ExDashboard)); diff --git a/src/user/user.js b/src/user/user.js index 74ac1a8..e35a148 100644 --- a/src/user/user.js +++ b/src/user/user.js @@ -71,7 +71,6 @@ class User extends Component { closeEditModal(data) { this.setState({ editModal: false }); - console.log(data); if (data) { if(data.password === data.confirmpassword){