Merge pull request #53 from chris-mosley/departmentAwareness

Department awareness
chris-mosley · Jan 2, 2025 · 41f41f0 · 41f41f0
2 parents 09f79b1 + bc34dee
commit 41f41f0
Show file tree

Hide file tree

Showing 16 changed files with 495 additions and 335 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "AmazonBrandFilter",
   "description": "Filters out all unknown brands from Amazon search results.",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "keywords": [],
   "author": "",
   "license": "MIT",

diff --git a/src/assets/_locales/de/messages.json b/src/assets/_locales/de/messages.json
@@ -35,6 +35,10 @@
     "message": "Gerettet!",
     "description": "Persönliche Liste gespeicherte Bestätigung"
   },
+  "popup_department_header": {
+    "message": "Departments",
+    "description": "Current Departments, uncheck to disable filtering for a department"
+  },
   "popup_list_version": {
     "message": "Liste Version: ",
     "description": "Zeigen, welche Version der Liste wir haben"
@@ -62,5 +66,21 @@
   "popup_help_translate": {
     "message": "Help translate",
     "description": "Link to help translate the extension"
+  },
+  "show_all": {
+    "message": "Alles anzeigen",
+    "description": "Zum Ein-/Ausblenden der Schaltfläche für bekannte Abteilungen im Dashboard"
+  },
+  "hide_all": {
+    "message": "Alles ausblenden",
+    "description": "Zum Ein-/Ausblenden der Schaltfläche für bekannte Abteilungen im Dashboard"
+  },
+  "dept_count": {
+    "message": "Abteilungen: ",
+    "description": "How many departments we know about"
+  },
+  "dept_unknown": {
+    "message": "Unbekannt",
+    "description": "Unbekannte Abteilung"
   }
 }
diff --git a/src/assets/_locales/en/messages.json b/src/assets/_locales/en/messages.json
@@ -27,20 +27,24 @@
     "message": "Personal Blocklist",
     "description": "Enable or disable personal blocklist"
   },
-  "popup_save_button": {
+  "save_button": {
     "message": "Save",
     "description": "Save button"
   },
-  "popup_save_confirm": {
+  "save_confirm": {
     "message": "Saved!",
     "description": "Personal list saved confirmation"
   },
-  "popup_list_version": {
+  "department_header": {
+    "message": "Departments: ",
+    "description": "Current Departments, uncheck to disable filtering for a department"
+  },
+  "brand_list_version": {
     "message": "List Version: ",
     "description": "Show what version of the list we have"
   },
-  "popup_list_count": {
-    "message": "Known Brands: ",
+  "brand_list_count": {
+    "message": "Brands: ",
     "description": "How many brands we know about"
   },
   "popup_feedback_link": {
@@ -62,5 +66,21 @@
   "popup_help_translate": {
     "message": "Help translate",
     "description": "Link to help translate the extension"
+  },
+  "show_all": {
+    "message": "Show All",
+    "description": "For show/hide button for known departments on the dashboard"
+  },
+  "hide_all": {
+    "message": "Hide All",
+    "description": "For show/hide button for known departments on the dashboard"
+  },
+  "dept_count": {
+    "message": "Departments: ",
+    "description": "How many departments we know about"
+  },
+  "dept_unknown": {
+    "message": "Unknown",
+    "description": "Unknown department"
   }
 }
diff --git a/src/assets/_locales/es/messages.json b/src/assets/_locales/es/messages.json
@@ -31,6 +31,10 @@
     "message": "Ahorrar",
     "description": "botón guardar"
   },
+  "popup_department_header": {
+    "message": "Departments",
+    "description": "Current Departments, uncheck to disable filtering for a department"
+  },
   "popup_save_confirm": {
     "message": "Salvado!",
     "description": "Confirmación de lista personal guardada"
@@ -62,5 +66,21 @@
   "popup_help_translate": {
     "message": "Help translate",
     "description": "Link to help translate the extension"
+  },
+  "show_all": {
+    "message": "Mostrar todo",
+    "description": "Para mostrar/ocultar el botón para departamentos conocidos en el panel"
+  },
+  "hide_all": {
+    "message": "Ocultar todo",
+    "description": "Para mostrar/ocultar el botón para departamentos conocidos en el panel"
+  },
+  "dept_count": {
+    "message": "Departamentos: ",
+    "description": "Cuántos departamentos conocemos"
+  },
+  "dept_unknown": {
+    "message": "Desconocido",
+    "description": "Departamento desconocido"
   }
 }
diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css
@@ -0,0 +1,133 @@
+* {
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
+}
+
+body {
+  width: 25rem;
+  font-family: "Open Sans Light", sans-serif;
+  font-size: 16px;
+  font-weight: normal;
+  padding: 0.6rem;
+}
+
+label,
+input[type="checkbox"],
+input[type="radio"],
+input[type="button"] {
+  cursor: pointer;
+}
+
+label {
+  user-select: none;
+  padding: 0.2rem 0;
+}
+
+#abf-dashboard-depts > div{
+  user-select: none;
+  padding: 0.1rem 0;
+  margin-left: 1.3rem;
+}
+#abf-dashboard-depts > div > input[type="checkbox"]{
+  margin-right: 0.3em;
+}
+
+input[type="button"]{
+  padding: 0 0.6rem;
+}
+
+/* label:hover {
+  background-color: #eaeff2;
+} */
+
+/* Version span style */
+.abf-version {
+  position: absolute;
+  inset: 0 0 auto auto;
+  width: fit-content;
+
+  font-size: 0.8rem;
+  font-weight: bold;
+  color: grey;
+}
+
+/* Last Run span style */
+.last-run {
+  position: absolute;
+  inset: auto 0 0 auto;
+  width: fit-content;
+}
+
+/* Options Style */
+.options {
+  position: relative;
+  width: 100%;
+
+  display: flex;
+  flex-flow: column nowrap;
+  gap: 0.2rem 0;
+}
+
+.options-links > a {
+  display: block;
+}
+
+.indent {
+  margin-left: 1.3rem;
+}
+
+
+/* Instead of creating a spacer element, use this in 
+    a div to add spacings above that div */
+.spaced {
+  margin-top: 0.1rem;
+}
+
+/* Other */
+section.clear-options {
+  padding: 0.5em 0;
+  margin: 1em 0;
+}
+
+.title {
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
+#clear-button {
+  margin: 0 1.3em 1em 0;
+}
+
+section.clear-options input,
+section.clear-options > select,
+#clear-button {
+  float: right;
+}
+
+#abf-personal-block-textbox {
+  resize: vertical;
+  width: 100%;
+  display: none;
+}
+
+#abf-personal-block-button {
+  position: right;
+  float: right;
+  display: none;
+}
+
+#abf-dept-view-control {
+  position: right;
+  float: right;
+}
+
+.abf-personal-block-saved-confirm {
+  display: none;
+  float: right;
+  margin-right: .5em;
+}
+
+.resizable-textarea {
+  resize: vertical;
+}
diff --git a/src/assets/css/popup.css b/src/assets/css/popup.css
@@ -18,7 +18,9 @@ input[type="radio"],
 input[type="button"] {
   cursor: pointer;
 }
-
+#abf-current-depts > div > input[type="checkbox"]{
+  margin-right: 0.3em;
+}
 label {
   user-select: none;
   padding: 0.2rem 0;

diff --git a/src/assets/html/dashboard.html b/src/assets/html/dashboard.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'" />
-    <link rel="stylesheet" href="popup.css" />
+    <link rel="stylesheet" href="dashboard.css" />
   </head>
 
   <body>
@@ -23,7 +23,6 @@
       <div class="indent">
         <input type="radio" id="abf-filter-refiner-hide" />
         <label for="abf-filter-refiner-hide" id="abf-filter-refiner-hide-text"></label>
-
         <input type="radio" id="abf-filter-refiner-grey" />
         <label for="abf-filter-refiner-grey"  id="abf-filter-refiner-grey-text"></label>
       </div>
@@ -36,31 +35,38 @@
       <div>
         <input type="checkbox" id="abf-debug-mode" option="abf-debug-mode" />
         <label for="abf-debug-mode" id="abf-debug-mode-text"></label>
-      </div>
-
+      </div>      
+      
       <div>
         <input type="checkbox" id="abf-personal-block-enabled" option="abf-personal-block-enabled" />
         <label for="abf-personal-block-enabled" id="abf-personal-block-enabled-text"></label>
-        <span><input type="button" id="abf-personal-block-button" class="abf-personal-block-button" value="Save"/></span>
+        <span><input type="button" id="abf-personal-block-button" class="abf-personal-block-button"/></span>
         <span id="abf-personal-block-saved-confirm" class="abf-personal-block-saved-confirm"></span>
       </div>
-
       <div class="indent spaced">
         <textarea id="abf-personal-block-textbox" class="abf-personal-block-text" cols="45"></textarea>
       </div>
-
+      
       <div class="spaced">
         <span>
-          <span id="popup-brand-version-text"></span>
+          <span id="brand-version-text"></span>
           <span id="version-number"></span>
           <span> | </span>
-          <span id="popup-brand-count-text"></span>
-          <span id="brand-count"></span
-        ></span>
+          <span id="brand-count-text"></span>
+          <span id="brand-count"></span>
+        </span>
+      </div>
+
+      <div class="spaced">
+        <span id="department-list-text"></span>
+        <span id="dept-count"></span>
+        <span>
+          <input type="button" id="abf-dept-view-control" class="abf-dept-view-control-button"/>
+        </span>
+      </div>
+      <div id="abf-dashboard-depts">
       </div>
-
       <div class="options-links spaced">
-        <a href="dashboard.html" id="popup-dashboard"></a>
         <a href="https://github.com/chris-mosley/AmazonBrandFilter/issues" id="popup-feedback-text"></a>
         <a href="https://github.com/chris-mosley/AmazonBrandFilterList#missing-a-brand" id="popup-missing-brand-text"></a>
         <a href="https://github.com/chris-mosley/AmazonBrandFilter#help-translate" id="popup-help-translate"></a>
@@ -78,6 +84,6 @@
     </div> -->
     </div>
 
-    <script src="popup.js"></script>
+    <script src="gui.js"></script>
   </body>
 </html>