Basic search

This commit is contained in:
2023-12-25 17:23:45 +01:00
parent 3cfa2e3513
commit 4375ac1fc8
7 changed files with 161 additions and 50 deletions

View File

@@ -22,6 +22,10 @@ class CountryCodeController extends Controller
return CountryCode::active("Y"); return CountryCode::active("Y");
} }
public function codes()
{
return CountryCode::countryHash();
}
/** /**
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *

View File

@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Client\Pool; use Illuminate\Http\Client\Pool;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use PhpParser\Node\Expr\Cast\String_;
class IkeaProductsController extends Controller class IkeaProductsController extends Controller
{ {

View File

@@ -0,0 +1,43 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\IkeaProducts;
use Illuminate\Http\Client\Pool;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log;
use App\Models\CountryCode;
use Inertia\Inertia;
class ProductsCompareController extends Controller
{
public function compare(Request $request)
{
$codes = $request->input("codes");
$countries = $request->input("countries");
Log::info("{codes} {countries}", ["codes" => $codes, "countries" => $countries]);
$codes = collect($codes);
// $countries = collect(json_decode($countries, true));
if ($countries != null && count($countries)) {
$hCountry = CountryCode::countryHash();
$countries = $countries->map(function ($country) {
return $hCountry[$country];
});
}
// $aCodes = $codes->map(function ($code) {
// return $code['code'];
// });
$aCodes = $codes['code'];
$products = IkeaProducts::where("code", $aCodes)->get();
Log::info("{products}", ["products" => $products]);
return Inertia::render('IkeaRoot', [
'products' => $products
]);
}
}

View File

@@ -33,4 +33,12 @@ class CountryCode extends Model
{ {
return $this->where('status', $status)->get(); return $this->where('status', $status)->get();
} }
protected function countryHash()
{
$codes = $this->select('country_name', 'country_code')->get();
return $codes->mapWithKeys(function ($item) {
return [$item['country_name'] => $item['country_code']];
});
}
} }

View File

@@ -32,4 +32,9 @@ class IkeaProducts extends Model
return []; return [];
} }
} }
protected function multisearch($codes, $countries) {
//$countries = $
// return $this->where('code',$codes)->where('country',$countries);
}
} }

View File

@@ -1,5 +1,5 @@
<script setup> <script setup>
import { getCurrentInstance, ref, onMounted, onUnmounted, nextTick } from 'vue'; import { getCurrentInstance, ref, onMounted, onUnmounted, nextTick, computed } from 'vue';
import Swal from 'sweetalert2'; import Swal from 'sweetalert2';
import LogoIkea from '@/assets/Ikea_logo.svg'; import LogoIkea from '@/assets/Ikea_logo.svg';
import Multiselect from 'vue-multiselect'; import Multiselect from 'vue-multiselect';
@@ -8,18 +8,36 @@ import { FwbDropdown, FwbListGroup, FwbListGroupItem } from 'flowbite-vue';
import EasyTable from "vue3-easy-data-table"; import EasyTable from "vue3-easy-data-table";
import SearchInput from '@/Components/SearchInput.vue'; import SearchInput from '@/Components/SearchInput.vue';
//import autocomplete from '@trevoreyre/autocomplete-vue'; //import autocomplete from '@trevoreyre/autocomplete-vue';
import { import {
FwbNavbar, FwbNavbar,
FwbNavbarCollapse, FwbNavbarCollapse,
FwbNavbarLink, FwbNavbarLink,
FwbNavbarLogo, FwbNavbarLogo,
} from 'flowbite-vue'; } from 'flowbite-vue';
import { useForm } from '@inertiajs/inertia-vue3'
import axios from 'axios'; import axios from 'axios';
import IkeaLogo from './Ikea/IkeaLogo.vue'; import IkeaLogo from './Ikea/IkeaLogo.vue';
const type = 'GeoChart';
const props = defineProps({
products: {
type: Object,
default: []
},
})
let tproducts = computed(() => {
return props.products.map((prod) => {
prod.salesPrice = parseFloat(prod.salesPrice);
return prod;
} )
})
const type = 'GeoChart';
const form = useForm({
countries: '',
codes: '',
});
const ccountry = ref([]); const ccountry = ref([]);
const ccountry_filter = ref([['Country'],]); const ccountry_filter = ref([['Country'],]);
const ccountry_list = ref(['TEST']); const ccountry_list = ref(['TEST']);
@@ -30,6 +48,13 @@ const hrates = ref([
{ text: "Country", value: "country_name", sortable: true }, { text: "Country", value: "country_name", sortable: true },
{ text: "Rate", value: "rate", sortable: true } { text: "Rate", value: "rate", sortable: true }
]); ]);
// { "country": "AT", "code": "50161321", "url": "https://www.ikea.com/at/de/p/hol-aufbewahrungstisch-akazie-50161321/", "name": "HOL", "typeName": "Aufbewahrungstisch", "mainImageUrl": "https://www.ikea.com/at/de/images/products/hol-aufbewahrungstisch-akazie__0104310_pe251255_s5.jpg", "itemNoGlobal": "50161321", "salesPrice": "80.99", "tag": "FAMILY_PRICE", "last_mod": "2023-12-03 16:44:24" },
const hproducts = ref([
{ text: "Country", value:"country", sortable: true},
{ text: "Name", value:"name", sortable: true},
{ text: "Price", value:"salesPrice", sortable: true}
]);
const rates = ref([]); const rates = ref([]);
const options_items = ref([]); const options_items = ref([]);
const selected_item = ref(null); const selected_item = ref(null);
@@ -102,7 +127,7 @@ const async_search = async (item) => {
try { try {
if (item.length > 4) { if (item.length > 4) {
const response = await axios.get(route('products.search', item)); const response = await axios.get(route('products.search', item));
options_items.value = response.data.map((i) => { return { "item": i.name, "desc": i.typeName, "img": i.mainImageUrl } }); options_items.value = response.data.map((i) => { return { "item": i.name, "desc": i.typeName, "img": i.mainImageUrl, "code": i.code } });
console.log("VALUES=", options_items.value); console.log("VALUES=", options_items.value);
} }
} catch (e) { } catch (e) {
@@ -139,6 +164,10 @@ function selectCountry(item, id) {
onMounted(fetch); onMounted(fetch);
onMounted(fetch_rates); onMounted(fetch_rates);
const submit = () => {
form.post(route('products.compare'));
};
</script> </script>
<template> <template>
@@ -172,11 +201,12 @@ onMounted(fetch_rates);
:settings="chart_settings" /> :settings="chart_settings" />
</div> </div>
<div class="mr-auto"> <div class="mr-auto">
<form @submit.prevent="submit">
<div class="flex flex-col start-0"> <div class="flex flex-col start-0">
<span class="font-extrabold font-mono">Zadaj krajiny v ktorych chces vyhadavat</span> <span class="font-extrabold font-mono">Zadaj krajiny v ktorych chces vyhadavat</span>
</div> </div>
<div> <div>
<multiselect :close-on-select="false" :multiple="true" v-model="selected" :options="ccountry_list" <multiselect :close-on-select="false" :multiple="true" v-model="form.countries" :options="ccountry_list"
@select="selectCountry" @remove="selectCountry"> @select="selectCountry" @remove="selectCountry">
</multiselect> </multiselect>
</div> </div>
@@ -184,13 +214,30 @@ onMounted(fetch_rates);
<span class="font-extrabold font-mono">Zadaj polozku</span> <span class="font-extrabold font-mono">Zadaj polozku</span>
</div> </div>
<div> <div>
<multiselect v-model="selected_item" label="item" track-by="item" :custom-label="customLabel" placeholder="Find item" :searchable="true" :options="options_items" @search-change="async_search"/> <multiselect v-model="form.codes" label="item" track-by="item" :custom-label="customLabel"
placeholder="Find item" :searchable="true" :options="options_items" @search-change="async_search" />
</div>
<div class="text-end mt-2">
<button type="submit"
class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
:disabled="form.processing" :class="{ 'opacity-25': form.processing }">
Search
</button>
</div>
</form>
<div class="mt-5">
<EasyTable :rows-per-page=10 :headers="headers" :items="items" alternating></EasyTable>
</div> </div>
<div class="mt-5"> <div class="mt-5">
<EasyTable :rows-per-page=10 :headers="headers" :items="items"></EasyTable> <EasyTable :rows-per-page=15 :headers="hrates" :items="rates" alternating></EasyTable>
</div> </div>
<div class="mt-5"> </div>
<EasyTable :rows-per-page=15 :headers="hrates" :items="rates"></EasyTable> <div>
<div class="flex flex-col start-0">
<span class="font-extrabold font-mono">Vysledky vyhladavania</span>
</div>
<div>
<EasyTable :rows-per-page=15 :headers="hproducts" :items="tproducts" alternating></EasyTable>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -6,6 +6,9 @@ use App\Http\Controllers\CountryCodeController;
use App\Http\Controllers\CountryCompareController; use App\Http\Controllers\CountryCompareController;
use App\Http\Controllers\CurrencyRatesController; use App\Http\Controllers\CurrencyRatesController;
use App\Http\Controllers\IkeaProductsController; use App\Http\Controllers\IkeaProductsController;
use App\Http\Controllers\ProductsCompareController;
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Web Routes | Web Routes
@@ -22,11 +25,12 @@ Route::get('/', function () {
})->name('root'); })->name('root');
Route::get('/ccountry/', [CountryCodeController::class, 'index'])->name('ccountry.index'); Route::get('/ccountry/', [CountryCodeController::class, 'index'])->name('ccountry.index');
Route::get('/ccountry/codes/', [CountryCodeController::class, 'codes'])->name('ccountry.codes');
Route::get('/ccountry/active/', [CountryCodeController::class, 'active'])->name('ccountry.active'); Route::get('/ccountry/active/', [CountryCodeController::class, 'active'])->name('ccountry.active');
Route::get('/search/{id}',[CountryCompareController::class,'search'])->name('ccompare.search'); Route::get('/search/{id}',[CountryCompareController::class,'search'])->name('ccompare.search');
Route::get('/rates/', [CurrencyRatesController::class, 'index'])->name('rates.index'); Route::get('/rates/', [CurrencyRatesController::class, 'index'])->name('rates.index');
Route::get('/products/{item}', [IkeaProductsController::class, 'search'])->name('products.search'); Route::get('/products/{item}', [IkeaProductsController::class, 'search'])->name('products.search');
Route::post('/products/compare/', [ProductsCompareController::class, 'compare'])->name('products.compare');
Route::middleware(['auth:sanctum', config('jetstream.auth_session'), 'verified'])->group(function () { Route::middleware(['auth:sanctum', config('jetstream.auth_session'), 'verified'])->group(function () {
// Route::get('/', function () { // Route::get('/', function () {