diff --git a/.DS_Store b/.DS_Store index b168a04..e50c26a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/package.json b/package.json index ab333db..bf8c9ae 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,10 @@ "vue": "^3.4.15" }, "dependencies": { + "@coreui/vue": "^4.10.2", "@vueform/multiselect": "^2.5.1", "flowbite": "^2.1.1", - "flowbite-vue": "^0.1.0", + "flowbite-vue": "file:///Users/jaro/Devel/flowbite-vue", "laravel-echo": "^1.13.0", "pusher-js": "^7.3.0", "sweetalert2": "^11.4.23", diff --git a/resources/.DS_Store b/resources/.DS_Store index dee0e3e..1fb743e 100644 Binary files a/resources/.DS_Store and b/resources/.DS_Store differ diff --git a/resources/js/.DS_Store b/resources/js/.DS_Store index c328838..809f381 100644 Binary files a/resources/js/.DS_Store and b/resources/js/.DS_Store differ diff --git a/resources/js/Layouts/GuestLayout.vue b/resources/js/Layouts/GuestLayout.vue index adfbe17..e15b945 100644 --- a/resources/js/Layouts/GuestLayout.vue +++ b/resources/js/Layouts/GuestLayout.vue @@ -3,12 +3,14 @@ import Swal from 'sweetalert2'; import { getCurrentInstance, ref, onMounted, onUnmounted, nextTick, computed } from 'vue'; import { FwbDropdown, FwbListGroup, FwbListGroupItem } from 'flowbite-vue'; import LogoIkea from '@/assets/Ikea_logo.svg'; +import UserOptions from './UserOptions.vue'; import { FwbSelect, FwbNavbar, FwbNavbarCollapse, FwbNavbarLink, FwbNavbarLogo, + FwbButton, } from 'flowbite-vue'; const menu = ref([]) @@ -43,6 +45,10 @@ onMounted(fetch_menu); + +
- \ No newline at end of file + diff --git a/resources/js/Layouts/MegaMenu.vue b/resources/js/Layouts/MegaMenu.vue new file mode 100644 index 0000000..cc7b2f4 --- /dev/null +++ b/resources/js/Layouts/MegaMenu.vue @@ -0,0 +1,212 @@ + diff --git a/resources/js/Layouts/UserOptions.vue b/resources/js/Layouts/UserOptions.vue new file mode 100644 index 0000000..b312a72 --- /dev/null +++ b/resources/js/Layouts/UserOptions.vue @@ -0,0 +1,20 @@ + diff --git a/resources/js/Pages/IkeaRoot.vue b/resources/js/Pages/IkeaRoot.vue index 1b3137a..03060f3 100644 --- a/resources/js/Pages/IkeaRoot.vue +++ b/resources/js/Pages/IkeaRoot.vue @@ -25,7 +25,7 @@ import Popper from "vue3-popper"; const screenWidth = ref(screen.width) const screenHeight = ref(screen.height) -const hover = ref(false); +const hover = ref(true); const hoverImage = ref(null); const sdropdown = ref([ @@ -334,7 +334,7 @@ const async_search = async () => { img: i.mainImageUrl, code: i.code, url: i.url, - price: i.salesPrice, + price: parseFloat(i.salesPrice), units: i.priceUnit, descLong: i.mainImageAlt, }; @@ -438,8 +438,32 @@ watch(ccodes, (codes) => {