From 2894af4640fa843b383d4e998156272e7eb4d931 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Mon, 12 Jul 2021 12:10:05 +0200 Subject: [PATCH 1/4] ui: Remove "Congrats" message and change header --- .../cc/ui/src/components/pages/RunServerPage.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js b/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js index b70d0b9f7..4b65e45b5 100644 --- a/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js +++ b/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js @@ -16,11 +16,8 @@ class RunServerPageComponent extends React.Component { -

Welcome to the Monkey Island Server

+

Get started

-

- Congratulations! You have successfully set up the Monkey Island server. 👏 👏 -



From 563f3e749152faf9cafda42a449e55eb3c281d79 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Tue, 13 Jul 2021 11:51:40 +0200 Subject: [PATCH 2/4] ui: Add margin to buttons and remove margin from page title --- .../monkey_island/cc/ui/src/components/pages/RunServerPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js b/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js index 4b65e45b5..6a0e983de 100644 --- a/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js +++ b/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js @@ -16,7 +16,7 @@ class RunServerPageComponent extends React.Component { -

Get started

+

Getting Started


@@ -32,7 +32,7 @@ export default RunServerPageComponent; function HomepageCallToActions() { return ( -
+
From a5151a65a320710716266e0a99f9b7e5a52f9220 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Tue, 13 Jul 2021 13:14:53 +0200 Subject: [PATCH 3/4] ui: Add style to css for RunServerPage --- .../cc/ui/src/components/pages/RunServerPage.js | 6 +++--- .../cc/ui/src/styles/pages/RunServerPage.scss | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js b/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js index 6a0e983de..db5183a79 100644 --- a/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js +++ b/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js @@ -15,8 +15,8 @@ class RunServerPageComponent extends React.Component { return ( -

Getting Started

+ className={'main getting-started-page'}> +

Getting Started


@@ -32,7 +32,7 @@ export default RunServerPageComponent; function HomepageCallToActions() { return ( -
+
diff --git a/monkey/monkey_island/cc/ui/src/styles/pages/RunServerPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/RunServerPage.scss index e6c1a7497..35490caf4 100644 --- a/monkey/monkey_island/cc/ui/src/styles/pages/RunServerPage.scss +++ b/monkey/monkey_island/cc/ui/src/styles/pages/RunServerPage.scss @@ -1,3 +1,11 @@ +.getting-started-page h1.page-title { + margin-bottom: 0px; +} + #homepage-shortcuts a.d-block { height: 100%; } + +#homepage-shortcuts { + margin-bottom: 20px; +} From bf5ff8dc71801510b6d8c8ce25e52c3ce61ec813 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Tue, 13 Jul 2021 16:32:32 +0200 Subject: [PATCH 4/4] ui: Rename RunServerPage to GettingStartedPage --- monkey/monkey_island/cc/ui/src/components/Main.js | 4 ++-- .../pages/{RunServerPage.js => GettingStartedPage.js} | 6 +++--- .../pages/{RunServerPage.scss => GettingStartedPage.scss} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename monkey/monkey_island/cc/ui/src/components/pages/{RunServerPage.js => GettingStartedPage.js} (93%) rename monkey/monkey_island/cc/ui/src/styles/pages/{RunServerPage.scss => GettingStartedPage.scss} (100%) diff --git a/monkey/monkey_island/cc/ui/src/components/Main.js b/monkey/monkey_island/cc/ui/src/components/Main.js index b5fc5f606..dc1e063ff 100644 --- a/monkey/monkey_island/cc/ui/src/components/Main.js +++ b/monkey/monkey_island/cc/ui/src/components/Main.js @@ -2,7 +2,7 @@ import React from 'react'; import {BrowserRouter as Router, Redirect, Route, Switch} from 'react-router-dom'; import {Container} from 'react-bootstrap'; -import RunServerPage from 'components/pages/RunServerPage'; +import GettingStartedPage from 'components/pages/GettingStartedPage'; import ConfigurePage from 'components/pages/ConfigurePage'; import RunMonkeyPage from 'components/pages/RunMonkeyPage/RunMonkeyPage'; import MapPage from 'components/pages/MapPage'; @@ -136,7 +136,7 @@ class AppComponent extends AuthComponent { ()}/> ()}/> {this.renderRoute('/', - , diff --git a/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js b/monkey/monkey_island/cc/ui/src/components/pages/GettingStartedPage.js similarity index 93% rename from monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js rename to monkey/monkey_island/cc/ui/src/components/pages/GettingStartedPage.js index db5183a79..5fc910598 100644 --- a/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js +++ b/monkey/monkey_island/cc/ui/src/components/pages/GettingStartedPage.js @@ -4,9 +4,9 @@ import {Link} from 'react-router-dom'; import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'; import {faPlayCircle} from '@fortawesome/free-regular-svg-icons'; import {faBookOpen, faCogs} from '@fortawesome/free-solid-svg-icons'; -import '../../styles/pages/RunServerPage.scss'; +import '../../styles/pages/GettingStartedPage.scss'; -class RunServerPageComponent extends React.Component { +class GettingStartedPageComponent extends React.Component { constructor(props) { super(props); } @@ -28,7 +28,7 @@ class RunServerPageComponent extends React.Component { } } -export default RunServerPageComponent; +export default GettingStartedPageComponent; function HomepageCallToActions() { return ( diff --git a/monkey/monkey_island/cc/ui/src/styles/pages/RunServerPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/GettingStartedPage.scss similarity index 100% rename from monkey/monkey_island/cc/ui/src/styles/pages/RunServerPage.scss rename to monkey/monkey_island/cc/ui/src/styles/pages/GettingStartedPage.scss