From 18287f888b0c3ae80422d4068c511614b55bfa6d Mon Sep 17 00:00:00 2001
From: Emiliano Ciavatta
Date: Mon, 19 Oct 2020 12:40:53 +0200
Subject: Add resizable layout

---
 .../src/components/pages/ConfigurationPage.scss    |  9 +--
 frontend/src/components/pages/MainPage.js          | 69 ++++++++++++++--------
 frontend/src/components/pages/MainPage.scss        | 22 +++----
 frontend/src/components/pages/common.scss          | 15 +----
 4 files changed, 57 insertions(+), 58 deletions(-)

(limited to 'frontend/src/components/pages')

diff --git a/frontend/src/components/pages/ConfigurationPage.scss b/frontend/src/components/pages/ConfigurationPage.scss
index 4254547..2ceccd5 100644
--- a/frontend/src/components/pages/ConfigurationPage.scss
+++ b/frontend/src/components/pages/ConfigurationPage.scss
@@ -10,16 +10,10 @@
   .configuration-pane {
     display: flex;
     justify-content: center;
-    height: 100%;
-    padding-top: 100px;
 
     .section-content {
-      background-color: $color-primary-3;
       margin-top: 15px;
-    }
-
-    .section-table table {
-      background-color: red !important;
+      background-color: $color-primary-3;
     }
 
     .section-footer {
@@ -27,4 +21,3 @@
     }
   }
 }
-
diff --git a/frontend/src/components/pages/MainPage.js b/frontend/src/components/pages/MainPage.js
index c4dcd20..5d42f4d 100644
--- a/frontend/src/components/pages/MainPage.js
+++ b/frontend/src/components/pages/MainPage.js
@@ -16,6 +16,7 @@
  */
 
 import React, {Component} from "react";
+import {ReflexContainer, ReflexElement, ReflexSplitter} from "react-reflex";
 import {Route, Switch} from "react-router-dom";
 import Filters from "../dialogs/Filters";
 import Header from "../Header";
@@ -29,10 +30,22 @@ import StreamsPane from "../panels/StreamsPane";
 import Timeline from "../Timeline";
 import "./common.scss";
 import "./MainPage.scss";
+import 'react-reflex/styles.css'
 
 class MainPage extends Component {
 
-    state = {};
+    state = {
+        timelineHeight: 175
+    };
+
+    handleTimelineResize = (e) => {
+        if (this.timelineTimeoutHandle) {
+            clearTimeout(this.timelineTimeoutHandle);
+        }
+
+        this.timelineTimeoutHandle = setTimeout(() =>
+            this.setState({timelineHeight: e.domElement.clientHeight}), 100);
+    };
 
     render() {
         let modal;
@@ -41,34 +54,40 @@ class MainPage extends Component {
         }
 
         return (
-            <div className="page main-page">
-                <div className="page-header">
+            <ReflexContainer orientation="horizontal" className="page main-page">
+                <ReflexElement className="page-header">
                     <Header onOpenFilters={() => this.setState({filterWindowOpen: true})} configured={true}/>
-                </div>
+                    {modal}
+                </ReflexElement>
 
-                <div className="page-content">
-                    <div className="pane connections-pane">
-                        <Connections onSelected={(c) => this.setState({selectedConnection: c})}/>
-                    </div>
-                    <div className="pane details-pane">
-                        <Switch>
-                            <Route path="/searches" children={<SearchPane/>}/>
-                            <Route path="/pcaps" children={<PcapsPane/>}/>
-                            <Route path="/rules" children={<RulesPane/>}/>
-                            <Route path="/services" children={<ServicesPane/>}/>
-                            <Route exact path="/connections/:id"
-                                   children={<StreamsPane connection={this.state.selectedConnection}/>}/>
-                            <Route children={<MainPane version={this.props.version}/>}/>
-                        </Switch>
-                    </div>
+                <ReflexElement className="page-content" flex={1}>
+                    <ReflexContainer orientation="vertical" className="page-content">
+                        <ReflexElement className="pane connections-pane">
+                            <Connections onSelected={(c) => this.setState({selectedConnection: c})}/>
+                        </ReflexElement>
 
-                    {modal}
-                </div>
+                        <ReflexSplitter/>
+
+                        <ReflexElement className="pane details-pane">
+                            <Switch>
+                                <Route path="/searches" children={<SearchPane/>}/>
+                                <Route path="/pcaps" children={<PcapsPane/>}/>
+                                <Route path="/rules" children={<RulesPane/>}/>
+                                <Route path="/services" children={<ServicesPane/>}/>
+                                <Route exact path="/connections/:id"
+                                       children={<StreamsPane connection={this.state.selectedConnection}/>}/>
+                                <Route children={<MainPane version={this.props.version}/>}/>
+                            </Switch>
+                        </ReflexElement>
+                    </ReflexContainer>
+                </ReflexElement>
+
+                <ReflexSplitter propagate={true}/>
 
-                <div className="page-footer">
-                    <Timeline/>
-                </div>
-            </div>
+                <ReflexElement className="page-footer" onResize={this.handleTimelineResize}>
+                    <Timeline height={this.state.timelineHeight}/>
+                </ReflexElement>
+            </ReflexContainer>
         );
     }
 }
diff --git a/frontend/src/components/pages/MainPage.scss b/frontend/src/components/pages/MainPage.scss
index 4ca54c0..4fc5853 100644
--- a/frontend/src/components/pages/MainPage.scss
+++ b/frontend/src/components/pages/MainPage.scss
@@ -1,25 +1,25 @@
 @import "../../colors";
 
 .main-page {
+  .page-header {
+    min-height: 80px;
+  }
+
+  .page-footer {
+    overflow: hidden !important;
+    min-height: 175px;
+  }
+
   .page-content {
-    display: flex;
-    flex: 1;
-    padding: 0 15px;
-    background-color: $color-primary-2;
+    padding: 0 7.5px;
 
     .connections-pane {
-      flex: 1 0;
       margin-right: 7.5px;
     }
 
     .details-pane {
-      position: relative;
-      flex: 1 1;
+      overflow: hidden;
       margin-left: 7.5px;
     }
   }
-
-  .page-footer {
-    flex: 0;
-  }
 }
diff --git a/frontend/src/components/pages/common.scss b/frontend/src/components/pages/common.scss
index fcf5c20..2b0cd05 100644
--- a/frontend/src/components/pages/common.scss
+++ b/frontend/src/components/pages/common.scss
@@ -1,16 +1,3 @@
 .page {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-
-  .page-header,
-  .page-footer {
-    flex: 0;
-  }
-
-  .page-content {
-    overflow: hidden;
-    flex: 1;
-  }
+  height: 100vh !important;
 }
-- 
cgit v1.2.3-70-g09d2


From 0e82d50eb37c87ecd5a75cf842c4da8f7047e5dc Mon Sep 17 00:00:00 2001
From: Emiliano Ciavatta
Date: Mon, 19 Oct 2020 15:43:53 +0200
Subject: Fix rule filter overflow

---
 frontend/src/components/pages/ConfigurationPage.js   |  1 -
 frontend/src/components/pages/ConfigurationPage.scss |  1 +
 frontend/src/components/pages/MainPage.js            | 15 ++++++++-------
 frontend/src/components/pages/MainPage.scss          |  6 ++----
 frontend/src/components/pages/common.scss            |  3 ---
 5 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 frontend/src/components/pages/common.scss

(limited to 'frontend/src/components/pages')

diff --git a/frontend/src/components/pages/ConfigurationPage.js b/frontend/src/components/pages/ConfigurationPage.js
index 8f9b68b..c8646fb 100644
--- a/frontend/src/components/pages/ConfigurationPage.js
+++ b/frontend/src/components/pages/ConfigurationPage.js
@@ -28,7 +28,6 @@ import TextField from "../fields/TextField";
 import Header from "../Header";
 import LinkPopover from "../objects/LinkPopover";
 import "../panels/common.scss";
-import "./common.scss";
 import "./ConfigurationPage.scss";
 
 class ConfigurationPage extends Component {
diff --git a/frontend/src/components/pages/ConfigurationPage.scss b/frontend/src/components/pages/ConfigurationPage.scss
index 2ceccd5..6ff933c 100644
--- a/frontend/src/components/pages/ConfigurationPage.scss
+++ b/frontend/src/components/pages/ConfigurationPage.scss
@@ -1,6 +1,7 @@
 @import "../../colors";
 
 .configuration-page {
+  height: 100vh;
   background-color: $color-primary-0;
 
   .header-title {
diff --git a/frontend/src/components/pages/MainPage.js b/frontend/src/components/pages/MainPage.js
index 5d42f4d..3bf8065 100644
--- a/frontend/src/components/pages/MainPage.js
+++ b/frontend/src/components/pages/MainPage.js
@@ -17,6 +17,7 @@
 
 import React, {Component} from "react";
 import {ReflexContainer, ReflexElement, ReflexSplitter} from "react-reflex";
+import "react-reflex/styles.css"
 import {Route, Switch} from "react-router-dom";
 import Filters from "../dialogs/Filters";
 import Header from "../Header";
@@ -28,14 +29,12 @@ import SearchPane from "../panels/SearchPane";
 import ServicesPane from "../panels/ServicesPane";
 import StreamsPane from "../panels/StreamsPane";
 import Timeline from "../Timeline";
-import "./common.scss";
 import "./MainPage.scss";
-import 'react-reflex/styles.css'
 
 class MainPage extends Component {
 
     state = {
-        timelineHeight: 175
+        timelineHeight: 210
     };
 
     handleTimelineResize = (e) => {
@@ -55,10 +54,12 @@ class MainPage extends Component {
 
         return (
             <ReflexContainer orientation="horizontal" className="page main-page">
-                <ReflexElement className="page-header">
-                    <Header onOpenFilters={() => this.setState({filterWindowOpen: true})} configured={true}/>
-                    {modal}
-                </ReflexElement>
+                <div className="fuck-css">
+                    <ReflexElement className="page-header">
+                        <Header onOpenFilters={() => this.setState({filterWindowOpen: true})} configured={true}/>
+                        {modal}
+                    </ReflexElement>
+                </div>
 
                 <ReflexElement className="page-content" flex={1}>
                     <ReflexContainer orientation="vertical" className="page-content">
diff --git a/frontend/src/components/pages/MainPage.scss b/frontend/src/components/pages/MainPage.scss
index 4fc5853..8d1fa96 100644
--- a/frontend/src/components/pages/MainPage.scss
+++ b/frontend/src/components/pages/MainPage.scss
@@ -1,13 +1,11 @@
 @import "../../colors";
 
 .main-page {
-  .page-header {
-    min-height: 80px;
-  }
+  height: 100vh !important;
 
   .page-footer {
     overflow: hidden !important;
-    min-height: 175px;
+    min-height: 210px;
   }
 
   .page-content {
diff --git a/frontend/src/components/pages/common.scss b/frontend/src/components/pages/common.scss
deleted file mode 100644
index 2b0cd05..0000000
--- a/frontend/src/components/pages/common.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.page {
-  height: 100vh !important;
-}
-- 
cgit v1.2.3-70-g09d2