From c98f18747c5173539560d7f83eef51eb1ef6e4f8 Mon Sep 17 00:00:00 2001
From: ArtemBaskal <a.baskal@adguard.com>
Date: Tue, 6 Oct 2020 11:54:06 +0300
Subject: [PATCH 1/4] + client: 2152 Smartphone compatible design for user
 interface

---
 client/src/components/App/index.css           | 10 ++--
 client/src/components/Dashboard/Dashboard.css | 21 ++++++++
 client/src/components/Dashboard/index.js      | 50 +++++++++----------
 .../components/Settings/Dhcp/Interfaces.js    | 10 ++--
 client/src/components/Settings/Dhcp/index.css | 31 ++++++++++++
 client/src/components/Settings/Dhcp/index.js  | 45 ++++++++---------
 client/src/components/Settings/FormButton.css | 11 ++++
 .../components/Settings/LogsConfig/Form.js    |  3 +-
 .../components/Settings/StatsConfig/Form.js   |  3 +-
 client/src/components/ui/PageTitle.css        | 12 -----
 client/src/components/ui/PageTitle.js         | 23 ++++-----
 client/src/helpers/form.js                    |  6 +--
 12 files changed, 134 insertions(+), 91 deletions(-)
 create mode 100644 client/src/components/Settings/Dhcp/index.css
 create mode 100644 client/src/components/Settings/FormButton.css

diff --git a/client/src/components/App/index.css b/client/src/components/App/index.css
index e2b0304d..31f34bce 100644
--- a/client/src/components/App/index.css
+++ b/client/src/components/App/index.css
@@ -63,10 +63,6 @@ body {
     cursor: not-allowed;
 }
 
-.select--no-warning {
-    margin-bottom: 1.375rem;
-}
-
 .button-action {
     visibility: hidden;
 }
@@ -75,3 +71,9 @@ body {
 .button-action--active {
     visibility: visible;
 }
+
+@media (max-width: 500px) {
+    .dashboard .button-action {
+        visibility: visible;
+    }
+}
diff --git a/client/src/components/Dashboard/Dashboard.css b/client/src/components/Dashboard/Dashboard.css
index 6d3aef7f..3418e76e 100644
--- a/client/src/components/Dashboard/Dashboard.css
+++ b/client/src/components/Dashboard/Dashboard.css
@@ -33,3 +33,24 @@
         right: 0;
     }
 }
+
+.page-title--dashboard {
+    display: flex;
+    align-items: center;
+}
+
+.dashboard-title__button{
+    margin: 0 0.5rem;
+}
+
+@media (max-width: 767.98px) {
+    .page-title--dashboard {
+        flex-direction: column;
+        align-items: flex-start;
+    }
+
+    .dashboard-title__button{
+        margin: 0.5rem 0;
+        display: block;
+    }
+}
diff --git a/client/src/components/Dashboard/index.js b/client/src/components/Dashboard/index.js
index 4d229ffb..4de5b8dd 100644
--- a/client/src/components/Dashboard/index.js
+++ b/client/src/components/Dashboard/index.js
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
-
+import classNames from 'classnames';
 import Statistics from './Statistics';
 import Counters from './Counters';
 import Clients from './Clients';
@@ -17,6 +17,7 @@ const Dashboard = ({
     getStats,
     getStatsConfig,
     dashboard,
+    dashboard: { protectionEnabled, processingProtection },
     toggleProtection,
     stats,
     access,
@@ -33,20 +34,12 @@ const Dashboard = ({
         getAllStats();
     }, []);
 
-    const getToggleFilteringButton = () => {
-        const { protectionEnabled, processingProtection } = dashboard;
-        const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
-        const buttonClass = protectionEnabled ? 'btn-gray' : 'btn-success';
+    const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
 
-        return <button
-                type="button"
-                className={`btn btn-sm mr-2 ${buttonClass}`}
-                onClick={() => toggleProtection(protectionEnabled)}
-                disabled={processingProtection}
-        >
-            <Trans>{buttonText}</Trans>
-        </button>;
-    };
+    const buttonClass = classNames('btn btn-sm dashboard-title__button', {
+        'btn-gray': protectionEnabled,
+        'btn-success': !protectionEnabled,
+    });
 
     const refreshButton = <button
             type="button"
@@ -62,24 +55,27 @@ const Dashboard = ({
         ? t('for_last_24_hours')
         : t('for_last_days', { count: stats.interval });
 
-    const refreshFullButton = <button
-            type="button"
-            className="btn btn-outline-primary btn-sm"
-            onClick={() => getAllStats()}
-    >
-        <Trans>refresh_statics</Trans>
-    </button>;
-
     const statsProcessing = stats.processingStats
             || stats.processingGetConfig
             || access.processing;
 
     return <>
-        <PageTitle title={t('dashboard')}>
-            <div className="page-title__actions">
-                {getToggleFilteringButton()}
-                {refreshFullButton}
-            </div>
+        <PageTitle title={t('dashboard')} containerClass="page-title--dashboard">
+            <button
+                    type="button"
+                    className={buttonClass}
+                    onClick={() => toggleProtection(protectionEnabled)}
+                    disabled={processingProtection}
+            >
+                <Trans>{buttonText}</Trans>
+            </button>
+            <button
+                    type="button"
+                    className="btn btn-outline-primary btn-sm"
+                    onClick={getAllStats}
+            >
+                <Trans>refresh_statics</Trans>
+            </button>
         </PageTitle>
         {statsProcessing && <Loading />}
         {!statsProcessing && <div className="row row-cards dashboard">
diff --git a/client/src/components/Settings/Dhcp/Interfaces.js b/client/src/components/Settings/Dhcp/Interfaces.js
index 0674c3fd..e1480d25 100644
--- a/client/src/components/Settings/Dhcp/Interfaces.js
+++ b/client/src/components/Settings/Dhcp/Interfaces.js
@@ -46,7 +46,7 @@ const renderInterfaceValues = ({
     gateway_ip,
     hardware_address,
     ip_addresses,
-}) => <div className='d-flex align-items-end col-6'>
+}) => <div className='d-flex align-items-end col-md'>
     <ul className="list-unstyled m-0">
         {getInterfaceValues({
             gateway_ip,
@@ -78,11 +78,11 @@ const Interfaces = () => {
             && interfaces
             && <>
                 <div className="row align-items-center pb-2">
-                    <div className="col-6">
+                    <div className="col col__dhcp">
                         <Field
                                 name="interface_name"
                                 component={renderSelectField}
-                                className="form-control custom-select"
+                                className="form-control custom-select pl-4 col-md"
                                 validate={[validateRequiredValue]}
                                 label='dhcp_interface_select'
                         >
@@ -91,9 +91,9 @@ const Interfaces = () => {
                             </option>
                             {renderInterfaces(interfaces)}
                         </Field>
+                        {interfaceValue
+                        && renderInterfaceValues(interfaceValue)}
                     </div>
-                    {interfaceValue
-                    && renderInterfaceValues(interfaceValue)}
                 </div>
             </>;
 };
diff --git a/client/src/components/Settings/Dhcp/index.css b/client/src/components/Settings/Dhcp/index.css
new file mode 100644
index 00000000..5395f85d
--- /dev/null
+++ b/client/src/components/Settings/Dhcp/index.css
@@ -0,0 +1,31 @@
+.dhcp-form__button {
+    margin: 0 1rem;
+}
+
+.page-title--dhcp {
+    display: flex;
+    align-items: center;
+}
+
+.col__dhcp {
+    flex: 0 0 50%;
+    max-width: 50%;
+}
+
+@media (max-width: 991.98px) {
+    .dhcp-form__button {
+        margin: 0.5rem 0;
+        display: block;
+    }
+
+    .page-title--dhcp {
+        flex-direction: column;
+        align-items: flex-start;
+        padding-bottom: 0.5rem;
+    }
+
+    .col__dhcp {
+        flex: 0 0 100%;
+        max-width: 100%;
+    }
+}
diff --git a/client/src/components/Settings/Dhcp/index.js b/client/src/components/Settings/Dhcp/index.js
index 1def906c..05732c19 100644
--- a/client/src/components/Settings/Dhcp/index.js
+++ b/client/src/components/Settings/Dhcp/index.js
@@ -31,6 +31,7 @@ import {
     calculateDhcpPlaceholdersIpv4,
     calculateDhcpPlaceholdersIpv6,
 } from '../../../helpers/helpers';
+import './index.css';
 
 const Dhcp = () => {
     const { t } = useTranslation();
@@ -114,7 +115,7 @@ const Dhcp = () => {
             .every(Boolean) || Object.values(v6)
             .every(Boolean));
 
-        const className = classNames('btn btn-sm mr-2', {
+        const className = classNames('btn btn-sm', {
             'btn-gray': enabled,
             'btn-outline-success': !enabled,
         });
@@ -141,7 +142,7 @@ const Dhcp = () => {
         </button>;
     };
 
-    const statusButtonClass = classNames('btn btn-sm mx-2', {
+    const statusButtonClass = classNames('btn btn-sm dhcp-form__button', {
         'btn-loading btn-primary': processingStatus,
         'btn-outline-primary': !processingStatus,
     });
@@ -171,28 +172,24 @@ const Dhcp = () => {
     const toggleDhcpButton = getToggleDhcpButton();
 
     return <>
-        <PageTitle title={t('dhcp_settings')} subtitle={t('dhcp_description')}>
-            <div className="page-title__actions">
-                <div className="mb-3">
-                    {toggleDhcpButton}
-                    <button
-                        type="button"
-                        className={statusButtonClass}
-                        onClick={onClick}
-                        disabled={enabled || !interface_name || processingConfig}
-                    >
-                        <Trans>check_dhcp_servers</Trans>
-                    </button>
-                    <button
-                        type="button"
-                        className='btn btn-sm mx-2 btn-outline-secondary'
-                        disabled={!enteredSomeValue || processingConfig}
-                        onClick={clear}
-                    >
-                        <Trans>reset_settings</Trans>
-                    </button>
-                </div>
-            </div>
+        <PageTitle title={t('dhcp_settings')} subtitle={t('dhcp_description')} containerClass="page-title--dhcp">
+            {toggleDhcpButton}
+            <button
+                    type="button"
+                    className={statusButtonClass}
+                    onClick={onClick}
+                    disabled={enabled || !interface_name || processingConfig}
+            >
+                <Trans>check_dhcp_servers</Trans>
+            </button>
+            <button
+                    type="button"
+                    className='btn btn-sm btn-outline-secondary'
+                    disabled={!enteredSomeValue || processingConfig}
+                    onClick={clear}
+            >
+                <Trans>reset_settings</Trans>
+            </button>
         </PageTitle>
         {!processing && !processingInterfaces
         && <>
diff --git a/client/src/components/Settings/FormButton.css b/client/src/components/Settings/FormButton.css
new file mode 100644
index 00000000..99d9e3c4
--- /dev/null
+++ b/client/src/components/Settings/FormButton.css
@@ -0,0 +1,11 @@
+.form__button {
+    margin-left: 1.5rem;
+}
+
+@media (max-width: 500px) {
+    .form__button {
+        margin-left: 0;
+        margin-top: 1rem;
+        display: block;
+    }
+}
diff --git a/client/src/components/Settings/LogsConfig/Form.js b/client/src/components/Settings/LogsConfig/Form.js
index aa3b61b3..a89c89db 100644
--- a/client/src/components/Settings/LogsConfig/Form.js
+++ b/client/src/components/Settings/LogsConfig/Form.js
@@ -6,6 +6,7 @@ import flow from 'lodash/flow';
 
 import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
 import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
+import '../FormButton.css';
 
 const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
     const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
@@ -68,7 +69,7 @@ const Form = (props) => {
                 </button>
                 <button
                     type="button"
-                    className="btn btn-outline-secondary btn-standard ml-5"
+                    className="btn btn-outline-secondary btn-standard form__button"
                     onClick={() => handleClear()}
                     disabled={processingClear}
                 >
diff --git a/client/src/components/Settings/StatsConfig/Form.js b/client/src/components/Settings/StatsConfig/Form.js
index 53b34f4b..c16b39b2 100644
--- a/client/src/components/Settings/StatsConfig/Form.js
+++ b/client/src/components/Settings/StatsConfig/Form.js
@@ -6,6 +6,7 @@ import flow from 'lodash/flow';
 
 import { renderRadioField, toNumber } from '../../../helpers/form';
 import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants';
+import '../FormButton.css';
 
 const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => {
     const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
@@ -52,7 +53,7 @@ const Form = (props) => {
                 </button>
                 <button
                     type="button"
-                    className="btn btn-outline-secondary btn-standard ml-5"
+                    className="btn btn-outline-secondary btn-standard form__button"
                     onClick={() => handleReset()}
                     disabled={processingReset}
                 >
diff --git a/client/src/components/ui/PageTitle.css b/client/src/components/ui/PageTitle.css
index 8e0e2d32..a7e2c284 100644
--- a/client/src/components/ui/PageTitle.css
+++ b/client/src/components/ui/PageTitle.css
@@ -36,15 +36,3 @@
     font-size: 36px;
     line-height: 46px;
 }
-
-.page-title__actions {
-    display: block;
-}
-
-@media screen and (min-width: 768px) {
-    .page-title__actions {
-        display: inline-block;
-        vertical-align: baseline;
-        margin-left: 20px;
-    }
-}
diff --git a/client/src/components/ui/PageTitle.js b/client/src/components/ui/PageTitle.js
index c5a2d51a..e713b902 100644
--- a/client/src/components/ui/PageTitle.js
+++ b/client/src/components/ui/PageTitle.js
@@ -3,24 +3,23 @@ import PropTypes from 'prop-types';
 
 import './PageTitle.css';
 
-const PageTitle = ({ title, subtitle, children }) => (
-    <div className="page-header">
-        <h1 className="page-title">
-            {title}
-            {children}
-        </h1>
-        {subtitle && (
-            <div className="page-subtitle">
-                {subtitle}
-            </div>
-        )}
+const PageTitle = ({
+    title, subtitle, children, containerClass,
+}) => <div className="page-header">
+    <div className={containerClass}>
+        <h1 className="page-title pr-2">{title}</h1>
+        {children}
     </div>
-);
+    {subtitle && <div className="page-subtitle">
+        {subtitle}
+    </div>}
+</div>;
 
 PageTitle.propTypes = {
     title: PropTypes.string.isRequired,
     subtitle: PropTypes.string,
     children: PropTypes.node,
+    containerClass: PropTypes.string,
 };
 
 export default PageTitle;
diff --git a/client/src/helpers/form.js b/client/src/helpers/form.js
index 3b6801a0..a52dbb6a 100644
--- a/client/src/helpers/form.js
+++ b/client/src/helpers/form.js
@@ -1,7 +1,6 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Trans } from 'react-i18next';
-import classNames from 'classnames';
 import { createOnBlurHandler } from './helpers';
 import { R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants';
 
@@ -210,13 +209,10 @@ export const renderSelectField = ({
     label,
 }) => {
     const showWarning = touched && error;
-    const selectClass = classNames('form-control custom-select', {
-        'select--no-warning': !showWarning,
-    });
 
     return <>
         {label && <label><Trans>{label}</Trans></label>}
-        <select {...input} className={selectClass}>{children}</select>
+        <select {...input} className='form-control custom-select'>{children}</select>
         {showWarning
         && <span className="form__message form__message--error form__message--left-pad"><Trans>{error}</Trans></span>}
     </>;

From fc4a5576109419e32a82b377647a96caf0c6a46b Mon Sep 17 00:00:00 2001
From: ArtemBaskal <a.baskal@adguard.com>
Date: Tue, 6 Oct 2020 20:52:44 +0300
Subject: [PATCH 2/4] Fix dhcp interfaces markup

---
 client/src/components/Settings/Dhcp/Interfaces.js |  8 ++++----
 client/src/components/Settings/Dhcp/index.css     | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Settings/Dhcp/Interfaces.js b/client/src/components/Settings/Dhcp/Interfaces.js
index e1480d25..dcf5e3fa 100644
--- a/client/src/components/Settings/Dhcp/Interfaces.js
+++ b/client/src/components/Settings/Dhcp/Interfaces.js
@@ -46,7 +46,7 @@ const renderInterfaceValues = ({
     gateway_ip,
     hardware_address,
     ip_addresses,
-}) => <div className='d-flex align-items-end col-md'>
+}) => <div className='d-flex align-items-end dhcp__interfaces-info'>
     <ul className="list-unstyled m-0">
         {getInterfaceValues({
             gateway_ip,
@@ -77,7 +77,7 @@ const Interfaces = () => {
     return !processingInterfaces
             && interfaces
             && <>
-                <div className="row align-items-center pb-2">
+                <div className="row dhcp__interfaces">
                     <div className="col col__dhcp">
                         <Field
                                 name="interface_name"
@@ -91,9 +91,9 @@ const Interfaces = () => {
                             </option>
                             {renderInterfaces(interfaces)}
                         </Field>
-                        {interfaceValue
-                        && renderInterfaceValues(interfaceValue)}
                     </div>
+                    {interfaceValue
+                    && renderInterfaceValues(interfaceValue)}
                 </div>
             </>;
 };
diff --git a/client/src/components/Settings/Dhcp/index.css b/client/src/components/Settings/Dhcp/index.css
index 5395f85d..7cf92aee 100644
--- a/client/src/components/Settings/Dhcp/index.css
+++ b/client/src/components/Settings/Dhcp/index.css
@@ -12,6 +12,10 @@
     max-width: 50%;
 }
 
+.dhcp__interfaces {
+    padding-bottom: 1rem;
+}
+
 @media (max-width: 991.98px) {
     .dhcp-form__button {
         margin: 0.5rem 0;
@@ -28,4 +32,13 @@
         flex: 0 0 100%;
         max-width: 100%;
     }
+
+    .dhcp__interfaces {
+        flex-direction: column;
+        padding-bottom: 0.5rem;
+    }
+
+    .dhcp__interfaces-info {
+        padding-left: 1.5rem;
+    }
 }

From 8fc18628637cdbce4532fb25cd3397feb43fc880 Mon Sep 17 00:00:00 2001
From: ArtemBaskal <a.baskal@adguard.com>
Date: Wed, 7 Oct 2020 11:49:30 +0300
Subject: [PATCH 3/4] Fix markup

---
 client/src/components/Settings/Dhcp/index.css | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Settings/Dhcp/index.css b/client/src/components/Settings/Dhcp/index.css
index 7cf92aee..0a7741b7 100644
--- a/client/src/components/Settings/Dhcp/index.css
+++ b/client/src/components/Settings/Dhcp/index.css
@@ -10,12 +10,19 @@
 .col__dhcp {
     flex: 0 0 50%;
     max-width: 50%;
+    padding-right: 0;
 }
 
 .dhcp__interfaces {
     padding-bottom: 1rem;
 }
 
+.dhcp__interfaces-info {
+    padding-top: 0.5rem;
+    padding-left: 1.5rem;
+    line-break: anywhere;
+}
+
 @media (max-width: 991.98px) {
     .dhcp-form__button {
         margin: 0.5rem 0;
@@ -31,14 +38,11 @@
     .col__dhcp {
         flex: 0 0 100%;
         max-width: 100%;
+        padding-right: 0.75rem;
     }
 
     .dhcp__interfaces {
         flex-direction: column;
         padding-bottom: 0.5rem;
     }
-
-    .dhcp__interfaces-info {
-        padding-left: 1.5rem;
-    }
 }

From eb91c6cfe4d1664c9dae54543e663cf58f6a9731 Mon Sep 17 00:00:00 2001
From: ArtemBaskal <a.baskal@adguard.com>
Date: Wed, 7 Oct 2020 12:48:03 +0300
Subject: [PATCH 4/4] Fix margins

---
 client/src/components/Settings/Dhcp/index.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/components/Settings/Dhcp/index.css b/client/src/components/Settings/Dhcp/index.css
index 0a7741b7..4ac1c635 100644
--- a/client/src/components/Settings/Dhcp/index.css
+++ b/client/src/components/Settings/Dhcp/index.css
@@ -18,8 +18,7 @@
 }
 
 .dhcp__interfaces-info {
-    padding-top: 0.5rem;
-    padding-left: 1.5rem;
+    padding: 0.5rem 0.75rem 0;
     line-break: anywhere;
 }