From 9dc8749550af8b1e48fe6c83c2a1d7d329e62cdd Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Tue, 3 Dec 2019 16:23:59 +0200 Subject: [PATCH] "" to '' fixes for travis --- .../cc/ui/src/components/Main.js | 57 +++++++++---------- .../report-components/AttackReport.js | 8 +-- .../attack/TechniqueDropdowns.js | 4 +- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/monkey/monkey_island/cc/ui/src/components/Main.js b/monkey/monkey_island/cc/ui/src/components/Main.js index d84e3cb11..734fc2e3d 100644 --- a/monkey/monkey_island/cc/ui/src/components/Main.js +++ b/monkey/monkey_island/cc/ui/src/components/Main.js @@ -1,5 +1,5 @@ import React from 'react'; -import {BrowserRouter as Router, NavLink, Redirect, Route, Switch, withRouter} from 'react-router-dom'; +import {BrowserRouter as Router, NavLink, Redirect, Route, Switch} from 'react-router-dom'; import {Col, Grid, Row} from 'react-bootstrap'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faCheck, faUndo } from '@fortawesome/free-solid-svg-icons' @@ -11,7 +11,6 @@ import MapPage from 'components/pages/MapPage'; import TelemetryPage from 'components/pages/TelemetryPage'; import StartOverPage from 'components/pages/StartOverPage'; import ReportPage from 'components/pages/ReportPage'; -import ZeroTrustReportPage from 'components/report-components/ZeroTrustReport'; import LicensePage from 'components/pages/LicensePage'; import AuthComponent from 'components/AuthComponent'; import LoginPageComponent from 'components/pages/LoginPage'; @@ -84,7 +83,7 @@ class AppComponent extends AuthComponent { }; redirectTo = (userPath, targetPath) => { - let pathQuery = new RegExp(userPath+"[\/]?$", "g"); + let pathQuery = new RegExp(userPath+'[\/]?$', 'g'); if(window.location.pathname.match(pathQuery)){ return } @@ -123,57 +122,57 @@ class AppComponent extends AuthComponent { - -
+ +
- Infection Monkey + Infection Monkey
-
    +
    • - - 1. + + 1. Run Monkey Island Server {this.state.completedSteps.run_server ? - + : ''}
    • - - 2. + + 2. Run Monkey {this.state.completedSteps.run_monkey ? - + : ''}
    • - - 3. + + 3. Infection Map {this.state.completedSteps.infection_done ? - + : ''}
    • - { return (location.pathname === '/report/attack' || location.pathname === '/report/zeroTrust' || location.pathname === '/report/security') }}> - 4. + 4. Security Reports {this.state.completedSteps.report_done ? - + : ''}
    • - - + + Start Over
    • @@ -181,23 +180,23 @@ class AppComponent extends AuthComponent {
        -
      • Configuration
      • -
      • Log
      • +
      • Configuration
      • +
      • Log

      -
      +
      Powered by - - GuardiCore + + GuardiCore
      -
      - License +
      + License
      - + ()}/> {this.renderRoute('/', , true)} {this.renderRoute('/configure', )} diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js b/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js index ed73c05ba..a5476f32d 100644 --- a/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js +++ b/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js @@ -15,7 +15,7 @@ import ReportLoader from './common/ReportLoader'; const techComponents = getAllAttackModules(); function getAllAttackModules() { - let context = require.context("../attack/techniques/", false, /\.js$/); + let context = require.context('../attack/techniques/', false, /\.js$/); let obj = {}; context.keys().forEach(function (key) { let techName = key.replace(/\.js/, ''); @@ -68,11 +68,11 @@ class AttackReport extends React.Component { static getStatusIcon(tech_id, techniques){ switch (techniques[tech_id].status){ case ScanStatus.SCANNED: - return ; + return ; case ScanStatus.USED: - return ; + return ; default: - return ; + return ; } } diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js b/monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js index 2d8548fd7..d22e8617a 100644 --- a/monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js +++ b/monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js @@ -112,8 +112,8 @@ class TechniqueDropdowns extends React.Component{ className={classNames({'toggle-btn': true, 'toggled-off' : this.state.techniquesHidden, 'toggled-on': !this.state.techniquesHidden})}> - - + +
      {content}