From e211e0e52134fedd8ad74fbfd2d67928f595abf8 Mon Sep 17 00:00:00 2001
From: Admin <admin@MacBook-Air.local>
Date: Tue, 27 May 2025 17:21:27 +0700
Subject: [PATCH] update position

---
 .DS_Store              | Bin 6148 -> 6148 bytes
 assets/.DS_Store       | Bin 0 -> 6148 bytes
 assets/css/index.css   |   1 +
 content.js             |  54 ++++++++++++++++++++++++++---------------
 manifest.json          |   2 +-
 pages/.DS_Store        | Bin 0 -> 6148 bytes
 pages/popup/popup.html |   7 +++---
 7 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 assets/.DS_Store
 create mode 100644 pages/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 30b1a797bb03722ca01d1c8a2b94899d2c550200..43f9de32fbb237dfeeeb8f1b599333ee13b4b9e6 100644
GIT binary patch
literal 6148
zcmeHKO>Yx15FMv!yJ;0E2atNS#5F1jw5kx7Z72t>EP?}|u-gq`>DG?28*+#u?HPUy
zSAGfqg%iB79Vy#1SA>cu8b5!`v)9kE9TSll%+fwlhlm0=WAgyXEynHa8`f|&Eub)c
zlvKRP^<|RlWFy*Fcm=!y|C$24clRi!0>2T}_b(p`-{Hr<jhRoc#U}G&;`aKFWRhn^
z+3Wojjh*K1-hQwj90u>BPkJ7eaXBjn@$@a1UTK{tt9+ci&PMZL=iW1|$~aS_sUc+P
z2qEv@WGdD3fu5<fFx<#C1g)So>>Mo?{YU+-JUKgCcID#9X|F3EpPVk2t>FHHhfiM)
zukvf9znZTmf%C~&+u;hnAyb>vmuRYTt;VQlPMZ>_b4gb;rYUKfk)o82>2vL*gHjD<
ztSfZ@mPT|5T{*plBY5<6PMfYVnxc$8f>o?o+|Sy%%Ik7|gSkr+FvrZQM~YwDBk#!i
zt<C+$>S5~MwkqKEL~yt@!Z&yYyaNBL0(?G5IAiFrvS^MDB<2YKY@*s2@_aopM>-50
zRu<6$6P60JRN<Z&!qQPMU0mp}vS{ff+~Y&Ik%fDq2s1kRmnNJ<Xwj!$0k1$^fgM}y
z@csXM`}@C6@+Gf;SKv-5AetA^#Q;-sck9OF_^y@k4{$b)t1KD{5_cV&3}3}ZaARnb
YoB@UoD~qUs`9A_i2A_BZ{;C3h00u_Q=Kufz

delta 70
zcmZoMXfc=|#>B)qu~2NHo+2ab#(>?7jI5J+So9}rvtHUP#v#ZuvEk)rb`E|HpsLM+
Y9N(EI^NTogFaQA~0|U$E2$40+0D~tGq5uE@

diff --git a/assets/.DS_Store b/assets/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..bab07240b59df29ebc945e53a2c3bfe3102e63f6
GIT binary patch
literal 6148
zcmeHKO-lnY5KY>uTZ_<xg2x4~MO!}*@v_!>@al>lRBE>^y0~six3z~-*t7l^ul^GM
zj=o8z&{{nSA|(Tpm&`|&d5~mB2qCNeRz--S5W;~H=9V#hBjhKYkqlcFfs*!6%^*?%
zR<xZJ%YbFzzcWB*H!GSV5y@#Zb$*ZF+5FI=i{PkWkaYNzzXhErOnT+=yUb*B3yVw6
zl2dSQ{ChR<dyQT{sW!S-v^rNR3dZwBa1pi#_2TNWihGSPZg+J;*lHu>`ZA1LYEV`E
zxRvN!-#DDSldl)ohr`NtrR47J?~h9E@L;c8a(8z3Mx(s5wy|}1R)2^dWA$uEm$;L(
ztT2w@1rx63$?wLIitk{d=mimi3nk(iHeTVKWMd+7P8gY}=nE?--O3y?z~{p$%wcV|
zB+Gzh;CBqr{oq0gJ;v0azB(}I766!oSqtX+=O5^j0q8NN24R6nlL|Dcl3NVPy@NFA
z@OvDe8Z_xb>Mvs-{<7o_MRMyQT^%l@XV8w80n5NN16i{y())k%bN@e`WLK5}%fMVQ
zAagapRz*qtw$2nsZ><Zxg_2NQYEY+O;OAIR=qX-@YJtzC3D9Fq4Z;GkKLVNtJ6Hz(
Glz~qc1e^5$

literal 0
HcmV?d00001

diff --git a/assets/css/index.css b/assets/css/index.css
index 68bea98..97743ce 100644
--- a/assets/css/index.css
+++ b/assets/css/index.css
@@ -20,6 +20,7 @@
   display: flex;
   flex-direction: column;
   gap: 10px;
+  width: 100%;
 }
 
 #bid-extension h2 {
diff --git a/content.js b/content.js
index 31be8d2..296b74e 100644
--- a/content.js
+++ b/content.js
@@ -1,6 +1,6 @@
 const CONFIG = {
-  API_BASE_URL: "http://localhost:4000/api/v1",
-  // API_BASE_URL: "https://bids.apactech.io/api/v1",
+  // API_BASE_URL: "http://localhost:4000/api/v1",
+  API_BASE_URL: "https://bids.apactech.io/api/v1",
 };
 
 let PREV_DATA = null;
@@ -23,34 +23,57 @@ function extractDomain(url) {
   }
 }
 
+const webs = {
+  grays: "https://www.grays.com",
+  langtons: "https://www.langtons.com.au",
+  lawsons: "https://www.lawsons.com.au",
+  pickles: "https://www.pickles.com.au",
+  allbids: "https://www.allbids.com.au",
+};
+
 function extractModelId(url) {
   switch (extractDomain(url)) {
-    case "https://www.grays.com": {
+    case webs.grays: {
       const match = url.match(/\/lot\/([\d-]+)\//);
       return match ? match[1] : null;
     }
-    case "https://www.langtons.com.au": {
+    case webs.langtons: {
       const match = url.match(/auc-var-\d+/);
       return match[0];
     }
-    case "https://www.lawsons.com.au": {
+    case webs.lawsons: {
       const match = url.split("_");
       return match ? match[1] : null;
     }
-    case "https://www.pickles.com.au": {
+    case webs.pickles: {
       const model = url.split("/").pop();
       return model ? model : null;
     }
+    case webs.allbids: {
+      const match = url.match(/-(\d+)(?:[\?#]|$)/);
+      return match ? match[1] : null;
+    }
   }
 }
 
-const showPage = async (pageLink = "pages/popup/popup.html") => {
-  const res = await fetch(chrome.runtime.getURL(pageLink));
-  const html = await res.text();
+const isValidUrl = (url) => {
+  return !!Object.keys(webs).find((item) => url.includes(webs[item]));
+};
 
-  const wrapper = document.createElement("div");
-  wrapper.innerHTML = html;
-  document.body.appendChild(wrapper);
+const showPage = async (pageLink = "pages/popup/popup.html") => {
+  const url = window.location.href; // sửa lỗi ở đây
+
+  if (!isValidUrl(url)) return;
+  try {
+    const res = await fetch(chrome.runtime.getURL(pageLink));
+    const html = await res.text();
+
+    const wrapper = document.createElement("div");
+    wrapper.innerHTML = html;
+    document.body.appendChild(wrapper);
+  } catch (err) {
+    console.error("Failed to load popup page:", err);
+  }
 };
 
 const getKey = () => {
@@ -360,13 +383,6 @@ const showInfo = async (model, formElements) => {
   style.href = chrome.runtime.getURL("assets/css/index.css");
   document.head.appendChild(style);
 
-  const script = document.createElement("script");
-  script.type = "module";
-  script.src = chrome.runtime.getURL("pages/popup/popup.js");
-  script.defer = true;
-
-  document.body.appendChild(script);
-
   handleSaveKey();
 
   const currentUrl = window.location.href;
diff --git a/manifest.json b/manifest.json
index b07736c..b345cce 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Bid Extension",
-  "version": "1.0",
+  "version": "1.2",
   "description": "Bid Extension",
   "action": {
     "default_popup": "pages/popup/popup.html",
diff --git a/pages/.DS_Store b/pages/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..9fa9e9a77894a19c0ed77a5f89c9db756709eaaf
GIT binary patch
literal 6148
zcmeHK%}T>S5Z>*NO({YT3Oz1(E!t{J5ic>;gI6PZP^pP28jRV}rshxzIqM7gB)*Q$
z>~5q|y@^PffthbJJCkI-4Z9h}7<Z;Yo3T1$%mPI$RKa{BIFGs{1>-3Ka&?c<NhELm
zNcu~$<oKTq;M$ehh)K{XTU<Z<Bo0Bh-<7D>Ux@V6$;hnqt3QguNz!V)@j|gwUaMFY
zt7cuh_cC=8FPTmpZ+wYYXHrIfKKA_caF`D28%Huuyf7Y)RYDjHA>`^Jj02fEavBE{
zmFwyWt7=sT^~P-0-fcHUr`MY|#caRZYKpy1cRsILn_D{vr-O&+F_zEjof(I3Q^~r)
z9A03sP|=e+jw2c0fj7^{BMFHCVt^P}Ee6akXVq4#EUJbWAO?Pc0o)%1D57mJ)2Ox%
zFscOrEP-1IjPb`2bA&<LV5SjfK)6l?)T!LG7+j}=Uzj-CV5U*0Gj5s>Zl26dhr-p<
z;r>E}Gj3}nOAHVLUm3vO52TLg|MAcLzX~El3=jjW$pA0)-M$00nX`4NN<3=?=nW_e
p#$_5mQ(&NuVu;0~xB;pJ`~nAnw!uszctGe!K+!;k82D2LJ^-9-R>%MV

literal 0
HcmV?d00001

diff --git a/pages/popup/popup.html b/pages/popup/popup.html
index 68ead10..85744f7 100644
--- a/pages/popup/popup.html
+++ b/pages/popup/popup.html
@@ -1,6 +1,6 @@
 <div
   id="bid-toggle-container"
-  style="position: fixed; bottom: 20px; left: 20px; z-index: 9999"
+  style="position: fixed; bottom: 100px; right: 20px; z-index: 9999"
 >
   <button
     id="toggle-bid-extension"
@@ -80,7 +80,6 @@
       <g></g>
       <g></g>
     </svg>
-    
   </button>
 </div>
 
@@ -90,8 +89,8 @@
   style="
     display: none;
     position: fixed;
-    bottom: 90px;
-    left: 20px;
+    bottom: 170px;
+    right: 20px;
     z-index: 9999;
     background-color: #1e1e1e;
     border-radius: 12px;