From cb1f4377d6f52f6b4fa56e52b3af362437c3e296 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Tue, 12 Apr 2022 12:44:24 +0200
Subject: [PATCH 01/10] Fix button spacing

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

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index b1c45382..47d4c382 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -72,7 +72,7 @@
           <div class="tab-content pt-5">
             <div id="devices-list" class="tab-pane fade devices-list active show">
 
-              <div class="btn-group dropdown ml-1">
+              <div class="btn-group dropdown m-1">
                 <button id="btnLots" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                   <i class="bi bi-folder2"></i>
                   Lots
@@ -94,7 +94,7 @@
                   </li>
                 </ul>
               </div>
-              <div class="btn-group dropdown ml-1" uib-dropdown="">
+              <div class="btn-group dropdown m-1" uib-dropdown="">
                 <button id="btnActions" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                     <i class="bi bi-plus"></i>
                     New Actions
@@ -181,7 +181,7 @@
                 </ul>
               </div>
 
-              <div class="btn-group dropdown ml-1" uib-dropdown="">
+              <div class="btn-group dropdown m-1" uib-dropdown="">
                 <button id="btnExport" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                     <i class="bi bi-reply"></i>
                     Exports
@@ -215,7 +215,7 @@
                 </ul>
               </div>
 
-              <div class="btn-group dropdown ml-1" uib-dropdown="">
+              <div class="btn-group dropdown m-1" uib-dropdown="">
                 <button id="btnTags" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                     <i class="bi bi-tag"></i>
                     Tags
@@ -249,7 +249,7 @@
                 </ul>
               </div>
 
-              <div class="btn-group dropdown ml-1" uib-dropdown="">
+              <div class="btn-group dropdown m-1" uib-dropdown="">
                 <button id="btnSnapshot" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                     <i class="bi bi-laptop"></i>
                     New Device

From 23d8ba157065ae85a7b8fa71a02ac1de775a95cd Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Tue, 12 Apr 2022 12:57:46 +0200
Subject: [PATCH 02/10] fix lot buttons

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

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 47d4c382..cdf2c5e3 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -32,10 +32,10 @@
         <div class="card-body pt-3">
           <!-- Bordered Tabs -->
 
-          <div class="d-flex align-items-center justify-content-between">
-            <h3><a href="{{ url_for('inventory.lot_edit', id=lot.id) }}">{{ lot.name }}</a></h3>
+          <div class="d-flex align-items-center justify-content-between row">
+            <h3 class="col-sm-12 col-md-5"><a href="{{ url_for('inventory.lot_edit', id=lot.id) }}">{{ lot.name }}</a></h3>
 
-            <div><!-- lot actions -->
+            <div class="col-sm-12 col-md-7 d-md-flex justify-content-md-end"><!-- 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:newTrade('user_from')">

From 08ebc862ae689fcd2d504cf320cee9654b24c1d3 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Tue, 12 Apr 2022 12:59:22 +0200
Subject: [PATCH 03/10] fix href link

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

diff --git a/ereuse_devicehub/templates/labels/label_list.html b/ereuse_devicehub/templates/labels/label_list.html
index 810db5cf..da22e5c3 100644
--- a/ereuse_devicehub/templates/labels/label_list.html
+++ b/ereuse_devicehub/templates/labels/label_list.html
@@ -57,7 +57,7 @@
                       <td>{{ tag.get_provider }}</td>
                       <td>
                         {% if tag.device %}
-                        <a href={{ url_for('inventory.device_details', id=tag.device.devicehub_id)}}>
+                        <a href="{{ url_for('inventory.device_details', id=tag.device.devicehub_id)}}">
                           {{ tag.device.verbose_name }}
                         </a>
                         {% endif %}

From 6c4d549c0a7764d3a029c6c90192ee266d9d1734 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Tue, 12 Apr 2022 12:59:53 +0200
Subject: [PATCH 04/10] fix button spacing on tags management

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

diff --git a/ereuse_devicehub/templates/labels/label_list.html b/ereuse_devicehub/templates/labels/label_list.html
index da22e5c3..3237d71d 100644
--- a/ereuse_devicehub/templates/labels/label_list.html
+++ b/ereuse_devicehub/templates/labels/label_list.html
@@ -19,7 +19,7 @@
         <div class="card-body pt-3">
           <!-- Bordered Tabs -->
 
-            <div class="btn-group dropdown ml-1">
+            <div class="btn-group dropdown m-1">
               <a href="{{ url_for('labels.tag_add')}}" type="button" class="btn btn-primary">
                 <i class="bi bi-plus"></i>
                 Create Named Tag
@@ -27,7 +27,7 @@
               </a>
             </div>
 
-            <div class="btn-group dropdown ml-1" uib-dropdown="">
+            <div class="btn-group dropdown m-1" uib-dropdown="">
               <a href="{{ url_for('labels.tag_unnamed_add')}}" type="button" class="btn btn-primary">
                 <i class="bi bi-plus"></i>
                 Create UnNamed Tag

From d3564a6ba5d7b065d0fb03209d79a7be64235cef Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Tue, 12 Apr 2022 13:17:17 +0200
Subject: [PATCH 05/10] Fix login width

---
 .../ereuse_devicehub/user_login.html          | 108 +++++++++---------
 1 file changed, 51 insertions(+), 57 deletions(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
index b234927c..78b17244 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
@@ -5,50 +5,48 @@
 {% block body %}
 <main>
   <div class="container">
+    <div class="row justify-content-center">
+      <div class="d-flex max-vh-100 flex-column align-items-center" style="max-width: 400px;">
 
-    <section class="section register min-vh-100 d-flex flex-column align-items-center justify-content-center py-4">
-      <div class="container">
-        <div class="row justify-content-center">
-          <div class="col-lg-4 col-md-6 d-flex flex-column align-items-center justify-content-center">
+        <div class="d-flex justify-content-center py-4">
+          <a href="{{ url_for('core.login') }}" class="logo d-flex align-items-center w-auto">
+            <img src="{{ url_for('static', filename='img/usody-logo-black.svg') }}" alt="">
+          </a>
+        </div><!-- End Logo -->
 
-            <div class="d-flex justify-content-center py-4">
-              <a href="{{ url_for('core.login') }}" class="logo d-flex align-items-center w-auto">
-                <img src="{{ url_for('static', filename='img/usody-logo-black.svg') }}" alt="">
-              </a>
-            </div><!-- End Logo -->
+        <div class="card mb-3">
 
-            <div class="card mb-3">
+          <div class="card-body">
 
-              <div class="card-body">
+            <div class="pt-4 pb-2">
+              <h5 class="card-title text-center pb-0 fs-4">Login to Your Account</h5>
+              <p class="text-center small">Enter your username & password to login</p>
+              {% if form.form_errors %}
+              <p class="text-danger">
+                {% for error in form.form_errors %}
+                {{ error }}<br />
+                {% endfor %}
+              </p>
+              {% endif %}
+            </div>
 
-                <div class="pt-4 pb-2">
-                  <h5 class="card-title text-center pb-0 fs-4">Login to Your Account</h5>
-                  <p class="text-center small">Enter your username & password to login</p>
-                  {% if form.form_errors %}
-                  <p class="text-danger">
-                    {% for error in form.form_errors %}
-                      {{ error }}<br/>
-                    {% endfor %}
-                  </p>
-                  {% endif %}
-                </div>
+            <form method="post" class="row g-3 needs-validation" novalidate>
+              {{ form.csrf_token }}
 
-                <form method="post" class="row g-3 needs-validation" novalidate>
-                  {{ form.csrf_token }}
+              <div class="col-12">
+                <label for="yourEmail" class="form-label">Email</label>
+                <input type="email" name="email" class="form-control" id="yourEmail" required
+                  value="{{ form.email.data|default('', true) }}">
+                <div class="invalid-feedback">Please enter your email.</div>
+              </div>
 
-                  <div class="col-12">
-                    <label for="yourEmail" class="form-label">Email</label>
-                    <input type="email" name="email" class="form-control" id="yourEmail" required value="{{ form.email.data|default('', true) }}">
-                    <div class="invalid-feedback">Please enter your email.</div>
-                  </div>
+              <div class="col-12">
+                <label for="yourPassword" class="form-label">Password</label>
+                <input type="password" name="password" class="form-control" id="yourPassword" required>
+                <div class="invalid-feedback">Please enter your password!</div>
+              </div>
 
-                  <div class="col-12">
-                    <label for="yourPassword" class="form-label">Password</label>
-                    <input type="password" name="password" class="form-control" id="yourPassword" required>
-                    <div class="invalid-feedback">Please enter your password!</div>
-                  </div>
-
-                  <!-- TODO(@slamora): hidde until it is implemented
+              <!-- TODO(@slamora): hidde until it is implemented
                   <div class="col-12">
                     <div class="form-check">
                       <input class="form-check-input" type="checkbox" name="remember" {% if form.remember.data %}checked{% endif %} id="rememberMe">
@@ -56,31 +54,27 @@
                     </div>
                   </div>
                   -->
-                  <div class="col-12">
-                    <button class="btn btn-primary w-100" type="submit">Login</button>
-                  </div>
-                  <div class="col-12">
-                    <p class="small mb-0">Don't have account? <a href="#TODO">Create an account</a></p>
-                  </div>
-                </form>
-
+              <div class="col-12">
+                <button class="btn btn-primary w-100" type="submit">Login</button>
               </div>
-            </div>
-
-            <div class="credits">
-              <!-- All the links in the footer should remain intact. -->
-              <!-- You can delete the links only if you purchased the pro version. -->
-              <!-- Licensing information: https://bootstrapmade.com/license/ -->
-              <!-- Purchase the pro version with working PHP/AJAX contact form: https://bootstrapmade.com/nice-admin-bootstrap-admin-html-template/ -->
-              Designed by <a href="https://bootstrapmade.com/">BootstrapMade</a>
-            </div>
+              <div class="col-12">
+                <p class="small mb-0">Don't have account? <a href="#TODO">Create an account</a></p>
+              </div>
+            </form>
 
           </div>
         </div>
+
+        <div class="credits">
+          <!-- All the links in the footer should remain intact. -->
+          <!-- You can delete the links only if you purchased the pro version. -->
+          <!-- Licensing information: https://bootstrapmade.com/license/ -->
+          <!-- Purchase the pro version with working PHP/AJAX contact form: https://bootstrapmade.com/nice-admin-bootstrap-admin-html-template/ -->
+          Designed by <a href="https://bootstrapmade.com/">BootstrapMade</a>
+        </div>
+
       </div>
-
-    </section>
-
+    </div>
   </div>
 </main><!-- End #main -->
-{% endblock body %}
+{% endblock body %}
\ No newline at end of file

From d985744fb82edacc3a1cfddcd1141b8c4412b665 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Tue, 12 Apr 2022 13:19:56 +0200
Subject: [PATCH 06/10] fix device list padding

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

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index cdf2c5e3..34f1fdd6 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -69,7 +69,7 @@
 
           </ul>
           {% endif %}
-          <div class="tab-content pt-5">
+          <div class="tab-content pt-1">
             <div id="devices-list" class="tab-pane fade devices-list active show">
 
               <div class="btn-group dropdown m-1">

From 4611f79b44bacd2cf9bf0c57543e478f0d18a4b5 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Tue, 12 Apr 2022 14:12:21 +0200
Subject: [PATCH 07/10] lint

---
 ereuse_devicehub/templates/ereuse_devicehub/user_login.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
index 78b17244..400ef355 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
@@ -24,7 +24,7 @@
               {% if form.form_errors %}
               <p class="text-danger">
                 {% for error in form.form_errors %}
-                {{ error }}<br />
+                {{ error }}<br/>
                 {% endfor %}
               </p>
               {% endif %}
@@ -35,8 +35,7 @@
 
               <div class="col-12">
                 <label for="yourEmail" class="form-label">Email</label>
-                <input type="email" name="email" class="form-control" id="yourEmail" required
-                  value="{{ form.email.data|default('', true) }}">
+                <input type="email" name="email" class="form-control" id="yourEmail" required value="{{ form.email.data|default('', true) }}">
                 <div class="invalid-feedback">Please enter your email.</div>
               </div>
 

From c256936b7dd04bef81b2fe64d15325dc6344f597 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Wed, 13 Apr 2022 13:27:38 +0200
Subject: [PATCH 08/10] fix trade lots modal

---
 ereuse_devicehub/templates/inventory/device_list.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index c7e8c133..10305ac4 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -78,6 +78,7 @@
                   Lots
                   <span class="caret"></span>
                 </button>
+                <span class="d-none" id="activeTradeModal" data-bs-toggle="modal" data-bs-target="#tradeLotModal"></span>
                 <ul class="dropdown-menu" aria-labelledby="btnLots" style="width: 300px;" id="dropDownLotsSelector">
                   <h6 class="dropdown-header">Select some devices to manage lots</h6>
                   <ul style="list-style-type: none; margin: 0; padding: 0;" class="mx-3" id="LotsSelector"></ul>

From 3f4b115575ff7f799bada74bcb477b1d311b8fd9 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Wed, 13 Apr 2022 13:53:22 +0200
Subject: [PATCH 09/10] fix clickable lots selector

---
 ereuse_devicehub/static/js/main_inventory.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index bf2fdf43..6831ca98 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -200,8 +200,9 @@ async function processSelectedDevices() {
          */
         manage(event, lotID, deviceListID) {
             event.preventDefault();
-            const indeterminate = event.srcElement.indeterminate;
-            const checked = !event.srcElement.checked;
+            const srcElement = event.srcElement.parentElement.children[0]
+            const indeterminate = srcElement.indeterminate;
+            const checked = !srcElement.checked;
 
             var found = this.list.filter(list => list.lotID == lotID)[0];
             var foundIndex = found != undefined ? this.list.findLastIndex(x => x.lotID == found.lotID) : -1;
@@ -343,6 +344,7 @@ async function processSelectedDevices() {
         }
 
         doc.children[0].addEventListener('mouseup', (ev) => actions.manage(ev, lotID, selectedDevicesIDs));
+        doc.children[1].addEventListener('mouseup', (ev) => actions.manage(ev, lotID, selectedDevicesIDs));
         elementTarget.append(doc);
     }
 

From 33783b6e7da9321affebc45886d370979c3de875 Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Wed, 20 Apr 2022 12:04:50 +0200
Subject: [PATCH 10/10] Revert "Fix login width"

This reverts commit d3564a6ba5d7b065d0fb03209d79a7be64235cef.
---
 .../ereuse_devicehub/user_login.html          | 107 ++++++++++--------
 1 file changed, 57 insertions(+), 50 deletions(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
index 400ef355..b234927c 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
@@ -5,47 +5,50 @@
 {% block body %}
 <main>
   <div class="container">
-    <div class="row justify-content-center">
-      <div class="d-flex max-vh-100 flex-column align-items-center" style="max-width: 400px;">
 
-        <div class="d-flex justify-content-center py-4">
-          <a href="{{ url_for('core.login') }}" class="logo d-flex align-items-center w-auto">
-            <img src="{{ url_for('static', filename='img/usody-logo-black.svg') }}" alt="">
-          </a>
-        </div><!-- End Logo -->
+    <section class="section register min-vh-100 d-flex flex-column align-items-center justify-content-center py-4">
+      <div class="container">
+        <div class="row justify-content-center">
+          <div class="col-lg-4 col-md-6 d-flex flex-column align-items-center justify-content-center">
 
-        <div class="card mb-3">
+            <div class="d-flex justify-content-center py-4">
+              <a href="{{ url_for('core.login') }}" class="logo d-flex align-items-center w-auto">
+                <img src="{{ url_for('static', filename='img/usody-logo-black.svg') }}" alt="">
+              </a>
+            </div><!-- End Logo -->
 
-          <div class="card-body">
+            <div class="card mb-3">
 
-            <div class="pt-4 pb-2">
-              <h5 class="card-title text-center pb-0 fs-4">Login to Your Account</h5>
-              <p class="text-center small">Enter your username & password to login</p>
-              {% if form.form_errors %}
-              <p class="text-danger">
-                {% for error in form.form_errors %}
-                {{ error }}<br/>
-                {% endfor %}
-              </p>
-              {% endif %}
-            </div>
+              <div class="card-body">
 
-            <form method="post" class="row g-3 needs-validation" novalidate>
-              {{ form.csrf_token }}
+                <div class="pt-4 pb-2">
+                  <h5 class="card-title text-center pb-0 fs-4">Login to Your Account</h5>
+                  <p class="text-center small">Enter your username & password to login</p>
+                  {% if form.form_errors %}
+                  <p class="text-danger">
+                    {% for error in form.form_errors %}
+                      {{ error }}<br/>
+                    {% endfor %}
+                  </p>
+                  {% endif %}
+                </div>
 
-              <div class="col-12">
-                <label for="yourEmail" class="form-label">Email</label>
-                <input type="email" name="email" class="form-control" id="yourEmail" required value="{{ form.email.data|default('', true) }}">
-                <div class="invalid-feedback">Please enter your email.</div>
-              </div>
+                <form method="post" class="row g-3 needs-validation" novalidate>
+                  {{ form.csrf_token }}
 
-              <div class="col-12">
-                <label for="yourPassword" class="form-label">Password</label>
-                <input type="password" name="password" class="form-control" id="yourPassword" required>
-                <div class="invalid-feedback">Please enter your password!</div>
-              </div>
+                  <div class="col-12">
+                    <label for="yourEmail" class="form-label">Email</label>
+                    <input type="email" name="email" class="form-control" id="yourEmail" required value="{{ form.email.data|default('', true) }}">
+                    <div class="invalid-feedback">Please enter your email.</div>
+                  </div>
 
-              <!-- TODO(@slamora): hidde until it is implemented
+                  <div class="col-12">
+                    <label for="yourPassword" class="form-label">Password</label>
+                    <input type="password" name="password" class="form-control" id="yourPassword" required>
+                    <div class="invalid-feedback">Please enter your password!</div>
+                  </div>
+
+                  <!-- TODO(@slamora): hidde until it is implemented
                   <div class="col-12">
                     <div class="form-check">
                       <input class="form-check-input" type="checkbox" name="remember" {% if form.remember.data %}checked{% endif %} id="rememberMe">
@@ -53,27 +56,31 @@
                     </div>
                   </div>
                   -->
-              <div class="col-12">
-                <button class="btn btn-primary w-100" type="submit">Login</button>
+                  <div class="col-12">
+                    <button class="btn btn-primary w-100" type="submit">Login</button>
+                  </div>
+                  <div class="col-12">
+                    <p class="small mb-0">Don't have account? <a href="#TODO">Create an account</a></p>
+                  </div>
+                </form>
+
               </div>
-              <div class="col-12">
-                <p class="small mb-0">Don't have account? <a href="#TODO">Create an account</a></p>
-              </div>
-            </form>
+            </div>
+
+            <div class="credits">
+              <!-- All the links in the footer should remain intact. -->
+              <!-- You can delete the links only if you purchased the pro version. -->
+              <!-- Licensing information: https://bootstrapmade.com/license/ -->
+              <!-- Purchase the pro version with working PHP/AJAX contact form: https://bootstrapmade.com/nice-admin-bootstrap-admin-html-template/ -->
+              Designed by <a href="https://bootstrapmade.com/">BootstrapMade</a>
+            </div>
 
           </div>
         </div>
-
-        <div class="credits">
-          <!-- All the links in the footer should remain intact. -->
-          <!-- You can delete the links only if you purchased the pro version. -->
-          <!-- Licensing information: https://bootstrapmade.com/license/ -->
-          <!-- Purchase the pro version with working PHP/AJAX contact form: https://bootstrapmade.com/nice-admin-bootstrap-admin-html-template/ -->
-          Designed by <a href="https://bootstrapmade.com/">BootstrapMade</a>
-        </div>
-
       </div>
-    </div>
+
+    </section>
+
   </div>
 </main><!-- End #main -->
-{% endblock body %}
\ No newline at end of file
+{% endblock body %}