Skip to content

Commit

Permalink
Code structure refactorization part 1
Browse files Browse the repository at this point in the history
  • Loading branch information
Oksydan committed Oct 23, 2023
1 parent 338bc1a commit bdfbe4d
Show file tree
Hide file tree
Showing 93 changed files with 132 additions and 131 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import useEvent from '../../components/event/useEvent';
import useEvent from '../../../utils/event/useEvent';
import editAddressHandler from './handler/address/editAddressHandler';
import changeAddressHandler from './handler/address/changeAddressHandler';
import changeDeliveryMethodHandler from './handler/delivery/changeDeliveryMethodHandler';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import { getAllSiblingsBeforeElement, getAllSiblingsAfterElement } from '../../../utils/DOMSelectorsHelper';
import { getAllSiblingsBeforeElement, getAllSiblingsAfterElement } from '../../../../utils/DOM/DOMSelectorsHelper';

/**
* A utility function to control checkout steps in Prestashop.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import prestashop from 'prestashop';
import useToggleDisplay from '../../../../components/display/useToggleDisplay';
import useToggleDisplay from '../../../../../utils/display/useToggleDisplay';
import switchEditAddressButtonColor from '../../utils/switchEditAddressButtonColor';
import getEditAddress from '../../utils/getEditAddress';
import switchConfirmAddressesButtonState from '../../utils/switchConfirmAddressesButtonState';
import { isElementVisible, each } from '../../../../utils/DOMHelpers';
import { isElementVisible, each } from '../../../../../utils/DOM/DOMHelpers';

/**
* Handles the change event for address selection in the Prestashop checkout process.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import prestashop from 'prestashop';
import useToggleDisplay from '../../../../components/display/useToggleDisplay';
import useToggleDisplay from '../../../../../utils/display/useToggleDisplay';
import switchConfirmAddressesButtonState from '../../utils/switchConfirmAddressesButtonState';
import switchEditAddressButtonColor from '../../utils/switchEditAddressButtonColor';
import { isElementVisible } from '../../../../utils/DOMHelpers';
import { isElementVisible } from '../../../../../utils/DOM/DOMHelpers';
import getEditAddress from '../../utils/getEditAddress';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import prestashop from 'prestashop';
import { formSerializeArray, fromSerializeObject } from '../../../../utils/formSerialize';
import { formSerializeArray, fromSerializeObject } from '../../../../../utils/formSerialize';
import selectDeliveryMethodRequest from '../../request/selectDeliveryMethodRequest';
import parseToHtml from '../../../../utils/parseToHtml';
import refreshCheckoutPage from '../../utils/refreshCheckoutPage';
import { each } from '../../../../utils/DOMHelpers';
import { each, parseToHtml } from '../../../../../utils/DOM/DOMHelpers';

/**
* Handles the change of delivery method in the Prestashop checkout process.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import getSelectedPaymentOption from '../../utils/getSelectedPaymentOption';
import canProceedOrder from '../../utils/canProceedOrder';
import checkCartStillOrderableRequest from '../../request/checkCartStillOrderableRequest';
import toggleOrderConfirmationButtonState from '../../utils/toggleOrderConfirmationButtonState';
import { each } from '../../../../utils/DOMHelpers';
import { each } from '../../../../../utils/DOM/DOMHelpers';

const showNativeFormErrors = () => {
const { termsCheckboxSelector } = prestashop.selectors.checkout;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import prestashop from 'prestashop';
import useToggleDisplay from '../../../../components/display/useToggleDisplay';
import useToggleDisplay from '../../../../../utils/display/useToggleDisplay';
import canProceedOrder from '../../utils/canProceedOrder';
import toggleOrderConfirmationButtonState from '../../utils/toggleOrderConfirmationButtonState';
import { each } from '../../../../utils/DOMHelpers';
import { each } from '../../../../../utils/DOM/DOMHelpers';

const { toggle } = useToggleDisplay();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import collapseAllPaymentOptions from '../../utils/collapseAllPaymentOptions';
import getSelectedPaymentOption from '../../utils/getSelectedPaymentOption';
import useToggleDisplay from '../../../../components/display/useToggleDisplay';
import useToggleDisplay from '../../../../../utils/display/useToggleDisplay';
import canProceedOrder from '../../utils/canProceedOrder';
import toggleOrderConfirmationButtonState from '../../utils/toggleOrderConfirmationButtonState';
import { each } from '../../../../utils/DOMHelpers';
import { each } from '../../../../../utils/DOM/DOMHelpers';

const { show } = useToggleDisplay();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import { each } from '../../../../utils/DOMHelpers';
import { each } from '../../../../../utils/DOM/DOMHelpers';

/**
* Handles the submission of the checkout form, disables submit buttons, and emits a 'submitCheckoutForm' event.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import DOMReady from '../../utils/DOMReady';
import { DOMReady } from '../../../utils/DOM/DOMHelpers';

import checkoutController from './checkoutController';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import useDefaultHttpRequest from '../../../components/http/useDefaultHttpRequest';
import useDefaultHttpRequest from '../../../../utils/http/useDefaultHttpRequest';

/**
* Represents the server response from a check cart still orderable request.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import useDefaultHttpRequest from '../../../components/http/useDefaultHttpRequest';
import useDefaultHttpRequest from '../../../../utils/http/useDefaultHttpRequest';

/**
* Represents the server response from a select delivery method request.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import { each } from '../../../utils/DOMHelpers';
import { each } from '../../../../utils/DOM/DOMHelpers';

/**
* Checks if all conditions are accepted.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import prestashop from 'prestashop';
import { each } from '../../../utils/DOMHelpers';
import useToggleDisplay from '../../../components/display/useToggleDisplay';
import { each } from '../../../../utils/DOM/DOMHelpers';
import useToggleDisplay from '../../../../utils/display/useToggleDisplay';

/**
* Collapses all payment options' additional information blocks and options forms.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { each } from '../../../utils/DOMHelpers';
import { each } from '../../../../utils/DOM/DOMHelpers';

/**
* Switches the state of the confirm addresses button.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { each } from '../../../utils/DOMHelpers';
import { each } from '../../../../utils/DOM/DOMHelpers';

/**
* Changes the color of the edit button for the wrong address.
Expand Down
9 changes: 4 additions & 5 deletions _dev/js/checkout/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import prestashop from 'prestashop';
import useEvent from '../theme/components/event/useEvent';
import parseToHtml from '../theme/utils/parseToHtml';
import useHttpRequest from '../theme/components/http/useHttpRequest';
import { each } from '../theme/utils/DOMHelpers';
import DOMReady from '../theme/utils/DOMReady';
import useEvent from '../utils/event/useEvent';
import { parseToHtml, each, DOMReady } from '../utils/DOM/DOMHelpers';
import useHttpRequest from '../utils/http/useHttpRequest';
import './core/checkout/index';

const { on } = useEvent();

Expand Down
2 changes: 1 addition & 1 deletion _dev/js/listing/components/filters/Filters.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import prestashop from 'prestashop';
import FiltersRangeSliders from './FiltersRangeSliders';
import useEvent from '../../../theme/components/event/useEvent';
import useEvent from '../../../utils/event/useEvent';

class Filters {
constructor() {
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/listing/components/filters/FiltersRangeSliders.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import RangeSlider from './RangeSlider';
import { each } from '../../../theme/utils/DOMHelpers';
import { each } from '../../../utils/DOM/DOMHelpers';

class FiltersRangeSliders {
static init() {
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/listing/components/filters/RangeSlider.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import prestashop from 'prestashop';
import noUiSlider from 'nouislider';
import wNumb from 'wnumb';
import FiltersUrlHandler from './FiltersUrlHandler';
import useEvent from '../../../theme/components/event/useEvent';
import useEvent from '../../../utils/event/useEvent';

class RangeSlider {
constructor(element) {
Expand Down
6 changes: 2 additions & 4 deletions _dev/js/listing/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import prestashop from 'prestashop';
import Filters from '@js/listing/components/filters/Filters';
import parseToHtml from '../theme/utils/parseToHtml';
import { each } from '../theme/utils/DOMHelpers';
import DOMReady from '../theme/utils/DOMReady';
import Filters from './components/filters/Filters';
import { each, parseToHtml, DOMReady } from '../utils/DOM/DOMHelpers';

function updateProductListDOM(data) {
each(prestashop.selectors.listing.searchFilters, (el) => {
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/product/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ProductGallery from './components/ProductGallery';
import DOMReady from '../theme/utils/DOMReady';
import { DOMReady } from '../utils/DOM/DOMHelpers';

DOMReady(() => {
const gallery = new ProductGallery();
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/components/customer/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DOMReady from '../../utils/DOMReady';
import { DOMReady } from '../../../utils/DOM/DOMHelpers';

const initCustomerLinksTriggerActive = () => {
const url = window.location.pathname;
Expand Down
4 changes: 2 additions & 2 deletions _dev/js/theme/components/dynamic-bootstrap-components.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import DOMReady from '../utils/DOMReady';
import useBootstrapComponentDynamicImport from '../utils/dynamicImports/useBootstrapComponentDynamicImport';
import { DOMReady } from '../../utils/DOM/DOMHelpers';
import useBootstrapComponentDynamicImport from '../../utils/dynamicImports/useBootstrapComponentDynamicImport';

DOMReady(() => {
const { init: initDynamicImportForModal } = useBootstrapComponentDynamicImport(
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/components/header/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DOMReady from '../../utils/DOMReady';
import { DOMReady } from '../../../utils/DOM/DOMHelpers';
import useTopMenu from './useTopMenu';
import useStickyElement from '../useStickyElement';

Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/components/header/useTopMenu.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import useEvent from '../event/useEvent';
import useEvent from '../../../utils/event/useEvent';

const useTopMenu = (selector) => {
const { on, off } = useEvent();
Expand Down
4 changes: 1 addition & 3 deletions _dev/js/theme/components/product.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import prestashop from 'prestashop';
import useCustomQuantityInput from './useCustomQuantityInput';
import { each } from '../utils/DOMHelpers';
import parseToHtml from '../utils/parseToHtml';
import DOMReady from '../utils/DOMReady';
import { each, parseToHtml, DOMReady } from '../../utils/DOM/DOMHelpers';
import productEventContextSelector from '../core/product/utils/productEventContextSelector';

DOMReady(() => {
Expand Down
3 changes: 1 addition & 2 deletions _dev/js/theme/components/quickview.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import prestashop from 'prestashop';
import DOMReady from '../utils/DOMReady';
import parseToHtml from '../utils/parseToHtml';
import { DOMReady, parseToHtml } from '../../utils/DOM/DOMHelpers';

/**
* Handle open quick view
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/components/responsive.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import DOMReady from '../utils/DOMReady';
import { DOMReady } from '../../utils/DOM/DOMHelpers';

function isMobile() {
return prestashop.responsive.current_width < prestashop.responsive.min_width;
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/components/sliders/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import DOMReady from '../../utils/DOMReady';
import { DOMReady } from '../../../utils/DOM/DOMHelpers';
import PageSlider from './PageSlider';
import SwiperSlider from './SwiperSlider';

Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/components/useAlertToast.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import parseToHtml from '@js/theme/utils/parseToHtml';
import { parseToHtml } from '../../utils/DOM/DOMHelpers';

let id = 0;

Expand Down
12 changes: 9 additions & 3 deletions _dev/js/theme/components/usePageLoader.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
/**
* A utility module for managing the page loader state.
*
* @return {showLoader, hideLoader}
* @module usePageLoader
* @returns {Object} An object with methods to show and hide the page loader.
* @property {Function} showLoader - Displays the page loader.
* @property {Function} hideLoader - Hides the page loader.
* @example
* // Usage example:
* const pageLoader = usePageLoader();
* pageLoader.showLoader(); // Display the page loader
* pageLoader.hideLoader(); // Hide the page loader
Expand All @@ -14,7 +18,8 @@ const usePageLoader = () => {
/**
* Show the page loader.
*
* @method showLoader
* @function
* @name showLoader
* @returns {void}
*/
const showLoader = () => {
Expand All @@ -24,7 +29,8 @@ const usePageLoader = () => {
/**
* Hide the page loader.
*
* @method hideLoader
* @function
* @name hideLoader
* @returns {void}
*/
const hideLoader = () => {
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/components/useStickyElement.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import debounce from '../utils/debounce';
import debounce from '../../utils/debounce';

/**
* Returns sticky element data
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/components/useThemeForm.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { each } from '../utils/DOMHelpers';
import { each } from '../../utils/DOM/DOMHelpers';

const supportedValidity = () => {
const input = document.createElement('input');
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/core/address/addressController.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import useEvent from '../../components/event/useEvent';
import useEvent from '../../../utils/event/useEvent';
import changeAddressCountryHandler from './handler/changeAddressCountryHandler';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import parseToHtml from '../../../utils/parseToHtml';
import { parseToHtml } from '../../../../utils/DOM/DOMHelpers';
import updateAddressRequest from '../request/updateAddressRequest';

/**
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/core/address/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import addressController from './addressController';
import DOMReady from '../../utils/DOMReady';
import { DOMReady } from '../../../utils/DOM/DOMHelpers';

const { init } = addressController();

Expand Down
8 changes: 4 additions & 4 deletions _dev/js/theme/core/address/request/updateAddressRequest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import useHttpRequest from '../../../components/http/useHttpRequest';
import useHttpController from '../../../components/http/useHttpController';
import useHttpPayloadDefinition from '../../../components/http/useHttpPayloadDefinition';
import GenericHttpRequestError from '../../../components/http/error/GenericHttpRequestError';
import useHttpRequest from '../../../../utils/http/useHttpRequest';
import useHttpController from '../../../../utils/http/useHttpController';
import useHttpPayloadDefinition from '../../../../utils/http/useHttpPayloadDefinition';
import GenericHttpRequestError from '../../../../utils/http/error/GenericHttpRequestError';

/**
* @typedef {Object} ServerResponse
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/core/cart/cartController.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import useEvent from '../../components/event/useEvent';
import useEvent from '../../../utils/event/useEvent';
import submitVoucherHandler from './handler/voucher/submitVoucherHandler';
import codeLinkSubmitHandler from './handler/voucher/codeLinkSubmitHandler';
import deleteVoucherHandler from './handler/voucher/deleteVoucherHandler';
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/core/cart/handler/cart/addToCartHandler.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import prestashop from 'prestashop';
import useAlertToast from '../../../../components/useAlertToast';
import addToCartRequest from '../../request/cart/addToCartRequest';
import sprintf from '../../../../utils/sprintf';
import sprintf from '../../../../../utils/sprintf';

const { danger } = useAlertToast();

Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/core/cart/handler/cart/updateCartHandler.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import parseToHtml from '../../../../utils/parseToHtml';
import { parseToHtml } from '../../../../../utils/DOM/DOMHelpers';
import updateCartContentRequest from '../../request/cart/updateCartContentRequest';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import prestashop from 'prestashop';
import addVoucherToCartRequest from '../../request/voucher/addVoucherToCartRequest';
import parseToHtml from '../../../../utils/parseToHtml';
import { parseToHtml } from '../../../../../utils/DOM/DOMHelpers';

/**
* Handles the submission of a voucher form and updates the cart accordingly.
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/theme/core/cart/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import prestashop from 'prestashop';
import DOMReady from '../../utils/DOMReady';
import { DOMReady } from '../../../utils/DOM/DOMHelpers';
import cartController from './cartController';

prestashop.cart = prestashop.cart || {};
Expand Down
4 changes: 2 additions & 2 deletions _dev/js/theme/core/cart/request/cart/addToCartRequest.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import prestashop from 'prestashop';
import useDefaultHttpRequest from '../../../../components/http/useDefaultHttpRequest';
import useHttpPayloadDefinition from '../../../../components/http/useHttpPayloadDefinition';
import useDefaultHttpRequest from '../../../../../utils/http/useDefaultHttpRequest';
import useHttpPayloadDefinition from '../../../../../utils/http/useHttpPayloadDefinition';

/**
* @typedef {object} ServerResponse
Expand Down
4 changes: 2 additions & 2 deletions _dev/js/theme/core/cart/request/cart/deleteFromCartRequest.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import prestashop from 'prestashop';
import useDefaultHttpRequest from '../../../../components/http/useDefaultHttpRequest';
import useHttpPayloadDefinition from '../../../../components/http/useHttpPayloadDefinition';
import useDefaultHttpRequest from '../../../../../utils/http/useDefaultHttpRequest';
import useHttpPayloadDefinition from '../../../../../utils/http/useHttpPayloadDefinition';

/**
* @typedef {object} ServerResponse
Expand Down
4 changes: 2 additions & 2 deletions _dev/js/theme/core/cart/request/cart/quantityChangeRequest.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import prestashop from 'prestashop';
import useDefaultHttpRequest from '../../../../components/http/useDefaultHttpRequest';
import useHttpPayloadDefinition from '../../../../components/http/useHttpPayloadDefinition';
import useDefaultHttpRequest from '../../../../../utils/http/useDefaultHttpRequest';
import useHttpPayloadDefinition from '../../../../../utils/http/useHttpPayloadDefinition';

/**
* @typedef {object} ServerResponse
Expand Down
Loading

0 comments on commit bdfbe4d

Please sign in to comment.