Merge pull request #200 from cachho/chore/DatabaseUpdate

chore: database update

Author: cachho

src/components/Popup.tsx

@@ -375,76 +375,16 @@ const Popup = () => {
       <br />
       <input
         type="checkbox"
-        checked={settings.showAmountSoldSummary}
+        checked={settings.showAmountSold}
         onChange={() =>
           setSettings({
             ...settings,
-            showAmountSoldSummary: !settings.showAmountSoldSummary,
+            showAmountSold: !settings.showAmountSold,
           })
         }
       />
-      display amount sold total summary
+      display amount sold (last 30 days)
       <br />
-      <input
-        type="checkbox"
-        checked={settings.showAmountSold1}
-        onChange={() =>
-          setSettings({
-            ...settings,
-            showAmountSold1: !settings.showAmountSold1,
-          })
-        }
-      />
-      display amount sold 24 hours
-      <br />
-      <input
-        type="checkbox"
-        checked={settings.showAmountSold7}
-        onChange={() =>
-          setSettings({
-            ...settings,
-            showAmountSold7: !settings.showAmountSold7,
-          })
-        }
-      />
-      display amount sold 7 days
-      <br />
-      <input
-        type="checkbox"
-        checked={settings.showAmountSold30}
-        onChange={() =>
-          setSettings({
-            ...settings,
-            showAmountSold30: !settings.showAmountSold30,
-          })
-        }
-      />
-      display amount sold 30 days
-      <br />
-      <input
-        type="checkbox"
-        checked={settings.showAmountSoldAt}
-        onChange={() =>
-          setSettings({
-            ...settings,
-            showAmountSoldAt: !settings.showAmountSoldAt,
-          })
-        }
-      />
-      display amount sold all time
-      <br />
-      <input
-        type="checkbox"
-        checked={settings.showAmountSoldTimeframeLabel}
-        onChange={() =>
-          setSettings({
-            ...settings,
-            showAmountSoldTimeframeLabel:
-              !settings.showAmountSoldTimeframeLabel,
-          })
-        }
-      />
-      display amount sold timeframe label
       <br />
       <input
         type="checkbox"
@@ -456,7 +396,7 @@ const Popup = () => {
           })
         }
       />
-      display 30 day position (ranking)
+      display ranking (last 30 days)
       <br />
       <input
         type="checkbox"

src/lib/html/addHtmlOnlineElements.ts

@@ -26,67 +26,21 @@ export function addHtmlOnlineElements(
     );
   }
 
-  if (settings.showPos && details.amountSold[30] > 0) {
+  if (settings.showPos && details.amountSold.pos < 1000) {
     link.insertAdjacentElement(
       'afterend',
       addDetailsElement(`#${details.amountSold.pos}`, true)
     );
   }
 
-  if (settings.showAmountSoldAt) {
+  if (
+    settings.showAmountSold &&
+    details.amountSold !== undefined &&
+    details.amountSold !== null
+  ) {
     link.insertAdjacentElement(
       'afterend',
-      addDetailsElement(
-        `${settings.showAmountSoldTimeframeLabel ? 'all-time: ' : ''}${
-          details.amountSold.at
-        } sold`,
-        true
-      )
-    );
-  }
-
-  if (settings.showAmountSold30) {
-    link.insertAdjacentElement(
-      'afterend',
-      addDetailsElement(
-        `${settings.showAmountSoldTimeframeLabel ? '30d: ' : ''}${
-          details.amountSold[30]
-        } sold`,
-        true
-      )
-    );
-  }
-
-  if (settings.showAmountSold7) {
-    link.insertAdjacentElement(
-      'afterend',
-      addDetailsElement(
-        `${settings.showAmountSoldTimeframeLabel ? '7d: ' : ''}${
-          details.amountSold[7]
-        } sold`,
-        true
-      )
-    );
-  }
-
-  if (settings.showAmountSold1) {
-    link.insertAdjacentElement(
-      'afterend',
-      addDetailsElement(
-        `${settings.showAmountSoldTimeframeLabel ? '24h: ' : ''}${
-          details.amountSold[1]
-        } sold`,
-        true
-      )
-    );
-  }
-
-  if (settings.showAmountSoldSummary) {
-    link.insertAdjacentElement(
-      'afterend',
-      addDetailsElement(
-        `sold: 24h: ${details.amountSold[1]} / 7d: ${details.amountSold[7]} / 30d: ${details.amountSold[30]} / all-time: ${details.amountSold.at}`
-      )
+      addDetailsElement(`${details.amountSold.count} sold`, true)
     );
   }
 

src/models/Details.ts

@@ -1,9 +1,6 @@
 export type Details = {
   amountSold: {
-    1: number;
-    7: number;
-    30: number;
-    at: number;
+    count: number;
     pos: number;
   };
   item: {

src/models/Settings.ts

@@ -18,12 +18,7 @@ export const settingNames: (keyof Settings)[] = [
   'onlineFeaturesQcPhotos',
   'showThumbnail',
   'showPrice',
-  'showAmountSoldSummary',
-  'showAmountSold1',
-  'showAmountSold7',
-  'showAmountSold30',
-  'showAmountSoldAt',
-  'showAmountSoldTimeframeLabel',
+  'showAmountSold',
   'showPos',
   'showTitle',
   'displayTitleLength',
@@ -51,12 +46,7 @@ export type Settings = {
   onlineFeaturesQcPhotos: boolean;
   showThumbnail: boolean;
   showPrice: boolean;
-  showAmountSoldSummary: boolean;
-  showAmountSold1: boolean;
-  showAmountSold7: boolean;
-  showAmountSold30: boolean;
-  showAmountSoldAt: boolean;
-  showAmountSoldTimeframeLabel: boolean;
+  showAmountSold: boolean;
   showPos: boolean;
   showTitle: boolean;
   displayTitleLength: string;
@@ -84,12 +74,7 @@ export const defaultSettings: Settings = {
   onlineFeaturesQcPhotos: true,
   showThumbnail: true,
   showPrice: true,
-  showAmountSoldSummary: false,
-  showAmountSold1: false,
-  showAmountSold7: false,
-  showAmountSold30: true,
-  showAmountSoldAt: false,
-  showAmountSoldTimeframeLabel: false,
+  showAmountSold: true,
   showPos: false,
   showTitle: true,
   displayTitleLength: '64',