From b46551321266e96874d76063adea767fab809ae4 Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Tue, 5 Apr 2022 11:27:21 +0200
Subject: [PATCH 1/8] Fix flask.messages render

---
 ereuse_devicehub/templates/ereuse_devicehub/base_site.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
index d55a1065..99bd68cf 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
@@ -195,7 +195,11 @@
   {% block messages %}
     {% for level, message in get_flashed_messages(with_categories=true) %}
       <div class="alert alert-{{ level}} alert-dismissible fade show" role="alert">
-        <i class="bi bi-{{ session['_message_icon'][level]}} me-1"></i>
+        {% if '_message_icon' in session %}
+          <i class="bi bi-{{ session['_message_icon'][level]}} me-1"></i>
+        {% else %}<!-- fallback if 3rd party libraries (e.g. flask_login.login_required) -->
+          <i class="bi bi-info-circle me-1"></i>
+        {% endif %}
         {{ message }}
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
       </div>

From 683c7cff727249c088a3a7c00d85764a7b0a4691 Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Tue, 5 Apr 2022 11:28:07 +0200
Subject: [PATCH 2/8] Hide user profile details untils is implemented

---
 ereuse_devicehub/templates/ereuse_devicehub/user_profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
index 0a6b7710..7dcd62a8 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
@@ -28,7 +28,7 @@
 
     </div>
 
-    <div class="col-xl-8">
+    <div class="col-xl-8 d-none"><!-- TODO (hidden until is implemented )-->
 
       <div class="card">
         <div class="card-body pt-3">

From 1e79948e57c66dc303e2b6f847afd02fef89bdfb Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Tue, 5 Apr 2022 11:32:27 +0200
Subject: [PATCH 3/8] Drop broken link of breadcrumb

---
 ereuse_devicehub/templates/ereuse_devicehub/user_profile.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
index 7dcd62a8..71ab39fa 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
@@ -8,7 +8,6 @@
   <h1>Profile</h1>
   <nav>
     <ol class="breadcrumb">
-      <li class="breadcrumb-item"><a href="index.html">Home</a></li>
       <li class="breadcrumb-item">Users</li>
       <li class="breadcrumb-item active">Profile</li>
     </ol>

From 8ea8fba201efd63fb6e27bf8e9c3e30dafc23d04 Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Tue, 5 Apr 2022 11:32:55 +0200
Subject: [PATCH 4/8] Add link to help.usody.com

---
 ereuse_devicehub/templates/ereuse_devicehub/base_site.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
index 99bd68cf..1ffddfa0 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
@@ -53,7 +53,7 @@
           </li>
 
           <li>
-            <a class="dropdown-item d-flex align-items-center" href="pages-faq.html">
+            <a class="dropdown-item d-flex align-items-center" href="https://help.usody.com/" target="_blank">
               <i class="bi bi-question-circle"></i>
               <span>Need Help?</span>
             </a>

From c9068385c3c2694a01055a7392d3b735121decfa Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Tue, 5 Apr 2022 11:40:23 +0200
Subject: [PATCH 5/8] Update icons of device buttons

---
 ereuse_devicehub/templates/inventory/device_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 4181c82c..62679c4a 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -241,7 +241,7 @@
                         {{ f }}
                       {% endfor %}
                       <a href="javascript:$('#print_labels').submit()" class="dropdown-item">
-                        <i class="bi bi-x"></i>
+                        <i class="bi bi-printer"></i>
                         Print labels
                       </a>
                     </form>
@@ -261,7 +261,7 @@
                     {% else %}
                     <a href="{{ url_for('inventory.upload_snapshot') }}" class="dropdown-item">
                     {% endif %}
-                      <i class="bi bi-plus"></i>
+                      <i class="bi bi-upload"></i>
                       Upload a new Snapshot
                     </a>
                   </li>

From 82cea0462563dd9c298c0461db803c89e8dda75a Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Tue, 5 Apr 2022 11:46:31 +0200
Subject: [PATCH 6/8] Sort lot action's buttons

---
 ereuse_devicehub/templates/inventory/device_list.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 62679c4a..4c4c864a 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -38,15 +38,15 @@
             <div><!-- lot actions -->
               {% if lot.is_temporary %}
                 <span class="d-none" id="activeRemoveLotModal" data-bs-toggle="modal" data-bs-target="#btnRemoveLots"></span>
-                <a class="me-2" href="javascript:removeLot()">
-                  <i class="bi bi-trash"></i> Remove Lot
-                </a>
                 <a class="me-2" href="javascript:newTrade('user_from')">
                   <i class="bi bi-arrow-down-right"></i> Add supplier
                 </a>
-                <a href="javascript:newTrade('user_to')">
+                <a class="me-2" href="javascript:newTrade('user_to')">
                   <i class="bi bi-arrow-up-right"></i> Add receiver
                 </a>
+                <a class="text-danger" href="javascript:removeLot()">
+                  <i class="bi bi-trash"></i> Delete Lot
+                </a>
               {% endif %}
             </div>
           </div>

From 64182403a2214d8af270289941db0ba2c896779e Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Tue, 5 Apr 2022 11:47:12 +0200
Subject: [PATCH 7/8] UI: update button colors

---
 ereuse_devicehub/templates/inventory/removelot.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/removelot.html b/ereuse_devicehub/templates/inventory/removelot.html
index 40cfc14d..1ee1558b 100644
--- a/ereuse_devicehub/templates/inventory/removelot.html
+++ b/ereuse_devicehub/templates/inventory/removelot.html
@@ -3,21 +3,21 @@
     <div class="modal-content">
 
       <div class="modal-header">
-        <h5 class="modal-title">Remove Lot</h5>
+        <h5 class="modal-title">Delete Lot</h5>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
 
         <div class="modal-body">
-            Are you sure that you want to remove lot <strong>{{ lot.name }}</strong>?
+            Are you sure that you want to delete lot <strong>{{ lot.name }}</strong>?
             <p class="text-danger">
-               There are devices in this lot, are you sure you want to delete it?
+              This action cannot be undone.
             </p>
         </div>
 
         <div class="modal-footer">
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-          <a href="{{ url_for('inventory.lot_del', id=lot.id)}}" type="button" class="btn btn-primary">
-            Confirm
+          <button type="button" class="btn btn-secondary-outline" data-bs-dismiss="modal">Cancel</button>
+          <a href="{{ url_for('inventory.lot_del', id=lot.id)}}" type="button" class="btn btn-danger">
+            Delete it!
           </a>
         </div>
 

From 277c3a84a9beec72494e1379c700d56e1fac652e Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Tue, 5 Apr 2022 11:49:47 +0200
Subject: [PATCH 8/8] Rename removelot.html -> lot_delete_modal.html

---
 ereuse_devicehub/templates/inventory/device_list.html           | 2 +-
 .../inventory/{removelot.html => lot_delete_modal.html}         | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename ereuse_devicehub/templates/inventory/{removelot.html => lot_delete_modal.html} (100%)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 4c4c864a..b1c45382 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -400,7 +400,7 @@
 {% include "inventory/addDeviceslot.html" %}
 {% include "inventory/addDevicestag.html" %}
 {% include "inventory/removeDeviceslot.html" %}
-{% include "inventory/removelot.html" %}
+{% include "inventory/lot_delete_modal.html" %}
 {% include "inventory/actions.html" %}
 {% include "inventory/allocate.html" %}
 {% include "inventory/data_wipe.html" %}
diff --git a/ereuse_devicehub/templates/inventory/removelot.html b/ereuse_devicehub/templates/inventory/lot_delete_modal.html
similarity index 100%
rename from ereuse_devicehub/templates/inventory/removelot.html
rename to ereuse_devicehub/templates/inventory/lot_delete_modal.html