diff --git a/client-app/public/static/images/errors/403.webp b/client-app/assets/images/403.webp similarity index 100% rename from client-app/public/static/images/errors/403.webp rename to client-app/assets/images/403.webp diff --git a/client-app/public/static/images/errors/404.webp b/client-app/assets/images/404.webp similarity index 100% rename from client-app/public/static/images/errors/404.webp rename to client-app/assets/images/404.webp diff --git a/client-app/public/static/images/errors/500.webp b/client-app/assets/images/500.webp similarity index 100% rename from client-app/public/static/images/errors/500.webp rename to client-app/assets/images/500.webp diff --git a/client-app/public/static/images/blocked/image.webp b/client-app/assets/images/blocked.webp similarity index 100% rename from client-app/public/static/images/blocked/image.webp rename to client-app/assets/images/blocked.webp diff --git a/client-app/public/static/icons/payment-methods/credit-card.svg b/client-app/assets/images/credit-card.svg similarity index 100% rename from client-app/public/static/icons/payment-methods/credit-card.svg rename to client-app/assets/images/credit-card.svg diff --git a/client-app/public/static/images/bulk-order/documents-example.webp b/client-app/assets/images/documents-example.webp similarity index 100% rename from client-app/public/static/images/bulk-order/documents-example.webp rename to client-app/assets/images/documents-example.webp diff --git a/client-app/public/static/images/email.webp b/client-app/assets/images/email.webp similarity index 100% rename from client-app/public/static/images/email.webp rename to client-app/assets/images/email.webp diff --git a/client-app/public/static/images/illustrations/emails.webp b/client-app/assets/images/emails.webp similarity index 100% rename from client-app/public/static/images/illustrations/emails.webp rename to client-app/assets/images/emails.webp diff --git a/client-app/public/static/images/errors/emptyCart.webp b/client-app/assets/images/emptyCart.webp similarity index 100% rename from client-app/public/static/images/errors/emptyCart.webp rename to client-app/assets/images/emptyCart.webp diff --git a/client-app/public/static/images/errors/emptyCartMobile.webp b/client-app/assets/images/emptyCartMobile.webp similarity index 100% rename from client-app/public/static/images/errors/emptyCartMobile.webp rename to client-app/assets/images/emptyCartMobile.webp diff --git a/client-app/public/static/images/errors/emptyCompareList.webp b/client-app/assets/images/emptyCompareList.webp similarity index 100% rename from client-app/public/static/images/errors/emptyCompareList.webp rename to client-app/assets/images/emptyCompareList.webp diff --git a/client-app/public/static/images/errors/emptyCompareListMobile.webp b/client-app/assets/images/emptyCompareListMobile.webp similarity index 100% rename from client-app/public/static/images/errors/emptyCompareListMobile.webp rename to client-app/assets/images/emptyCompareListMobile.webp diff --git a/client-app/public/static/images/demo-landing/feat-1.svg b/client-app/assets/images/feat-1.svg similarity index 100% rename from client-app/public/static/images/demo-landing/feat-1.svg rename to client-app/assets/images/feat-1.svg diff --git a/client-app/public/static/images/demo-landing/feat-2.svg b/client-app/assets/images/feat-2.svg similarity index 100% rename from client-app/public/static/images/demo-landing/feat-2.svg rename to client-app/assets/images/feat-2.svg diff --git a/client-app/public/static/images/demo-landing/feat-3.svg b/client-app/assets/images/feat-3.svg similarity index 100% rename from client-app/public/static/images/demo-landing/feat-3.svg rename to client-app/assets/images/feat-3.svg diff --git a/client-app/public/static/icons/file/application/msword.svg b/client-app/assets/images/file-application-msword.svg similarity index 100% rename from client-app/public/static/icons/file/application/msword.svg rename to client-app/assets/images/file-application-msword.svg diff --git a/client-app/public/static/icons/file/application/pdf.svg b/client-app/assets/images/file-application-pdf.svg similarity index 100% rename from client-app/public/static/icons/file/application/pdf.svg rename to client-app/assets/images/file-application-pdf.svg diff --git a/client-app/public/static/icons/file/application/vnd.ms-excel.svg b/client-app/assets/images/file-application-vnd.ms-excel.svg similarity index 100% rename from client-app/public/static/icons/file/application/vnd.ms-excel.svg rename to client-app/assets/images/file-application-vnd.ms-excel.svg diff --git a/client-app/public/static/icons/file/application/zip.svg b/client-app/assets/images/file-application-zip.svg similarity index 100% rename from client-app/public/static/icons/file/application/zip.svg rename to client-app/assets/images/file-application-zip.svg diff --git a/client-app/public/static/icons/file/error.svg b/client-app/assets/images/file-error.svg similarity index 100% rename from client-app/public/static/icons/file/error.svg rename to client-app/assets/images/file-error.svg diff --git a/client-app/public/static/icons/file/file.svg b/client-app/assets/images/file-file.svg similarity index 100% rename from client-app/public/static/icons/file/file.svg rename to client-app/assets/images/file-file.svg diff --git a/client-app/public/static/icons/file/image/jpeg.svg b/client-app/assets/images/file-image-jpeg.svg similarity index 100% rename from client-app/public/static/icons/file/image/jpeg.svg rename to client-app/assets/images/file-image-jpeg.svg diff --git a/client-app/public/static/icons/file/image/png.svg b/client-app/assets/images/file-image-png.svg similarity index 100% rename from client-app/public/static/icons/file/image/png.svg rename to client-app/assets/images/file-image-png.svg diff --git a/client-app/public/static/images/sign-in/google.webp b/client-app/assets/images/google.webp similarity index 100% rename from client-app/public/static/images/sign-in/google.webp rename to client-app/assets/images/google.webp diff --git a/client-app/public/static/images/home/hexa-1.webp b/client-app/assets/images/hexa-1.webp similarity index 100% rename from client-app/public/static/images/home/hexa-1.webp rename to client-app/assets/images/hexa-1.webp diff --git a/client-app/public/static/images/home/hexa-2.webp b/client-app/assets/images/hexa-2.webp similarity index 100% rename from client-app/public/static/images/home/hexa-2.webp rename to client-app/assets/images/hexa-2.webp diff --git a/client-app/public/static/images/home/hexa-3.webp b/client-app/assets/images/hexa-3.webp similarity index 100% rename from client-app/public/static/images/home/hexa-3.webp rename to client-app/assets/images/hexa-3.webp diff --git a/client-app/public/static/images/home/hexa-4.webp b/client-app/assets/images/hexa-4.webp similarity index 100% rename from client-app/public/static/images/home/hexa-4.webp rename to client-app/assets/images/hexa-4.webp diff --git a/client-app/public/static/images/common/logo-white.svg b/client-app/assets/images/logo-white.svg similarity index 100% rename from client-app/public/static/images/common/logo-white.svg rename to client-app/assets/images/logo-white.svg diff --git a/client-app/public/static/images/common/logo.svg b/client-app/assets/images/logo.svg similarity index 100% rename from client-app/public/static/images/common/logo.svg rename to client-app/assets/images/logo.svg diff --git a/client-app/public/static/images/payment/methods/maestro.svg b/client-app/assets/images/maestro.svg similarity index 100% rename from client-app/public/static/images/payment/methods/maestro.svg rename to client-app/assets/images/maestro.svg diff --git a/client-app/public/static/images/home/main-banner.webp b/client-app/assets/images/main-banner.webp similarity index 100% rename from client-app/public/static/images/home/main-banner.webp rename to client-app/assets/images/main-banner.webp diff --git a/client-app/public/static/images/payment/methods/mastercard.svg b/client-app/assets/images/mastercard.svg similarity index 100% rename from client-app/public/static/images/payment/methods/mastercard.svg rename to client-app/assets/images/mastercard.svg diff --git a/client-app/public/static/images/sign-in/ms.svg b/client-app/assets/images/ms.svg similarity index 100% rename from client-app/public/static/images/sign-in/ms.svg rename to client-app/assets/images/ms.svg diff --git a/client-app/public/static/images/common/no-image.svg b/client-app/assets/images/no-image.svg similarity index 100% rename from client-app/public/static/images/common/no-image.svg rename to client-app/assets/images/no-image.svg diff --git a/client-app/public/static/images/demo-landing/note.webp b/client-app/assets/images/note.webp similarity index 100% rename from client-app/public/static/images/demo-landing/note.webp rename to client-app/assets/images/note.webp diff --git a/client-app/public/static/images/order-completed.webp b/client-app/assets/images/order-completed.webp similarity index 100% rename from client-app/public/static/images/order-completed.webp rename to client-app/assets/images/order-completed.webp diff --git a/client-app/public/static/images/order-payment-failed.webp b/client-app/assets/images/order-payment-failed.webp similarity index 100% rename from client-app/public/static/images/order-payment-failed.webp rename to client-app/assets/images/order-payment-failed.webp diff --git a/client-app/public/static/images/order-payment-successful.webp b/client-app/assets/images/order-payment-successful.webp similarity index 100% rename from client-app/public/static/images/order-payment-successful.webp rename to client-app/assets/images/order-payment-successful.webp diff --git a/client-app/public/static/images/payment/paysafecard.webp b/client-app/assets/images/paysafecard.webp similarity index 100% rename from client-app/public/static/images/payment/paysafecard.webp rename to client-app/assets/images/paysafecard.webp diff --git a/client-app/public/static/images/product/product-1.webp b/client-app/assets/images/product-example-1.webp similarity index 100% rename from client-app/public/static/images/product/product-1.webp rename to client-app/assets/images/product-example-1.webp diff --git a/client-app/public/static/images/product/product-2.webp b/client-app/assets/images/product-example-2.webp similarity index 100% rename from client-app/public/static/images/product/product-2.webp rename to client-app/assets/images/product-example-2.webp diff --git a/client-app/public/static/images/product/product-3.webp b/client-app/assets/images/product-example-3.webp similarity index 100% rename from client-app/public/static/images/product/product-3.webp rename to client-app/assets/images/product-example-3.webp diff --git a/client-app/public/static/images/product/product-4.webp b/client-app/assets/images/product-example-4.webp similarity index 100% rename from client-app/public/static/images/product/product-4.webp rename to client-app/assets/images/product-example-4.webp diff --git a/client-app/public/static/images/product/product-5.webp b/client-app/assets/images/product-example-5.webp similarity index 100% rename from client-app/public/static/images/product/product-5.webp rename to client-app/assets/images/product-example-5.webp diff --git a/client-app/public/static/icons/payment-methods/purchase-order.svg b/client-app/assets/images/purchase-order.svg similarity index 100% rename from client-app/public/static/icons/payment-methods/purchase-order.svg rename to client-app/assets/images/purchase-order.svg diff --git a/client-app/public/static/images/account/roles/org-employee.svg b/client-app/assets/images/role-org-employee.svg similarity index 100% rename from client-app/public/static/images/account/roles/org-employee.svg rename to client-app/assets/images/role-org-employee.svg diff --git a/client-app/public/static/images/account/roles/org-maintainer.svg b/client-app/assets/images/role-org-maintainer.svg similarity index 100% rename from client-app/public/static/images/account/roles/org-maintainer.svg rename to client-app/assets/images/role-org-maintainer.svg diff --git a/client-app/public/static/images/account/roles/purchasing-agent.svg b/client-app/assets/images/role-purchasing-agent.svg similarity index 100% rename from client-app/public/static/images/account/roles/purchasing-agent.svg rename to client-app/assets/images/role-purchasing-agent.svg diff --git a/client-app/public/static/images/account/roles/store-admin.svg b/client-app/assets/images/role-store-admin.svg similarity index 100% rename from client-app/public/static/images/account/roles/store-admin.svg rename to client-app/assets/images/role-store-admin.svg diff --git a/client-app/public/static/images/account/roles/store-manager.svg b/client-app/assets/images/role-store-manager.svg similarity index 100% rename from client-app/public/static/images/account/roles/store-manager.svg rename to client-app/assets/images/role-store-manager.svg diff --git a/client-app/public/static/icons/placeholders/select-payment.svg b/client-app/assets/images/select-payment.svg similarity index 100% rename from client-app/public/static/icons/placeholders/select-payment.svg rename to client-app/assets/images/select-payment.svg diff --git a/client-app/public/static/icons/placeholders/select-shipping.svg b/client-app/assets/images/select-shipping.svg similarity index 100% rename from client-app/public/static/icons/placeholders/select-shipping.svg rename to client-app/assets/images/select-shipping.svg diff --git a/client-app/public/static/images/sign-in/sign-in-page-image.webp b/client-app/assets/images/sign-in-page-image.webp similarity index 100% rename from client-app/public/static/images/sign-in/sign-in-page-image.webp rename to client-app/assets/images/sign-in-page-image.webp diff --git a/client-app/public/static/images/sign-up/image.webp b/client-app/assets/images/sign-up-page-image.webp similarity index 100% rename from client-app/public/static/images/sign-up/image.webp rename to client-app/assets/images/sign-up-page-image.webp diff --git a/client-app/public/static/images/home/slide-1.webp b/client-app/assets/images/slide-1.webp similarity index 100% rename from client-app/public/static/images/home/slide-1.webp rename to client-app/assets/images/slide-1.webp diff --git a/client-app/public/static/images/home/slide-2.webp b/client-app/assets/images/slide-2.webp similarity index 100% rename from client-app/public/static/images/home/slide-2.webp rename to client-app/assets/images/slide-2.webp diff --git a/client-app/public/static/icons/social/facebook-icon.svg b/client-app/assets/images/social-facebook-icon.svg similarity index 100% rename from client-app/public/static/icons/social/facebook-icon.svg rename to client-app/assets/images/social-facebook-icon.svg diff --git a/client-app/public/static/icons/social/pinterest-icon.svg b/client-app/assets/images/social-pinterest-icon.svg similarity index 100% rename from client-app/public/static/icons/social/pinterest-icon.svg rename to client-app/assets/images/social-pinterest-icon.svg diff --git a/client-app/public/static/icons/social/telegram-icon.svg b/client-app/assets/images/social-telegram-icon.svg similarity index 100% rename from client-app/public/static/icons/social/telegram-icon.svg rename to client-app/assets/images/social-telegram-icon.svg diff --git a/client-app/public/static/icons/social/twitter-icon.svg b/client-app/assets/images/social-twitter-icon.svg similarity index 100% rename from client-app/public/static/icons/social/twitter-icon.svg rename to client-app/assets/images/social-twitter-icon.svg diff --git a/client-app/public/static/images/dashboard/spend-chart.svg b/client-app/assets/images/spend-chart.svg similarity index 100% rename from client-app/public/static/images/dashboard/spend-chart.svg rename to client-app/assets/images/spend-chart.svg diff --git a/client-app/public/static/icons/contact-active.svg b/client-app/assets/images/status-active.svg similarity index 100% rename from client-app/public/static/icons/contact-active.svg rename to client-app/assets/images/status-active.svg diff --git a/client-app/public/static/icons/contact-blocked.svg b/client-app/assets/images/status-blocked.svg similarity index 100% rename from client-app/public/static/icons/contact-blocked.svg rename to client-app/assets/images/status-blocked.svg diff --git a/client-app/public/static/icons/contact-inactive.svg b/client-app/assets/images/status-inactive.svg similarity index 100% rename from client-app/public/static/icons/contact-inactive.svg rename to client-app/assets/images/status-inactive.svg diff --git a/client-app/public/static/icons/contact-invited.svg b/client-app/assets/images/status-invited.svg similarity index 100% rename from client-app/public/static/icons/contact-invited.svg rename to client-app/assets/images/status-invited.svg diff --git a/client-app/public/static/images/payment/methods/visa.svg b/client-app/assets/images/visa.svg similarity index 100% rename from client-app/public/static/images/payment/methods/visa.svg rename to client-app/assets/images/visa.svg diff --git a/client-app/config/settings_data.json b/client-app/config/settings_data.json index b1057c8a51..32f2fc5905 100644 --- a/client-app/config/settings_data.json +++ b/client-app/config/settings_data.json @@ -34,10 +34,10 @@ "default_return_url": "/", - "logo_image": "/static/images/common/logo.svg", - "logo_inverted_image": "/static/images/common/logo-white.svg", + "logo_image": "logo.svg", + "logo_inverted_image": "logo-white.svg", "favicon_image": "/static/icons/favicon-32x32.png", - "homepage_background_image": "/static/images/home/main-banner.webp", + "homepage_background_image": "main-banner.webp", "image_thumbnails_enabled": true, "image_thumbnails_original_fallback_enabled": true, @@ -123,22 +123,22 @@ "social_sharing_services": [ { "name": "Facebook", - "icon": "/static/icons/social/facebook-icon.svg", + "icon": "social-facebook-icon.svg", "url_template": "https://www.facebook.com/sharer.php?u={0}" }, { "name": "Twitter", - "icon": "/static/icons/social/twitter-icon.svg", + "icon": "social-twitter-icon.svg", "url_template": "https://twitter.com/share?url={0}" }, { "name": "Pinterest", - "icon": "/static/icons/social/pinterest-icon.svg", + "icon": "social-pinterest-icon.svg", "url_template": "https://pinterest.com/pin/create/bookmarklet/?url={0}" }, { "name": "Telegram", - "icon": "/static/icons/social/telegram-icon.svg", + "icon": "social-telegram-icon.svg", "url_template": "https://t.me/share/url?url={0}" } ], diff --git a/client-app/core/constants/images.ts b/client-app/core/constants/images.ts index 496b922391..f71887ecd0 100644 --- a/client-app/core/constants/images.ts +++ b/client-app/core/constants/images.ts @@ -1 +1 @@ -export const NO_IMAGE_URL = "/static/images/common/no-image.svg"; +export const NO_IMAGE_URL = "no-image.svg"; diff --git a/client-app/modules/purchase-requests/components/from-file.vue b/client-app/modules/purchase-requests/components/from-file.vue index 990196926d..21d35fda8b 100644 --- a/client-app/modules/purchase-requests/components/from-file.vue +++ b/client-app/modules/purchase-requests/components/from-file.vue @@ -5,33 +5,39 @@

{{ $t("purchase_request.from_file.processing.message") }}

+ + + diff --git a/client-app/pages/404.vue b/client-app/pages/404.vue index 7021c2f63a..fe18bf936d 100644 --- a/client-app/pages/404.vue +++ b/client-app/pages/404.vue @@ -19,7 +19,7 @@ diff --git a/client-app/pages/500.vue b/client-app/pages/500.vue index 40e9797924..b18c2eb648 100644 --- a/client-app/pages/500.vue +++ b/client-app/pages/500.vue @@ -19,7 +19,7 @@ diff --git a/client-app/pages/account/checkout-defaults.vue b/client-app/pages/account/checkout-defaults.vue index b14f11ee2e..a85061ee5f 100644 --- a/client-app/pages/account/checkout-defaults.vue +++ b/client-app/pages/account/checkout-defaults.vue @@ -39,7 +39,7 @@ {{ $t("common.placeholders.select_payment_method") }} @@ -82,7 +82,7 @@ {{ $t("common.placeholders.select_delivery_method") }} diff --git a/client-app/pages/account/dashboard.vue b/client-app/pages/account/dashboard.vue index 909ab41f0b..ad941641df 100644 --- a/client-app/pages/account/dashboard.vue +++ b/client-app/pages/account/dashboard.vue @@ -29,7 +29,7 @@