From 0a8f7afe3e09f53e3ac186630006cd05de0bdfb0 Mon Sep 17 00:00:00 2001 From: Jaroslav Drzik Date: Tue, 19 Mar 2024 19:21:52 +0100 Subject: [PATCH] Redesign with toolbar --- .DS_Store | Bin 6148 -> 8196 bytes .../Controllers/ProductsCompareController.php | 2 +- lang/id.json | 9 +- package.json | 13 +- resources/js/Layouts/GuestLayout.vue | 200 +++++++++++++++++- resources/js/Pages/IkeaRoot.vue | 151 ++++--------- resources/js/settingsStore.js | 13 ++ vite.config.js | 3 + 8 files changed, 264 insertions(+), 127 deletions(-) create mode 100644 resources/js/settingsStore.js diff --git a/.DS_Store b/.DS_Store index e50c26ae36fa4f3dfdee34ee8b557567e3228a92..3782fed3d8bfcbc2bd5618c818b5cd538f98a79e 100644 GIT binary patch literal 8196 zcmeHMYitx%6u#fIv@>>qp%y5}X16XvgT-#4AP>Q%EiVB<+R|+)uDd(ac3?VFcV@Rd zQd443d?XrQiSY;V`ID&8h%xy3W#TKEhC~vHQ4;-S;^PlS)N|*~Hc%-3vLSJ9Gxywc z&OPVOIrE*ld#8*sv=sCv#%dX3GF_Z%Rn%RjaXr7TXi^}lBnq-;%w-#pwZoDS{&gggNPBd^*u&Kt}}?<_yA|Ay^r~2?hS@ zWEbWx8G>aRyRZ`Lv2kxl*o@_q7i=!|h(iE4VG0{9ev=kkf2woXPGnjp4Lb z)9Tn>#LI#G02kk2J)NtX}4i zSB{J*^6Yry+TG~`)}ZY?$^)RcLGadK(*-}?KSrZT5?M<0E$8I+d8)op?Tqp0f`p(jtR&b5o2Kh3JMjLq~SJiyAokQG>yT{18 zMB~YX2vj*aV{UX|{nBN(-;vz7_3qtcGqqXOYK=Olt7y7r)-pPWP2C&l&bT?l)=j&= zhcaz@W}j)~m04&|I_%7#F;-nWZ~jdSB9V!+OI}iita*RI^bTopSr%*5MdFI~w%n`J zP3~}X?oszOk-ErYS>DU#t$BlbAy$_}8Wb%fces=w;i6G(QZ!fTI6!a^rp@X~S<{tH zE0Z-WAzH1jm9=e3S5ZVRgf;4&vXaUz;ihYXw6=Amt> zi$uD)e1onVIz=$Qc3yR4TV#id=UCDBMi^m>*ecriI#?go+fnv7JHg&!r`h}L zb9RQEW9Qk=>;n6PU1Wcu3@WOz01L4cjYyygYp@pUupZmcflll}76)L#h64{HcmSg~ ziihw7p2Sml8qeb;yo^`z8cyOJoWi^K7@y)Ze1R`<4nN`-{EFZ3CobY|iAhybjWk=D zBh^by(lTkev`N}5?UK5stkf?Jh)ASTt?esC7RdJ#y;iLS?-J>StJhj|^Omi5sVlDg zTKi@OudW+wX3v=$yJbmZ^Qv_l#xW=$TSDoj==TACS(*5N_dzictfCCnXeU*Kad5I~ z)GB%9%42+X-OXxLn?^Mw*hPzpt)O}l?5z#as3uXF3O3OcRkboILdCaT(LgK$X7w6X z)ykHR>SQaoXt>lImm;CQAzb44PVrSWR>?ig+yMPK*K|>VvxDCw&>P^@}z}}7> z1nd-guot~B&<_*)3FaP(IEX_yj0bTH592rs_Q-nJaOpXTrqQ0PlIZIV>L1sdh}xK9_mDpyyq zB8hC;R~?owDM&trtxT*{%g_HCC;$FGg?AJ#6=opJz*J`d wEoSH75M&0a0V?GN60ShpzOnE-^JIP*Lq>+lHayZiOc0|$rZa4g=b6I{01`?Py8r+H diff --git a/app/Http/Controllers/ProductsCompareController.php b/app/Http/Controllers/ProductsCompareController.php index cb23096..2f292fa 100644 --- a/app/Http/Controllers/ProductsCompareController.php +++ b/app/Http/Controllers/ProductsCompareController.php @@ -51,7 +51,7 @@ class ProductsCompareController extends Controller Log::info("ONLINE {codes} {countries}", ["codes" => $codes, "countries" => $countries, "online" => $online]); $products = $this->countryCompareController->compare($countries, $cHash, $codes); } else { - $products = IkeaProducts::whereIn("code", $aCodes); + $products = IkeaProducts::whereIn("itemNoGlobal", $aCodes); if (count($countries)) $products->whereIn("country", $countries); $products = $products->get(); } diff --git a/lang/id.json b/lang/id.json index 62220aa..e263fb9 100644 --- a/lang/id.json +++ b/lang/id.json @@ -126,5 +126,12 @@ "typeerror: invalid assignment to const 'response'": "TypeError: invalid assignment to const 'response'", "error: request aborted": "Error: Request aborted", "typeerror: can't access property \"code\", form.country is null": "TypeError: can't access property \"code\", form.country is null", - "error: request failed with status code 504": "Error: Request failed with status code 504" + "error: request failed with status code 504": "Error: Request failed with status code 504", + "referenceerror: geoip is not defined": "ReferenceError: geoip is not defined", + "referenceerror: ccodes is not defined": "ReferenceError: ccodes is not defined", + "referenceerror: items is not defined": "ReferenceError: items is not defined", + "referenceerror: settings is not defined": "ReferenceError: settings is not defined", + "referenceerror: currencyhash is not defined": "ReferenceError: currencyHash is not defined", + "typeerror: can't access property \"code\", (intermediate value).country.country is undefined": "TypeError: can't access property \"code\", (intermediate value).country.country is undefined", + "typeerror: can't access property \"code\", (intermediate value).country[0] is undefined": "TypeError: can't access property \"code\", (intermediate value).country[0] is undefined" } \ No newline at end of file diff --git a/package.json b/package.json index 073ada0..ea7afe9 100644 --- a/package.json +++ b/package.json @@ -17,24 +17,27 @@ "lodash": "^4.17.19", "postcss": "^8.4.14", "tailwindcss": "^3.1.0", - "vite": "^2.9.11", - "vue": "^3.4.15" + "vite": "^2.9.11" }, "dependencies": { "@coreui/vue": "^4.10.2", "@vueform/multiselect": "^2.5.1", + "flag-icons": "^7.2.0", "flowbite": "^2.1.1", - "flowbite-vue": "^0.1.3", + "flowbite-vue": "github:skjaro/flowbite-vue", "laravel-echo": "^1.13.0", "pusher-js": "^7.3.0", "sweetalert2": "^11.4.23", "vee-validate": "^4.12.4", + "vue": "3.3.x", "vue-google-charts": "^1.1.0", "vue-multiselect": "^3.0.0-beta.3", - "vue3-easy-data-table": "^1.5.47", "vue3-multiselect-checkboxed": "^0.0.9", "vue3-popper": "^1.5.0", "vuedraggable": "^4.1.0", "yup": "^1.3.3" - } + }, + "bundleDependencies": [ + "flowbite-vue" + ] } diff --git a/resources/js/Layouts/GuestLayout.vue b/resources/js/Layouts/GuestLayout.vue index e15b945..9a55b3f 100644 --- a/resources/js/Layouts/GuestLayout.vue +++ b/resources/js/Layouts/GuestLayout.vue @@ -1,9 +1,7 @@ - +