From fbe8bb8dfd73c319967307f2274e329bc2690157 Mon Sep 17 00:00:00 2001 From: Alexander Devitsky Date: Fri, 18 Feb 2022 15:15:30 +0200 Subject: [PATCH] feat: asset Optimization --- .../src/api/storeConfig/storeConfig.ts | 1 + .../src/getters/storeConfigGetters.ts | 10 + packages/theme/components/AddToWishlist.vue | 15 +- packages/theme/components/AppHeader.vue | 49 +-- .../theme/components/BottomNavigation.vue | 85 ++-- packages/theme/components/CartSidebar.vue | 10 +- .../theme/components/CurrencySelector.vue | 6 +- .../theme/components/General/IconSprite.vue | 362 ++++++++++++++++++ .../theme/components/General/SvgImage.vue | 57 +++ .../components/Header/SearchBar/SearchBar.vue | 23 +- .../Header/SearchBar/SearchResults.vue | 10 +- packages/theme/components/HeaderLogo.vue | 64 ++++ packages/theme/components/Notification.vue | 15 +- .../theme/components/ProductsCarousel.vue | 36 ++ packages/theme/components/WishlistSidebar.vue | 28 +- packages/theme/lang/de.js | 8 + packages/theme/lang/en.js | 8 + packages/theme/layouts/default.vue | 6 +- packages/theme/pages/Category.vue | 48 ++- packages/theme/pages/Home.vue | 46 +++ .../pages/MyAccount/AddressesDetails.vue | 27 +- packages/theme/pages/MyAccount/MyWishlist.vue | 40 +- packages/theme/pages/Product.vue | 17 +- packages/theme/static/error/error.svg | 16 - packages/theme/static/icons/empty-cart.svg | 1 - packages/theme/static/icons/logo.svg | 4 - 26 files changed, 814 insertions(+), 178 deletions(-) create mode 100644 packages/theme/components/General/IconSprite.vue create mode 100644 packages/theme/components/General/SvgImage.vue create mode 100644 packages/theme/components/HeaderLogo.vue delete mode 100644 packages/theme/static/error/error.svg delete mode 100644 packages/theme/static/icons/empty-cart.svg delete mode 100644 packages/theme/static/icons/logo.svg diff --git a/packages/api-client/src/api/storeConfig/storeConfig.ts b/packages/api-client/src/api/storeConfig/storeConfig.ts index 6e0b9166a..f1c5e03b4 100644 --- a/packages/api-client/src/api/storeConfig/storeConfig.ts +++ b/packages/api-client/src/api/storeConfig/storeConfig.ts @@ -7,6 +7,7 @@ export default gql` allow_items, allow_order, base_currency_code, + base_media_url, catalog_default_sort_by, category_fixed_product_tax_display_setting, cms_home_page, diff --git a/packages/composables/src/getters/storeConfigGetters.ts b/packages/composables/src/getters/storeConfigGetters.ts index 9256211c4..4f9a5bdea 100644 --- a/packages/composables/src/getters/storeConfigGetters.ts +++ b/packages/composables/src/getters/storeConfigGetters.ts @@ -7,6 +7,11 @@ const getCurrency = (config: StoreConfig) => config.default_display_currency_cod const getLocale = (config: StoreConfig) => config.locale; const allowGuestProductReview = (config: StoreConfig) => config.allow_guests_to_write_product_reviews; const enabledWishlist = (config: StoreConfig) => config.magento_wishlist_general_is_enabled; +const getBaseMediaUrl = (config: StoreConfig) => config.base_media_url; +const getLogoSrc = (config: StoreConfig) => config.header_logo_src; +const getLogoWidth = (config: StoreConfig) => config.logo_width; +const getLogoHeight = (config: StoreConfig) => config.logo_height; +const getLogoAlt = (config: StoreConfig) => config.logo_alt; const storeConfigGetters = { getCode, @@ -16,6 +21,11 @@ const storeConfigGetters = { getLocale, allowGuestProductReview, enabledWishlist, + getBaseMediaUrl, + getLogoSrc, + getLogoWidth, + getLogoHeight, + getLogoAlt, }; export default storeConfigGetters; diff --git a/packages/theme/components/AddToWishlist.vue b/packages/theme/components/AddToWishlist.vue index 64bfad06f..f7137a114 100644 --- a/packages/theme/components/AddToWishlist.vue +++ b/packages/theme/components/AddToWishlist.vue @@ -5,12 +5,11 @@ class="add-to-wishlist" @click="$emit('addToWishlist')" > - {{ $t(actionText) }} @@ -20,13 +19,14 @@ diff --git a/packages/theme/components/General/SvgImage.vue b/packages/theme/components/General/SvgImage.vue new file mode 100644 index 000000000..5abf9b214 --- /dev/null +++ b/packages/theme/components/General/SvgImage.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/packages/theme/components/Header/SearchBar/SearchBar.vue b/packages/theme/components/Header/SearchBar/SearchBar.vue index 36c9395e4..fd590adc3 100644 --- a/packages/theme/components/Header/SearchBar/SearchBar.vue +++ b/packages/theme/components/Header/SearchBar/SearchBar.vue @@ -20,10 +20,11 @@ @click="closeSearch" > - @@ -35,10 +36,11 @@ @keydown.tab="hideSearch" > - @@ -47,13 +49,10 @@ diff --git a/packages/theme/components/Notification.vue b/packages/theme/components/Notification.vue index cc6993bca..24a8a9756 100644 --- a/packages/theme/components/Notification.vue +++ b/packages/theme/components/Notification.vue @@ -14,13 +14,11 @@ @click:close="notification.dismiss" @click:action="notification.action && notification.action.onClick()" > - @@ -29,14 +27,15 @@