Changed icons and fixed typo

This commit is contained in:
Shay Nehmad 2019-08-14 09:31:45 +03:00
parent d4f922ab00
commit 776b941076
5 changed files with 29 additions and 12 deletions

View File

@ -1,7 +1,7 @@
import React, {Component} from "react"; import React, {Component} from "react";
import ReactTable from "react-table"; import ReactTable from "react-table";
class PagenatedTable extends Component { class PaginatedTable extends Component {
render() { render() {
if (this.props.data.length > 0) { if (this.props.data.length > 0) {
let defaultPageSize = this.props.data.length > this.props.pageSize ? this.props.pageSize : this.props.data.length; let defaultPageSize = this.props.data.length > this.props.pageSize ? this.props.pageSize : this.props.data.length;
@ -26,4 +26,4 @@ class PagenatedTable extends Component {
} }
} }
export default PagenatedTable; export default PaginatedTable;

View File

@ -1,12 +1,13 @@
import React from "react"; import React from "react";
import PagenatedTable from "../common/PagenatedTable"; import PaginatedTable from "../common/PaginatedTable";
import AuthComponent from "../../AuthComponent"; import AuthComponent from "../../AuthComponent";
import 'styles/ZeroTrustPillars.css'
const statusToIcon = { const statusToIcon = {
"Positive": "fa-shield alert-success", "Positive": "fa-clipboard-check status-success",
"Inconclusive": "fa-question alert-info", "Inconclusive": "fa-exclamation-triangle status-warning",
"Conclusive": "fa-unlock-alt alert-danger", "Conclusive": "fa-bomb status-danger",
"Unexecuted": "fa-toggle-off", "Unexecuted": "fa-question status-default",
}; };
const columns = [ const columns = [
@ -65,7 +66,7 @@ class TestsStatus extends AuthComponent {
export class DirectivesStatusTable extends AuthComponent { export class DirectivesStatusTable extends AuthComponent {
render() { render() {
return <PagenatedTable data={this.props.directivesStatus} columns={columns} pageSize={5}/>; return <PaginatedTable data={this.props.directivesStatus} columns={columns} pageSize={5}/>;
} }
} }

View File

@ -3,7 +3,7 @@ import {Button} from "react-bootstrap";
import {EventsModal} from "./EventsModal"; import {EventsModal} from "./EventsModal";
import FileSaver from "file-saver"; import FileSaver from "file-saver";
import {PillarLabel} from "./PillarLabel"; import {PillarLabel} from "./PillarLabel";
import PagenatedTable from "../common/PagenatedTable"; import PaginatedTable from "../common/PaginatedTable";
class EventsAndButtonComponent extends Component { class EventsAndButtonComponent extends Component {
@ -75,7 +75,7 @@ const columns = [
class FindingsTable extends Component { class FindingsTable extends Component {
render() { render() {
return ( return (
<PagenatedTable data={this.props.findings} pageSize={10} columns={columns}/> <PaginatedTable data={this.props.findings} pageSize={10} columns={columns}/>
); );
} }
} }

View File

@ -1,6 +1,6 @@
import React, {Component} from "react"; import React, {Component} from "react";
import {PillarLabel} from "./PillarLabel"; import {PillarLabel} from "./PillarLabel";
import PagenatedTable from "../common/PagenatedTable"; import PaginatedTable from "../common/PaginatedTable";
const columns = [ const columns = [
{ {
@ -19,7 +19,7 @@ const columns = [
class PillarGrades extends Component { class PillarGrades extends Component {
render() { render() {
return <PagenatedTable data={this.props.pillars} columns={columns} pageSize={10}/>; return <PaginatedTable data={this.props.pillars} columns={columns} pageSize={10}/>;
} }
} }

View File

@ -541,6 +541,22 @@ body {
color: #e0ddde !important; color: #e0ddde !important;
} }
.status-success {
color: #24b716 !important;
}
.status-warning {
color: #b1a91c !important;
}
.status-danger {
color: #d91016 !important;
}
.status-default {
color: #575556 !important;
}
.attack-legend { .attack-legend {
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;