From 40cbb941ed1652b618e824947a32f75b46270c61 Mon Sep 17 00:00:00 2001 From: Louis Reed Date: Mon, 12 Jun 2023 23:09:45 +0100 Subject: [PATCH] #593 issues (#605) * Fixed footer not displaying on mobile * Fixed content page length * Fixed upgrade button color * Added multi-mining * Fixed padding * Fixed sidenav scroll bug * Fixed table overflow * Updated device info data, separated IP addresses * Fixed table data alignment * Updated helium info page to match new data badges * Updated IP address to loop, made images static * Updated filename * Change for loop > for-of * Updated thingsix address fields --------- Co-authored-by: Aaron Shaw --- hw_diag/static/css/style.css | 43 ++++++++++++++- .../images/Nebra-Dashboard-Logo-White.svg | 22 ++++++++ .../Nebra-Dashboard-Promo-Icon-1-white.svg | 1 + .../Nebra-Dashboard-Promo-Icon-2-white.svg | 1 + .../Nebra-Dashboard-Promo-Icon-3-white.svg | 1 + .../Nebra-Dashboard-Promo-Icon-4-white.svg | 1 + .../Nebra-Dashboard-Promo-Icon-5-white.svg | 1 + .../Nebra-Dashboard-Promo-Icon-6-white.svg | 1 + hw_diag/templates/device_info.html | 54 +++++++++++++++---- hw_diag/templates/helium_info.html | 20 +++++-- hw_diag/templates/template_hyper.html | 36 ++++++++++++- hw_diag/templates/thix_dashboard.html | 10 +++- hw_diag/templates/upgrade.html | 45 +++++++++++----- 13 files changed, 203 insertions(+), 33 deletions(-) create mode 100644 hw_diag/static/images/Nebra-Dashboard-Logo-White.svg create mode 100644 hw_diag/static/images/Nebra-Dashboard-Promo-Icon-1-white.svg create mode 100644 hw_diag/static/images/Nebra-Dashboard-Promo-Icon-2-white.svg create mode 100644 hw_diag/static/images/Nebra-Dashboard-Promo-Icon-3-white.svg create mode 100644 hw_diag/static/images/Nebra-Dashboard-Promo-Icon-4-white.svg create mode 100644 hw_diag/static/images/Nebra-Dashboard-Promo-Icon-5-white.svg create mode 100644 hw_diag/static/images/Nebra-Dashboard-Promo-Icon-6-white.svg diff --git a/hw_diag/static/css/style.css b/hw_diag/static/css/style.css index 89063ebd..65aba3cb 100644 --- a/hw_diag/static/css/style.css +++ b/hw_diag/static/css/style.css @@ -76,4 +76,45 @@ html[data-sidenav-size=sm-hover]:not([data-layout=topnav]) .wrapper .leftside-me .nav-mobile-logo img { margin-left: -54.02px; /* Minus navbar toggle button */ max-height: 20px; -} \ No newline at end of file +} + +/* --- Page length fix --- */ + +.content-page { + min-height: calc(100vh - 10px) !important; +} + +html[data-sidenav-size=condensed]:not([data-layout=topnav]) .wrapper .content-page { + min-height: 100% !important; +} + +/* --- Upgrade Page --- */ + +.dashboard-upsell--button { + color: #02A8F5 !important; +} + +/* --- Tables --- */ + +table { + overflow-wrap: anywhere !important; +} + +table td { + width: 100%; +} + +@media (min-width: 768px) { + table td { + width: auto; + } +} + +/* --- Badge --- */ + +.badge-light { + color: #212529; + background-color: #f8f9fa; + font-weight: 400; +} + diff --git a/hw_diag/static/images/Nebra-Dashboard-Logo-White.svg b/hw_diag/static/images/Nebra-Dashboard-Logo-White.svg new file mode 100644 index 00000000..59b650b6 --- /dev/null +++ b/hw_diag/static/images/Nebra-Dashboard-Logo-White.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-1-white.svg b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-1-white.svg new file mode 100644 index 00000000..99ba7c47 --- /dev/null +++ b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-1-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-2-white.svg b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-2-white.svg new file mode 100644 index 00000000..8713650c --- /dev/null +++ b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-2-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-3-white.svg b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-3-white.svg new file mode 100644 index 00000000..ed665a5e --- /dev/null +++ b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-3-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-4-white.svg b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-4-white.svg new file mode 100644 index 00000000..dad3f9a4 --- /dev/null +++ b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-4-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-5-white.svg b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-5-white.svg new file mode 100644 index 00000000..86ffddce --- /dev/null +++ b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-5-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-6-white.svg b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-6-white.svg new file mode 100644 index 00000000..58b4e6be --- /dev/null +++ b/hw_diag/static/images/Nebra-Dashboard-Promo-Icon-6-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/hw_diag/templates/device_info.html b/hw_diag/templates/device_info.html index 7d7ebb35..305cd919 100644 --- a/hw_diag/templates/device_info.html +++ b/hw_diag/templates/device_info.html @@ -56,40 +56,56 @@

Overall Status: {% if diagnostics.commercial_fleet %} Firmware Version - Premium - {{ diagnostics.FW }} ({{ diagnostics.firmware_short_hash }}) + + Premium - {{ diagnostics.FW }} ({{ diagnostics.firmware_short_hash }}) + {% else %} Firmware Version - {{ diagnostics.FW }} ({{ diagnostics.firmware_short_hash }}) + + {{ diagnostics.FW }} ({{ diagnostics.firmware_short_hash }}) + {% endif %} Variant - {{ diagnostics.FRIENDLY }} + + {{ diagnostics.FRIENDLY }} + Hardware Serial Number - {{ diagnostics.serial_number }} + + {{ diagnostics.serial_number }} + Hostname {% if hostname %} - {{ hostname }} + + {{ hostname }} + {% else %} Unknown {% endif %} Local IP Address - {{ device_info.ip_address }} + +
+ WAN IP Address - {{ wan_ip_address }} + + {{ wan_ip_address }} + Ethernet MAC Address {% if diagnostics.E0 %} - {{ diagnostics.E0 }} + + {{ diagnostics.E0 }} + {% else %} N/A {% endif %} @@ -97,7 +113,9 @@

Overall Status: WiFi MAC Address {% if diagnostics.W0 %} - {{ diagnostics.W0 }} + + {{ diagnostics.W0 }} + {% else %} N/A {% endif %} @@ -245,4 +263,22 @@

Overall Status:

Download Diagnostics Info for Support

+ + + {% endblock %} diff --git a/hw_diag/templates/helium_info.html b/hw_diag/templates/helium_info.html index f7d5c951..d2d0ec49 100644 --- a/hw_diag/templates/helium_info.html +++ b/hw_diag/templates/helium_info.html @@ -24,7 +24,9 @@

Helium Status: Not Available {% else %} Hotspot Name - {{ diagnostics.AN }} + + {{ diagnostics.AN }} + {% endif %} @@ -33,7 +35,9 @@

Helium Status: Not Available {% else %} Helium Address - {{ diagnostics.PK }} + + {{ diagnostics.PK }} + {% endif %} @@ -50,9 +54,13 @@

Helium Status: {% if not diagnostics.FR %} N/A (Not Required) {% elif "N/A" in diagnostics.FR %} - {{ diagnostics.FR }} + + {{ diagnostics.FR }} + {% else %} - {{ diagnostics.FR }} MHz + + {{ diagnostics.FR }} MHz + {% endif %} @@ -61,7 +69,9 @@

Helium Status: Awaiting Location Assertion {% else %} Region Plan - {{ diagnostics.RE }} + + {{ diagnostics.RE }} + {% endif %} diff --git a/hw_diag/templates/template_hyper.html b/hw_diag/templates/template_hyper.html index b529b14e..96ae1623 100644 --- a/hw_diag/templates/template_hyper.html +++ b/hw_diag/templates/template_hyper.html @@ -197,13 +197,13 @@
{% if diagnostics.commercial_fleet %} -
+
Premium
{% endif %}
-
+
© Nebra LTD.
@@ -227,5 +227,37 @@ + + + diff --git a/hw_diag/templates/thix_dashboard.html b/hw_diag/templates/thix_dashboard.html index f892ca0c..3dcbfcb1 100644 --- a/hw_diag/templates/thix_dashboard.html +++ b/hw_diag/templates/thix_dashboard.html @@ -14,11 +14,15 @@

ThingsIX Configuration

- + - +
Gateway Address{{ gateway.gatewayId }} + {{ gateway.gatewayId }} +
Gateway Owner{{ gateway.owner }} + {{ gateway.owner }} +
@@ -60,7 +64,9 @@

ThingsIX Configuration

Antenna Altitude {% if gateway.details %} + {{ gateway.details.altitude }}m + {% else %} Onboard Pending {% endif %} diff --git a/hw_diag/templates/upgrade.html b/hw_diag/templates/upgrade.html index dcf899ee..0a118960 100644 --- a/hw_diag/templates/upgrade.html +++ b/hw_diag/templates/upgrade.html @@ -34,7 +34,7 @@ .dashboard-upsell--card img { height: 125px; margin: 0 auto; - padding: 25px; + padding: 25px 25px 0 25px; } .dashboard-upsell--button { @@ -52,16 +52,16 @@ } .dashboard-upsell--button h3 { - margin-bottom: 0; + margin: 0; } -
+
+ src="/static/images/Nebra-Dashboard-Logo-white.svg" + height="50px" alt="Nebra Dashboard">

Upgrade to the full experience today!

The Nebra Dashboard provides extra features like remote reboot, hardware diagnostics, premium firmware and priority support. Control your device from anywhere, monitor its health, get advanced @@ -72,8 +72,8 @@

Upgrade to the full experience today!

... + src="/static/images/Nebra-Dashboard-Promo-Icon-1-white.svg" + class="card-img-top" alt="Remote Reboot">

Remote Reboot

Hotspot not responding? Reboot it without visiting its location.

@@ -83,8 +83,8 @@

Remote Reboot

... + src="/static/images/Nebra-Dashboard-Promo-Icon-2-white.svg" + class="card-img-top" alt="Hardware Diagnostics">

Hardware Diagnostics

Access diagnostics information from anywhere.

@@ -94,8 +94,8 @@

Hardware Diagnostics

... + src="/static/images/Nebra-Dashboard-Promo-Icon-3-white.svg" + class="card-img-top" alt="Premium Firmware">

Premium Firmware

More features including multi network support & dVPN.

@@ -105,19 +105,36 @@

Premium Firmware

... + src="/static/images/Nebra-Dashboard-Promo-Icon-4-white.svg" + class="card-img-top" alt="Prioritised Support">

Prioritised Support

Access our dedicated support team and skip the queue.

+
+
+ Multi-Mining +
+

Multi-Mining

+

Earn while you sleep and increase your earnings with multi-mining. Available on all of your existing devices with the Nebra Dashboard.

+
+
+
+
+
+ Coming Soon +
+

Plus much more coming soon!

+

Watch this space for new updates and features.

+
+
+
-
Plus much more!

Claim your free trial now!