Styles changes

eoghan2t9 · Jun 16, 2020 · ecb322f · ecb322f
1 parent 9323ce3
commit ecb322f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
@@ -193,6 +193,7 @@
     "domain_or_client": "Domain or client",
     "type_table_header": "Type",
     "response_table_header": "Response",
+    "response_code": "Response code",
     "client_table_header": "Client",
     "empty_response_status": "Empty",
     "show_all_filter_type": "Show all",

diff --git a/client/src/components/Logs/Cells/getResponseCell.js b/client/src/components/Logs/Cells/getResponseCell.js
@@ -61,26 +61,29 @@ const getResponseCell = (row, filtering, t, isDetailed) => {
             encryption_status: boldStatusLabel,
             install_settings_dns: upstream,
             elapsed: formattedElapsedMs,
+            response_code: status,
             response_table_header: renderResponses(response),
         },
         [FILTERED_STATUS.FILTERED_BLOCKED_SERVICE]: {
             domain,
             encryption_status: boldStatusLabel,
             filter,
             rule_label: rule,
-            response_table_header: status,
+            response_code: status,
         },
         [FILTERED_STATUS.FILTERED_SAFE_SEARCH]: {
             domain,
             encryption_status: boldStatusLabel,
             install_settings_dns: upstream,
             elapsed: formattedElapsedMs,
+            response_code: status,
         },
         [FILTERED_STATUS.FILTERED_BLACK_LIST]: {
             domain,
             encryption_status: boldStatusLabel,
             install_settings_dns: upstream,
             elapsed: formattedElapsedMs,
+            response_code: status,
         },
     };
 

diff --git a/client/src/components/Logs/Logs.css b/client/src/components/Logs/Logs.css
@@ -278,11 +278,7 @@
     padding: 0 1.5rem;
 }
 
-.logs__table .rt-tr-group.white + .rt-tr-group.white .rt-tr:before,
-.logs__table .rt-tr-group.green + .rt-tr-group.green .rt-tr:before,
-.logs__table .rt-tr-group.blue + .rt-tr-group.blue .rt-tr:before,
-.logs__table .rt-tr-group.yellow + .rt-tr-group.yellow .rt-tr:before,
-.logs__table .rt-tr-group.red + .rt-tr-group.red .rt-tr:before {
+.logs__table .rt-tr-group:not(:first-child) .rt-tr:before {
     content: "";
     position: absolute;
     left: 1.5rem;
@@ -548,3 +544,11 @@
         margin-top: 1.5rem;
     }
 }
+
+.loader__container {
+    transform: translateY(-20rem);
+}
+
+.loader__text {
+    transform: translateY(3rem);
+}
diff --git a/client/src/components/Logs/Table.js b/client/src/components/Logs/Table.js
@@ -26,7 +26,7 @@ import {
     formatTime,
 
 } from '../../helpers/helpers';
-
+import Loading from '../ui/Loading';
 
 const Table = (props) => {
     const {
@@ -227,7 +227,11 @@ const Table = (props) => {
             onPageChange={changePage}
             className={tableClass}
             defaultPageSize={TABLE_DEFAULT_PAGE_SIZE}
-            loadingText={t('loading_table_status')}
+            loadingText={
+                <div className="loader__container">
+                    <Loading />
+                    <h1 className="loader__text">{t('loading_table_status')}</h1>
+                </div>}
             rowsText={t('rows_table_footer_text')}
             noDataText={!processingGetLogs
             && <label className="logs__text logs__text--bold">{t('nothing_found')}</label>}

diff --git a/client/src/components/ui/Loading.js b/client/src/components/ui/Loading.js
@@ -3,7 +3,7 @@ import React from 'react';
 import './Loading.css';
 
 const Loading = () => (
-    <div className="loading"></div>
+    <div className="loading" />
 );
 
 export default Loading;