Commit 4063547a authored by Francis Renaud's avatar Francis Renaud
Browse files

Fixed few linting errors. Added new AdvantEdge logo

parent e111dc79

js-apps/meep-frontend/src/img/AdvantEDGE-logo-NoTagline_White_RGB.png

0 → 100644
+12.7 KiB
Loading image diff...

js-apps/meep-frontend/src/js/components/meep-top-bar.js

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ const CorePodsLed = (props) => { 
const MeepTopBar = (props) => {

  /*eslint-disable */

  const logo = require('../../img/ID-Icon-01-idcc.svg');

  const advantEdge = require('../../img/AdvantEDGE-logo-NoTagline_White_RGB.png');

  /*eslint-enable */

  return (

    <Toolbar>
@@ -67,6 +68,12 @@ const MeepTopBar = (props) => { 
              alt=""

              onClick={() => {props.toggleMainDrawer();}}

            />

            <img

              id='AdvantEdgeLogo'

              height={50}

              src={advantEdge}

              alt=''

            />

            <ToolbarTitle><span style={titleStyle}>{props.title}</span></ToolbarTitle>

          </ToolbarSection>

          <ToolbarSection alignEnd>

js-apps/meep-frontend/src/js/containers/meep-container.js

+3 −3
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ import { 
} from '../state/ui';



// MEEP Controller REST API JS client

var basepath = 'http://' + location.host + location.pathname + 'v1';

//var basepath = 'http://10.3.16.73:30000/v1';

// var basepath = 'http://' + location.host + location.pathname + 'v1';

var basepath = 'http://10.3.16.73:30000/v1';



meepCtrlRestApiClient.ApiClient.instance.basePath = basepath.replace(/\/+$/, '');
@@ -360,7 +360,7 @@ class MeepContainer extends Component { 
    return (

      <div style={{width: '100%'}}>

        <MeepTopBar

          title="AdvantEDGE Controller"

          title=""

          toggleMainDrawer={() => this.props.toggleMainDrawer()}

          corePodsRunning={this.props.corePodsRunning}

          corePodsErrors={this.props.corePodsErrors}

js-apps/meep-frontend/src/js/containers/monitor/list-edit-pane.js

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
import React from 'react';

import _ from 'lodash';

import { Grid, GridCell } from '@rmwc/grid';

import { TextField, TextFieldHelperText } from '@rmwc/textfield';

import { TextField } from '@rmwc/textfield';

import { Checkbox } from '@rmwc/checkbox';

import { Button } from '@rmwc/button';

js-apps/meep-frontend/src/js/containers/monitor/monitor-page-container.js

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import IDConfirmDialog from '../../components/dialogs/id-confirm-dialog'; 


import {

  IDC_DIALOG_CONFIRM,

  uiChangeCurrentDialog,

  uiChangeCurrentDialog

} from '../../state/ui';



import {
@@ -332,7 +332,7 @@ const mapDispatchToProps = dispatch => { 
    changeDashboardUrl: (url) => dispatch(changeDashboardUrl(url)),

    changeEditedDashboardOptions: (mode) => dispatch(changeEditedDashboardOptions(mode)),

    changeDashboardOptions: (mode) => dispatch(changeDashboardOptions(mode)),

    showDialog: (type) => dispatch(uiChangeCurrentDialog(type)),

    showDialog: (type) => dispatch(uiChangeCurrentDialog(type))

  };

};