From 4ed329c21ddaa6c67887304ee2d8845e4644c7e6 Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Mon, 22 Oct 2018 11:00:20 +0100
Subject: [PATCH] Responsive Layout

---
 embark-ui/src/components/Layout.css           |   3 +
 embark-ui/src/components/Layout.js            | 109 ++++++++++--------
 .../components/{search.css => SearchBar.css}  |  10 +-
 embark-ui/src/components/SearchBar.js         |  29 +++--
 4 files changed, 86 insertions(+), 65 deletions(-)
 create mode 100644 embark-ui/src/components/Layout.css
 rename embark-ui/src/components/{search.css => SearchBar.css} (78%)

diff --git a/embark-ui/src/components/Layout.css b/embark-ui/src/components/Layout.css
new file mode 100644
index 000000000..87feec1c4
--- /dev/null
+++ b/embark-ui/src/components/Layout.css
@@ -0,0 +1,3 @@
+.sidebar-minimizer {
+  display: block !important; 
+}
\ No newline at end of file
diff --git a/embark-ui/src/components/Layout.js b/embark-ui/src/components/Layout.js
index 15005f7c6..b1a74dc4a 100644
--- a/embark-ui/src/components/Layout.js
+++ b/embark-ui/src/components/Layout.js
@@ -7,6 +7,8 @@ import {explorerSearch} from "../actions";
 import {LIGHT_THEME, DARK_THEME} from '../constants';
 import FontAwesome from 'react-fontawesome';
 
+import "./Layout.css";
+
 import {
   AppFooter,
   AppHeader,
@@ -106,62 +108,83 @@ class Layout extends React.Component {
     this.setState({searchLoading: true});
   }
 
-  closeSearchError() {
+  dismissSearchError() {
     this.setState({searchError: false});
   }
 
   renderNav() {
-    return (<Nav className="d-md-down-none" navbar>
-      {HEADER_NAV_ITEMS.map((item) => {
-        return (
-          <NavItem className="px-3" key={item.to}>
-            <NavLink tag={Link} to={item.to}>
-              <FontAwesome className="mr-2" name={item.icon} />
-              {item.name}
-            </NavLink>
-          </NavItem>
-        );
-      })}
-    </Nav>);
+    return (
+      <React.Fragment>
+        <Nav className="d-lg-down-none" navbar>
+          {HEADER_NAV_ITEMS.map((item) => {
+            return (
+              <NavItem className="px-3" key={item.to}>
+                <NavLink tag={Link} to={item.to}>
+                  <FontAwesome className="mr-2" name={item.icon} />
+                  {item.name}
+                </NavLink>
+              </NavItem>
+            );
+          })}
+        </Nav>
+        <AppHeaderDropdown className="list-unstyled d-xl-none" direction="down">
+          <DropdownToggle nav>
+            <FontAwesome name='bars'/>
+          </DropdownToggle>
+          <DropdownMenu left style={{ left: 'auto' }}>
+            {HEADER_NAV_ITEMS.map((item) => (
+              <DropdownItem key={item.to} to={item.to} tag={Link}>
+                <FontAwesome className="mr-2" name={item.icon} />
+                {item.name}
+              </DropdownItem>
+            ))}
+          </DropdownMenu>
+        </AppHeaderDropdown>
+      </React.Fragment>
+    );
   }
 
   renderRightNav() {
-    return (<Nav className="ml-auto" navbar>
-      {<SearchBar hidden={this.state.searchLoading} searchSubmit={searchValue => this.searchTheExplorer(searchValue)}/>}
-      {this.state.searchLoading && <p className="search-loading">
-        Searching... <FontAwesome name="spinner" size="2x" spin className="align-middle ml-2"/>
-      </p>}
-
-      {this.renderSettings()}
-    </Nav>);
+    return (
+      <Nav className="ml-auto" navbar>
+        <NavItem className="d-sm-down-none">
+          <SearchBar loading={this.state.searchLoading} searchSubmit={searchValue => this.searchTheExplorer(searchValue)}/>
+        </NavItem>
+        {this.renderSettings()}
+      </Nav>
+    );
   }
 
   renderSettings() {
     const {logout, toggleTheme, currentTheme} = this.props;
 
-    return (<AppHeaderDropdown direction="down">
-      <DropdownToggle nav>
-        <i className="icon-settings" />
-      </DropdownToggle>
-      <DropdownMenu right style={{ right: 'auto' }}>
-        <DropdownItem className="text-capitalize" onClick={() => toggleTheme()}>
-          <FontAwesome name={currentTheme === DARK_THEME ? 'sun-o' : 'moon-o'} />
-          {currentTheme === DARK_THEME ? LIGHT_THEME : DARK_THEME} Mode
-        </DropdownItem>
-        <DropdownItem onClick={logout}><FontAwesome name="lock" /> Logout</DropdownItem>
-      </DropdownMenu>
-    </AppHeaderDropdown>);
+    return (
+      <AppHeaderDropdown direction="down">
+        <DropdownToggle nav>
+          <i className="icon-settings" />
+        </DropdownToggle>
+        <DropdownMenu right style={{ right: 'auto' }}>
+          <DropdownItem className="text-capitalize" onClick={() => toggleTheme()}>
+            <FontAwesome name={currentTheme === DARK_THEME ? 'sun-o' : 'moon-o'} />
+            {currentTheme === DARK_THEME ? LIGHT_THEME : DARK_THEME} Mode
+          </DropdownItem>
+          <DropdownItem onClick={logout}><FontAwesome name="lock" /> Logout</DropdownItem>
+        </DropdownMenu>
+      </AppHeaderDropdown>
+    );
   }
 
   renderFooter() {
-    return (<AppFooter>
+    return (
+      <AppFooter>
         <span className="ml-auto">
           Embark&nbsp;
           <a href="https://embark.status.im" title="Documentation" rel="noopener noreferrer" target="_blank">Documentation</a>
           &nbsp;|&nbsp;
           <a href="https://github.com/embark-framework" title="Github" rel="noopener noreferrer" target="_blank">Github</a>
         </span>
-    </AppFooter>);
+      </AppFooter>
+    );
   }
 
   render() {
@@ -173,11 +196,9 @@ class Layout extends React.Component {
 
     return (<div className="app animated fadeIn">
       <AppHeader fixed>
-        <AppNavbarBrand className="mx-3"
-                        full={{src: logo, width: 50, height: 50, alt: 'Embark Logo'}}
-                        minimized={{src: logo, width: 30, height: 30, alt: 'Embark Logo'}}
+        <AppNavbarBrand full={{src: logo, width: 50, height: 50, alt: 'Embark Logo'}}
+                        minimized={{src: logo, width: 50, height: 50, alt: 'Embark Logo'}}
         />
-
         {this.renderNav()}
 
         {this.renderRightNav()}
@@ -185,7 +206,7 @@ class Layout extends React.Component {
 
       <div className="app-body">
         {sidebar &&
-        <AppSidebar fixed display="lg">
+        <AppSidebar fixed display="sm">
           <AppSidebarHeader />
           <AppSidebarForm />
           <AppSidebarNav navConfig={sidebar} location={location} />
@@ -195,11 +216,9 @@ class Layout extends React.Component {
         }
 
         <main className="main">
-          {searchResult.error && this.state.searchError && <Alert color="danger">{searchResult.error}
-            <span className="search-error-close" onClick={(e) => this.closeSearchError(e)}>
-              <FontAwesome name="times-circle"/>
-            </span>
-          </Alert>}
+          <Alert color="danger" isOpen={this.state.searchError} toggle={() => this.dismissSearchError()}>
+            {searchResult.error}
+          </Alert>
 
           <Container fluid className="h-100" style={{marginTop: '24px'}}>
             {children}
diff --git a/embark-ui/src/components/search.css b/embark-ui/src/components/SearchBar.css
similarity index 78%
rename from embark-ui/src/components/search.css
rename to embark-ui/src/components/SearchBar.css
index 9ca738e25..86372e94f 100644
--- a/embark-ui/src/components/search.css
+++ b/embark-ui/src/components/SearchBar.css
@@ -18,12 +18,6 @@
   box-shadow: none;
 }
 
-.search-loading {
+.search-bar .search-loading {
   margin-top: 16px;
-}
-
-.search-error-close {
-  position: absolute;
-  cursor: pointer;
-  right: 20px;
-}
+}
\ No newline at end of file
diff --git a/embark-ui/src/components/SearchBar.js b/embark-ui/src/components/SearchBar.js
index 3072019af..7c47401b0 100644
--- a/embark-ui/src/components/SearchBar.js
+++ b/embark-ui/src/components/SearchBar.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {Form, FormGroup, Input, Button} from 'reactstrap';
+import {Form, Input, Button} from 'reactstrap';
 import FontAwesome from 'react-fontawesome';
 import classNames from 'classnames';
 
-import './search.css';
+import './SearchBar.css';
 
 class SearchBar extends React.Component {
   constructor(props) {
@@ -34,15 +34,20 @@ class SearchBar extends React.Component {
 
   render() {
     return (
-      <Form inline className={classNames('search-bar', 'float-right', 'my-2', {hidden: this.props.hidden})}>
-        <FormGroup>
-          <Input type="text" name="search-bar" placeholder="Search by Address / Txhash / Block"
-                 onChange={(e) => this.onChange(e)}
-                 value={this.state.searchValue} onKeyPress={e => this.onKeyPress(e)}/>
-          <Button color="secondary" onClick={(e) => this.onSubmit(e)}>
-            <FontAwesome name="search"/>
-          </Button>
-        </FormGroup>
+      <Form inline className={classNames('search-bar', 'mr-2', {hidden: this.props.hidden})}>
+        {!this.props.loading &&
+          <React.Fragment>
+            <Input type="text" name="search-bar" placeholder="Search by Address / Txhash / Block"
+                  onChange={(e) => this.onChange(e)}
+                  value={this.state.searchValue} onKeyPress={e => this.onKeyPress(e)}/>
+            <Button color="secondary" onClick={(e) => this.onSubmit(e)}>
+              <FontAwesome name="search"/>
+            </Button>
+          </React.Fragment>
+        }
+        {this.props.loading &&
+          <p className="search-loading">Searching... <FontAwesome name="spinner" size="2x" spin className="align-middle ml-2"/></p>
+        }
       </Form>
     );
   }
@@ -50,7 +55,7 @@ class SearchBar extends React.Component {
 
 SearchBar.propTypes = {
   searchSubmit: PropTypes.func.isRequired,
-  hidden: PropTypes.bool
+  loading: PropTypes.bool
 };
 
 export default SearchBar;