@evershop/evershop 1.0.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/build/client/index.js +1 -1
- package/bin/build/complie.js +1 -1
- package/bin/build/index.js +25 -1
- package/bin/build/server/index.js +1 -1
- package/bin/build/server/useDDL.js +1 -1
- package/bin/dev/index.js +2 -1
- package/bin/evershop +8 -7
- package/bin/extension/index.js +3 -3
- package/bin/install/index.js +1 -1
- package/bin/lib/addDefaultMiddlewareFuncs.js +9 -4
- package/bin/lib/app.js +1 -1
- package/bin/lib/bootstrap/migrate.js +1 -1
- package/bin/lib/buildEntry.js +16 -1
- package/bin/lib/onError.js +1 -1
- package/bin/lib/onListening.js +7 -4
- package/bin/lib/startUp.js +16 -9
- package/bin/lib/watch/watchComponents.js +16 -26
- package/bin/lib/watch/watchMF.js +1 -1
- package/bin/lib/watch/watchMR.js +1 -1
- package/bin/lib/watch/watchSchema.js +1 -1
- package/bin/user/changePassword.js +1 -1
- package/bin/user/create.js +1 -1
- package/package.json +10 -2
- package/src/components/admin/catalog/productEdit/category/CategoryItem.jsx +3 -8
- package/src/components/admin/catalog/productEdit/category/CategoryTree.jsx +15 -8
- package/src/components/admin/catalog/productEdit/category/CategoryTree.scss +10 -0
- package/src/components/admin/catalog/productEdit/variants/CreateVariant.jsx +2 -2
- package/src/components/admin/catalog/productEdit/variants/CreateVariantGroup.jsx +4 -9
- package/src/components/admin/catalog/productEdit/variants/EditVariant.jsx +1 -1
- package/src/components/admin/catalog/productEdit/variants/New.jsx +2 -2
- package/src/components/admin/catalog/productEdit/variants/Search.jsx +1 -1
- package/src/components/admin/catalog/productEdit/variants/SearchModal.jsx +1 -1
- package/src/components/admin/catalog/productEdit/variants/Variant.jsx +1 -1
- package/src/components/admin/catalog/productEdit/variants/VariantModal.jsx +68 -12
- package/src/components/admin/catalog/productEdit/variants/Variants.jsx +1 -1
- package/src/components/admin/catalog/productGrid/rows/ThumbnailRow.jsx +1 -1
- package/src/components/admin/checkout/shippingSetting/Method.jsx +130 -0
- package/src/components/admin/{oms → checkout}/shippingSetting/MethodForm.jsx +127 -16
- package/src/components/admin/{oms → checkout}/shippingSetting/Methods.jsx +5 -5
- package/src/components/admin/checkout/shippingSetting/PriceBasedPrice.jsx +101 -0
- package/src/components/admin/checkout/shippingSetting/WeightBasedPrice.jsx +101 -0
- package/src/components/admin/{oms → checkout}/shippingSetting/Zone.jsx +40 -10
- package/src/components/admin/{oms → checkout}/shippingSetting/ZoneForm.jsx +1 -1
- package/src/components/admin/{oms → checkout}/shippingSetting/Zones.jsx +6 -3
- package/src/components/admin/cms/Card.jsx +3 -3
- package/src/components/admin/cms/PageHeading.jsx +3 -3
- package/src/components/admin/cms/widget/WidgetTypes.jsx +28 -0
- package/src/components/admin/cms/widget/grid/WidgetTypeRow.jsx +29 -0
- package/src/components/admin/oms/orderEdit/items/ItemVariantOptions.jsx +1 -1
- package/src/components/admin/oms/orderEdit/items/Name.jsx +1 -1
- package/src/components/admin/oms/orderGrid/headers/OrderDateColumnHeader.jsx +1 -1
- package/src/components/admin/promotion/couponEdit/AttributeGroupSelector.jsx +8 -8
- package/src/components/admin/promotion/couponEdit/BuyXGetY.jsx +2 -2
- package/src/components/admin/promotion/couponEdit/CategorySelector.jsx +10 -10
- package/src/components/admin/promotion/couponEdit/CollectionSelector.jsx +8 -8
- package/src/components/admin/promotion/couponEdit/ProductSkuSelector.jsx +30 -9
- package/src/components/admin/promotion/couponEdit/RequireProducts.jsx +2 -2
- package/src/components/admin/promotion/couponEdit/Setting.jsx +1 -1
- package/src/components/admin/promotion/couponEdit/TargetProducts.jsx +4 -4
- package/src/components/admin/tax/taxSetting/Rate.jsx +6 -6
- package/src/components/admin/tax/taxSetting/RateForm.jsx +5 -5
- package/src/components/admin/tax/taxSetting/Rates.jsx +6 -6
- package/src/components/admin/tax/taxSetting/TaxClass.jsx +3 -3
- package/src/components/admin/tax/taxSetting/TaxClassForm.jsx +1 -1
- package/src/components/admin/widgets/BasicMenuSetting.jsx +614 -0
- package/src/components/admin/widgets/BasicMenuSetting.scss +19 -0
- package/src/components/admin/widgets/CollectionProductsSetting.jsx +203 -0
- package/src/components/admin/widgets/TextBlockSetting.jsx +70 -0
- package/src/components/common/Area.jsx +31 -8
- package/src/components/common/Badge.jsx +1 -1
- package/src/components/common/Editor.jsx +191 -0
- package/src/components/common/Notification.scss +1 -0
- package/src/components/common/SimplePagination.jsx +2 -2
- package/src/components/common/context/checkout.jsx +8 -14
- package/src/components/common/form/Field.jsx +1 -1
- package/src/components/common/form/Form.jsx +1 -1
- package/src/components/common/form/fields/Checkbox.jsx +1 -1
- package/src/components/common/form/fields/Ckeditor.jsx +11 -11
- package/src/components/common/form/fields/Editor.jsx +326 -0
- package/src/components/common/form/fields/Editor.scss +29 -0
- package/src/components/common/form/fields/Input.jsx +2 -1
- package/src/components/common/form/fields/Radio.jsx +1 -1
- package/src/components/common/form/fields/editor/FileBrowser.jsx +419 -0
- package/src/components/common/form/fields/editor/FileBrowser.scss +37 -0
- package/src/components/common/form/fields/editor/GetColumnClasses.jsx +14 -0
- package/src/components/common/form/fields/editor/GetRowClasses.jsx +18 -0
- package/src/components/common/form/fields/editor/RowTemplates.jsx +154 -0
- package/src/components/common/form/validator.js +6 -2
- package/src/components/common/grid/Pagination.jsx +4 -4
- package/src/components/common/grid/headers/Dummy.jsx +1 -1
- package/src/components/common/grid/headers/FromTo.jsx +1 -1
- package/src/components/common/grid/headers/Sortable.jsx +148 -0
- package/src/components/common/grid/rows/StatusRow.jsx +1 -1
- package/src/components/common/grid/rows/ThumbnailRow.jsx +1 -1
- package/src/components/common/list/Filter.jsx +83 -0
- package/src/components/common/list/Filter.scss +39 -0
- package/src/components/common/modal/Alert.jsx +1 -1
- package/src/components/common/modal/Modal.jsx +1 -1
- package/src/components/frontStore/catalog/categoryView/filter/AttributeFilter.jsx +21 -7
- package/src/components/frontStore/catalog/categoryView/filter/CategoryFilter.jsx +61 -53
- package/src/components/frontStore/catalog/categoryView/filter/CategoryFilter.scss +5 -0
- package/src/components/frontStore/catalog/categoryView/filter/PriceFilter.jsx +20 -11
- package/src/components/frontStore/catalog/product/list/List.jsx +4 -4
- package/src/components/frontStore/catalog/product/list/Pagination.jsx +1 -1
- package/src/components/frontStore/catalog/product/list/SortOptions.jsx +4 -2
- package/src/components/frontStore/catalog/product/list/Sorting.jsx +7 -7
- package/src/components/frontStore/catalog/product/list/item/Name.jsx +1 -1
- package/src/components/frontStore/checkout/cart/Empty.jsx +3 -3
- package/src/components/frontStore/checkout/cart/items/ItemOptions.jsx +1 -1
- package/src/components/frontStore/checkout/cart/items/ItemVariantOptions.jsx +1 -1
- package/src/components/frontStore/checkout/cart/items/Items.jsx +20 -21
- package/src/components/frontStore/checkout/cart/items/Items.scss +47 -0
- package/src/components/frontStore/checkout/cart/items/Quantity.jsx +154 -0
- package/src/components/frontStore/checkout/checkout/StepTitle.jsx +1 -1
- package/src/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.jsx +13 -10
- package/src/components/frontStore/checkout/checkout/shipment/StepContent.jsx +1 -1
- package/src/components/frontStore/checkout/checkout/summary/Cart.jsx +10 -12
- package/src/components/frontStore/checkout/checkout/summary/Items.jsx +9 -9
- package/src/components/frontStore/checkout/checkout/summary/cart/Total.jsx +6 -6
- package/src/components/frontStore/checkout/success/summary/items/ItemOptions.jsx +1 -1
- package/src/components/frontStore/checkout/success/summary/items/Items.jsx +9 -6
- package/src/components/frontStore/checkout/success/summary/order/OrderSummary.jsx +9 -13
- package/src/components/frontStore/checkout/success/summary/order/Total.jsx +5 -5
- package/src/components/frontStore/customer/address/addressForm/AddressFormLoadingSkeleton.jsx +2 -2
- package/src/components/frontStore/customer/address/addressForm/NameAndTelephone.jsx +1 -1
- package/src/components/frontStore/customer/address/addressForm/ProvinceAndPostcode.jsx +1 -1
- package/src/components/frontStore/customer/checkout/Edit.jsx +2 -2
- package/src/components/frontStore/customer/detail/Order.jsx +4 -4
- package/src/components/frontStore/stripe/checkout/CheckoutForm.jsx +9 -5
- package/src/components/frontStore/stripe/checkout/TestCards.jsx +1 -1
- package/src/components/frontStore/widgets/BasicMenu.jsx +129 -0
- package/src/{modules/catalog/pages/frontStore/homepage/FeaturedProducts.jsx → components/frontStore/widgets/CollectionProducts.jsx} +40 -32
- package/src/components/frontStore/widgets/TextBlock.jsx +46 -0
- package/src/lib/componee/getComponentsByRoute.js +15 -2
- package/src/lib/event/callSubscibers.js +14 -11
- package/src/lib/event/event-manager.js +2 -2
- package/src/lib/event/loadSubscribers.js +2 -2
- package/src/lib/helpers.js +3 -1
- package/src/lib/log/CustomColorize.js +22 -0
- package/src/lib/log/logger.js +153 -19
- package/src/lib/middleware/Handler.js +2 -3
- package/src/lib/middleware/async.js +5 -9
- package/src/lib/middleware/sync.js +5 -10
- package/src/lib/middleware/tests/app/app.js +1 -1
- package/src/lib/middleware/tests/app/modules/404page/pages/frontStore/product/route.json +2 -1
- package/src/lib/middlewares/static.js +3 -1
- package/src/lib/response/render.js +5 -6
- package/src/lib/router/Router.js +1 -1
- package/src/lib/router/buildAbsoluteUrl.js +1 -1
- package/src/lib/router/loadModuleRoutes.js +3 -0
- package/src/lib/router/registerAdminRoute.js +9 -1
- package/src/lib/router/registerFrontStoreRoute.js +2 -0
- package/src/lib/router/scanForRoutes.js +1 -0
- package/src/lib/router/tests/unit/unit.validateRoute.test.js +7 -1
- package/src/lib/util/buildFilterFromUrl.js +31 -64
- package/src/lib/util/defaultPaginationFilters.js +104 -0
- package/src/lib/util/filterOperationMapp.js +16 -0
- package/src/lib/util/getEnabledWidgets.js +28 -0
- package/src/lib/util/merge.js +67 -14
- package/src/lib/util/registry.js +44 -6
- package/src/lib/util/tests/unit/util.merge.test.js +21 -4
- package/src/lib/util/validateConfiguration.js +83 -0
- package/src/lib/webpack/createBaseConfig.js +4 -1
- package/src/lib/webpack/dev/createConfigClient.js +12 -2
- package/src/lib/webpack/loaders/AreaLoader.js +15 -4
- package/src/lib/webpack/loaders/loadTranslationFromCsv.js +1 -1
- package/src/lib/webpack/plugins/Tailwindcss.js +1 -1
- package/src/lib/webpack/util/parseGraphql.js +29 -16
- package/src/lib/webpack/util/parseGraphqlByFile.js +16 -2
- package/src/modules/auth/graphql/types/AdminUser/AdminUser.admin.resolvers.js +6 -6
- package/src/modules/auth/pages/admin/adminLogin/LoginForm.jsx +55 -36
- package/src/modules/auth/pages/admin/all/AdminUser.jsx +3 -3
- package/src/modules/base/api/global/[apiResponse]apiErrorHandler.js +2 -2
- package/src/modules/base/bootstrap.js +79 -0
- package/src/modules/base/graphql/types/Route/Route.admin.graphql +15 -0
- package/src/modules/base/graphql/types/Route/Route.admin.resolvers.js +10 -0
- package/src/modules/base/pages/global/[response]errorHandler.js +2 -2
- package/src/modules/base/pages/global/response[errorHandler].js +23 -0
- package/src/modules/catalog/api/addProductToCategory/addProducts.js +1 -1
- package/src/modules/catalog/api/addProductToCollection/addProducts.js +35 -22
- package/src/modules/catalog/api/removeProductFromCollection/removeProducts.js +20 -5
- package/src/modules/catalog/bootstrap.js +188 -5
- package/src/modules/catalog/graphql/types/Attribute/Attribute.admin.graphql +2 -2
- package/src/modules/catalog/graphql/types/Attribute/Attribute.admin.resolvers.js +48 -276
- package/src/modules/catalog/graphql/types/Category/Category.graphql +19 -5
- package/src/modules/catalog/graphql/types/Category/Category.resolvers.js +36 -2
- package/src/modules/catalog/graphql/types/Collection/Collection.graphql +2 -2
- package/src/modules/catalog/graphql/types/Collection/Collection.resolvers.js +36 -2
- package/src/modules/catalog/graphql/types/Product/Attribute/ProductAttribute.resolvers.js +1 -0
- package/src/modules/catalog/graphql/types/Product/Product.graphql +1 -1
- package/src/modules/catalog/graphql/types/Product/Product.resolvers.js +35 -1
- package/src/modules/catalog/graphql/types/Product/Variant/Variant.graphql +2 -2
- package/src/modules/catalog/graphql/types/Product/Variant/Variant.resolvers.js +68 -92
- package/src/modules/catalog/graphql/types/Widget/CollectionProductsWidget/CollectionProductsWidget.graphql +11 -0
- package/src/modules/catalog/graphql/types/Widget/CollectionProductsWidget/CollectionProductsWidget.resolvers.js +8 -0
- package/src/modules/catalog/migration/Version-1.0.0.js +1 -0
- package/src/modules/catalog/migration/Version-1.0.7.js +10 -0
- package/src/modules/catalog/pages/admin/attributeEdit+attributeNew/FormContent.jsx +4 -4
- package/src/modules/catalog/pages/admin/attributeEdit+attributeNew/General.jsx +18 -14
- package/src/modules/catalog/pages/admin/attributeGrid/Grid.jsx +84 -41
- package/src/modules/catalog/pages/admin/attributeGrid/index.js +1 -1
- package/src/modules/catalog/pages/admin/categoryEdit/Products.jsx +9 -9
- package/src/modules/catalog/pages/admin/categoryEdit+categoryNew/FormContent.jsx +4 -4
- package/src/modules/catalog/pages/admin/categoryEdit+categoryNew/General.jsx +16 -18
- package/src/modules/catalog/pages/admin/categoryEdit+categoryNew/Image.jsx +1 -2
- package/src/modules/catalog/pages/admin/categoryEdit+categoryNew/Status.jsx +16 -1
- package/src/modules/catalog/pages/admin/categoryGrid/Grid.jsx +50 -18
- package/src/modules/catalog/pages/admin/categoryGrid/index.js +1 -1
- package/src/modules/catalog/pages/admin/collectionEdit/Products.jsx +9 -9
- package/src/modules/catalog/pages/admin/collectionEdit+collectionNew/FormContent.jsx +2 -2
- package/src/modules/catalog/pages/admin/collectionEdit+collectionNew/General.jsx +2 -2
- package/src/modules/catalog/pages/admin/collectionGrid/Grid.jsx +48 -7
- package/src/modules/catalog/pages/admin/collectionGrid/index.js +1 -1
- package/src/modules/catalog/pages/admin/productEdit/Collection.jsx +7 -7
- package/src/modules/catalog/pages/admin/productEdit+productNew/Attributes.jsx +29 -25
- package/src/modules/catalog/pages/admin/productEdit+productNew/CustomOptions.jsss +4 -4
- package/src/modules/catalog/pages/admin/productEdit+productNew/FormContent.jsx +4 -4
- package/src/modules/catalog/pages/admin/productEdit+productNew/General.jsx +15 -17
- package/src/modules/catalog/pages/admin/productGrid/Grid.jsx +160 -28
- package/src/modules/catalog/pages/admin/productGrid/index.js +1 -2
- package/src/modules/catalog/pages/frontStore/all/SearchBox.jsx +2 -1
- package/src/modules/catalog/pages/frontStore/catalogSearch/General.jsx +2 -2
- package/src/modules/catalog/pages/frontStore/catalogSearch/Products.jsx +1 -1
- package/src/modules/catalog/pages/frontStore/catalogSearch/[index]filters.js +4 -59
- package/src/modules/catalog/pages/frontStore/catalogSearch/index.js +11 -0
- package/src/modules/catalog/pages/frontStore/catalogSearch/route.json +2 -1
- package/src/modules/catalog/pages/frontStore/categoryView/CategoryView.jsx +19 -2
- package/src/modules/catalog/pages/frontStore/categoryView/Filter.jsx +22 -6
- package/src/modules/catalog/pages/frontStore/categoryView/Filter.scss +3 -0
- package/src/modules/catalog/pages/frontStore/categoryView/General.jsx +6 -8
- package/src/modules/catalog/pages/frontStore/categoryView/General.scss +0 -2
- package/src/modules/catalog/pages/frontStore/categoryView/Pagination.jsx +6 -0
- package/src/modules/catalog/pages/frontStore/categoryView/Products.jsx +8 -1
- package/src/modules/catalog/pages/frontStore/categoryView/[index]filters.js +5 -105
- package/src/modules/catalog/pages/frontStore/categoryView/route.json +2 -1
- package/src/modules/catalog/pages/frontStore/productView/Description.jsx +3 -3
- package/src/modules/catalog/pages/frontStore/productView/Form.jsx +12 -7
- package/src/modules/catalog/pages/frontStore/productView/Form.scss +1 -0
- package/src/modules/catalog/pages/frontStore/productView/GeneralInfo.jsx +1 -1
- package/src/modules/catalog/pages/frontStore/productView/Images.jsx +1 -1
- package/src/modules/catalog/pages/frontStore/productView/Layout.jsx +1 -1
- package/src/modules/catalog/pages/frontStore/productView/Options.jsx +2 -2
- package/src/modules/catalog/pages/frontStore/productView/Variants.jsx +106 -44
- package/src/modules/catalog/pages/frontStore/productView/route.json +2 -1
- package/src/modules/catalog/services/AttributeCollection.js +59 -0
- package/src/modules/catalog/services/AttributeGroupCollection.js +100 -0
- package/src/modules/catalog/services/CategoryCollection.js +26 -83
- package/src/modules/catalog/services/CollectionCollection.js +23 -71
- package/src/modules/catalog/services/ProductCollection.js +50 -216
- package/src/modules/catalog/services/attribute/deleteProductAttribute.js +15 -0
- package/src/modules/catalog/services/getAttributeGroupsBaseQuery.js +3 -0
- package/src/modules/catalog/services/getAttributesBaseQuery.js +3 -0
- package/src/modules/catalog/services/getCollectionsBaseQuery.js +0 -1
- package/src/modules/catalog/services/product/updateProduct.js +8 -2
- package/src/modules/catalog/services/registerCartItemProductUrlField.js +35 -0
- package/src/modules/catalog/services/registerCartItemVariantOptionsField.js +51 -0
- package/src/modules/catalog/services/registerDefaultAttributeCollectionFilters.js +149 -0
- package/src/modules/catalog/services/registerDefaultCategoryCollectionFilters.js +101 -0
- package/src/modules/catalog/services/registerDefaultCollectionCollectionFilters.js +65 -0
- package/src/modules/catalog/services/registerDefaultProductCollectionFilters.js +219 -0
- package/src/modules/catalog/subscribers/category_created/buildUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/category_deleted/deleteUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/category_updated/builUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/product_created/builUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/product_deleted/deleteUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/product_image_added/localGenerateProductImageVariant.js +3 -3
- package/src/modules/checkout/api/addCartShippingMethod/saveShippingMethod.js +6 -1
- package/src/modules/checkout/api/addShippingNote/[context]bodyParser[auth].js +5 -0
- package/src/modules/checkout/api/addShippingNote/payloadSchema.json +15 -0
- package/src/modules/checkout/api/addShippingNote/route.json +5 -0
- package/src/modules/checkout/api/addShippingNote/saveShippingNote.js +50 -0
- package/src/modules/checkout/api/createCart/[context]bodyParser[auth].js +5 -0
- package/src/modules/checkout/api/createCart/createNewCart.js +119 -0
- package/src/modules/checkout/api/createCart/payloadSchema.json +44 -0
- package/src/modules/checkout/api/createCart/route.json +5 -0
- package/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js +58 -0
- package/src/modules/checkout/api/deleteShippingZone/route.json +5 -0
- package/src/modules/checkout/api/deleteShippingZoneMethod/deleteShippingZoneMethod.js +85 -0
- package/src/modules/checkout/api/deleteShippingZoneMethod/route.json +5 -0
- package/src/modules/checkout/api/getShippingMethods/sendMethods.js +37 -0
- package/src/modules/checkout/api/updateCartItemQty/[bodyParser]updateQty.js +49 -0
- package/src/modules/checkout/api/updateCartItemQty/[context]bodyParser[auth].js +5 -0
- package/src/modules/checkout/api/updateCartItemQty/payloadSchema.json +21 -0
- package/src/modules/checkout/api/updateCartItemQty/route.json +5 -0
- package/src/modules/checkout/api/updateMineCartItemQty/[context]bodyParser[auth].js +5 -0
- package/src/modules/checkout/api/updateMineCartItemQty/[detectCurrentCart]updateQty.js +51 -0
- package/src/modules/checkout/api/updateMineCartItemQty/[getCurrentCustomer]detectCurrentCart.js +32 -0
- package/src/modules/checkout/api/updateMineCartItemQty/payloadSchema.json +21 -0
- package/src/modules/checkout/api/updateMineCartItemQty/route.json +5 -0
- package/src/modules/checkout/api/updateShippingMethod/[context]borderParser[auth].js +5 -0
- package/src/modules/checkout/api/updateShippingMethod/payloadSchema.json +12 -0
- package/src/modules/checkout/api/updateShippingMethod/route.json +5 -0
- package/src/modules/checkout/api/updateShippingMethod/updateShippingMethod.js +64 -0
- package/src/modules/checkout/api/updateShippingZoneMethod/payloadSchema.json +43 -1
- package/src/modules/checkout/api/updateShippingZoneMethod/updateShippingZoneMethod.js +17 -3
- package/src/modules/checkout/bootstrap.js +28 -1
- package/src/modules/checkout/graphql/types/Cart/Cart.graphql +22 -3
- package/src/modules/checkout/graphql/types/Cart/Cart.resolvers.js +18 -2
- package/src/modules/checkout/graphql/types/CheckoutSetting/CheckoutSetting.graphql +3 -0
- package/src/modules/checkout/graphql/types/CheckoutSetting/CheckoutSetting.resolvers.js +7 -0
- package/src/modules/checkout/graphql/types/ShippingMethod/ShippingMethod.graphql +1 -0
- package/src/modules/checkout/graphql/types/ShippingMethod/ShippingMethod.resolvers.js +4 -0
- package/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.graphql +21 -1
- package/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.resolvers.js +34 -4
- package/src/modules/checkout/graphql/types/Weight/Weight.resolvers.js +8 -11
- package/src/modules/checkout/migration/Version-1.0.0.js +14 -0
- package/src/modules/checkout/migration/Version-1.0.5.js +28 -0
- package/src/modules/checkout/migration/Version-1.0.6.js +201 -0
- package/src/modules/{oms → checkout}/pages/admin/shippingSetting/ShippingSetting.jsx +67 -44
- package/src/modules/checkout/pages/frontStore/all/[auth]addCustomerToCart.js +3 -3
- package/src/modules/checkout/pages/frontStore/all/[context]detectCurrentCart[auth].js +5 -0
- package/src/modules/checkout/pages/frontStore/cart/ShoppingCart.jsx +17 -8
- package/src/modules/checkout/pages/frontStore/cart/Summary.jsx +18 -19
- package/src/modules/checkout/pages/frontStore/cart/route.json +2 -1
- package/src/modules/checkout/pages/frontStore/checkout/Checkout.jsx +5 -5
- package/src/modules/checkout/pages/frontStore/checkout/Checkout.scss +4 -0
- package/src/modules/checkout/pages/frontStore/checkout/PaymentStep.jsx +3 -2
- package/src/modules/checkout/pages/frontStore/checkout/ShippingMethods.jsx +25 -12
- package/src/modules/checkout/pages/frontStore/checkout/ShippingNote.jsx +105 -0
- package/src/modules/checkout/pages/frontStore/checkout/Summary.jsx +14 -14
- package/src/modules/checkout/pages/frontStore/checkout/SummaryMobile.jsx +129 -0
- package/src/modules/checkout/pages/frontStore/checkout/SummaryMobile.scss +7 -0
- package/src/modules/checkout/pages/frontStore/checkout/route.json +2 -1
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/CheckoutSuccess.jsx +1 -1
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/CheckoutSuccess.scss +4 -0
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.jsx +30 -32
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/ShippingNote.jsx +47 -0
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/Summary.jsx +12 -15
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/route.json +2 -1
- package/src/modules/checkout/services/cart/Cart.js +41 -21
- package/src/modules/checkout/services/cart/DataObject.js +3 -3
- package/src/modules/checkout/services/cart/registerCartBaseFields.js +165 -41
- package/src/modules/checkout/services/cart/registerCartItemBaseFields.js +300 -373
- package/src/modules/checkout/services/toPrice.js +1 -1
- package/src/modules/checkout/tests/basicSetup.js +85 -0
- package/src/modules/checkout/tests/coupons.js +82 -0
- package/src/modules/checkout/tests/products.js +67 -0
- package/src/modules/checkout/tests/taxRates.js +3 -0
- package/src/modules/checkout/tests/unit/discountAmount.test.js +60 -0
- package/src/modules/checkout/tests/unit/grandTotal.test.js +83 -0
- package/src/modules/checkout/tests/unit/lineTotal.test.js +90 -0
- package/src/modules/checkout/tests/unit/lineTotalWithDiscount.test.js +103 -0
- package/src/modules/checkout/tests/unit/productPrice.test.js +67 -0
- package/src/modules/checkout/tests/unit/subTotal.test.js +85 -0
- package/src/modules/checkout/tests/unit/subTotalWithDiscount.test.js +117 -0
- package/src/modules/checkout/tests/unit/taxAmount.test.js +67 -0
- package/src/modules/checkout/tests/unit/taxAmountRounding.test.js +277 -0
- package/src/modules/cms/api/createWidget/[context]bodyParser[auth].js +5 -0
- package/src/modules/cms/api/createWidget/createWidget[finish].js +17 -0
- package/src/modules/cms/api/createWidget/finish[apiResponse].js +27 -0
- package/src/modules/cms/api/createWidget/payloadSchema.json +18 -0
- package/src/modules/cms/api/createWidget/route.json +5 -0
- package/src/modules/cms/api/deleteWidget/deleteWidget.js +27 -0
- package/src/modules/cms/api/deleteWidget/route.json +5 -0
- package/src/modules/cms/api/updateWidget/[context]bodyParser[auth].js +5 -0
- package/src/modules/cms/api/updateWidget/finish[apiResponse].js +27 -0
- package/src/modules/cms/api/updateWidget/payloadSchema.json +18 -0
- package/src/modules/cms/api/updateWidget/route.json +5 -0
- package/src/modules/cms/api/updateWidget/updateWidget[finish].js +17 -0
- package/src/modules/cms/bootstrap.js +239 -2
- package/src/modules/cms/graphql/types/CmsPage/CmsPage.graphql +1 -2
- package/src/modules/cms/graphql/types/CmsPage/CmsPage.resolvers.js +37 -12
- package/src/modules/cms/graphql/types/Widget/Widget.graphql +91 -0
- package/src/modules/cms/graphql/types/Widget/Widget.resolvers.js +142 -0
- package/src/modules/cms/migration/Version-1.1.0.js +22 -0
- package/src/modules/cms/migration/Version-1.1.1.js +103 -0
- package/src/modules/cms/pages/admin/adminNotFound/NotFound.jsx +4 -4
- package/src/modules/cms/pages/admin/all/CmsMenuGroup.jsx +12 -4
- package/src/modules/cms/pages/admin/all/Layout.scss +3 -2
- package/src/modules/cms/pages/admin/all/Notification.scss +1 -1
- package/src/modules/cms/pages/admin/all/SearchBox.jsx +1 -1
- package/src/modules/cms/pages/admin/all/search/NoResult.jsx +2 -2
- package/src/modules/cms/pages/admin/all/search/Results.jsx +3 -3
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/FormContent.jsx +7 -9
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/General.jsx +3 -3
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/Seo.jsx +1 -1
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/Status.jsx +40 -0
- package/src/modules/cms/pages/admin/cmsPageGrid/Grid.jsx +64 -12
- package/src/modules/cms/pages/admin/cmsPageGrid/index.js +1 -2
- package/src/modules/cms/pages/admin/dashboard/Layout.jsx +3 -3
- package/src/modules/cms/pages/admin/widgetEdit/WidgetForm.jsx +52 -0
- package/src/modules/cms/pages/admin/widgetEdit/index.js +36 -0
- package/src/modules/cms/pages/admin/widgetEdit/route.json +4 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/FormContent.jsx +69 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/FormContent.scss +7 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/General.jsx +185 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/PageHeading.jsx +37 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/Setting.jsx +55 -0
- package/src/modules/cms/pages/admin/widgetGrid/Grid.jsx +415 -0
- package/src/modules/cms/pages/admin/widgetGrid/Heading.jsx +11 -0
- package/src/modules/cms/pages/admin/widgetGrid/NewWidgetButton.jsx +52 -0
- package/src/modules/cms/pages/admin/widgetGrid/index.js +15 -0
- package/src/modules/cms/pages/admin/widgetGrid/route.json +4 -0
- package/src/modules/cms/pages/admin/widgetNew/WidgetNewForm.jsx +60 -0
- package/src/modules/cms/pages/admin/widgetNew/index.js +11 -0
- package/src/modules/cms/pages/admin/widgetNew/route.json +4 -0
- package/src/modules/cms/pages/admin/widgetNew/typeValidate.js +21 -0
- package/src/modules/cms/pages/frontStore/all/Breadcrumb.jsx +1 -1
- package/src/modules/cms/pages/frontStore/all/Footer.jsx +2 -2
- package/src/modules/cms/pages/frontStore/all/Layout.jsx +3 -3
- package/src/modules/cms/pages/frontStore/all/Layout.scss +13 -0
- package/src/modules/cms/pages/frontStore/all/Logo.jsx +2 -2
- package/src/modules/cms/pages/frontStore/all/Logo.scss +2 -4
- package/src/modules/cms/pages/frontStore/all/Notification.scss +1 -1
- package/src/modules/cms/pages/frontStore/cmsPageView/Layout.jsx +2 -2
- package/src/modules/cms/pages/frontStore/cmsPageView/View.jsx +5 -3
- package/src/modules/cms/pages/frontStore/cmsPageView/index.js +6 -12
- package/src/modules/cms/pages/frontStore/cmsPageView/route.json +2 -1
- package/src/modules/cms/pages/frontStore/homepage/route.json +2 -1
- package/src/modules/cms/pages/frontStore/notFound/NotFound.jsx +4 -4
- package/src/modules/cms/pages/frontStore/notFound/route.json +2 -1
- package/src/modules/cms/pages/frontStore/staticAsset/[context]staticAssets[auth].js +1 -1
- package/src/modules/cms/services/CMSPageCollection.js +23 -70
- package/src/modules/cms/services/WidgetCollection.js +62 -0
- package/src/modules/cms/services/getWidgetsBaseQuery.js +7 -0
- package/src/modules/cms/services/page/createPage.js +1 -2
- package/src/modules/cms/services/page/pageDataSchema.json +0 -4
- package/src/modules/cms/services/registerDefaultPageCollectionFilters.js +62 -0
- package/src/modules/cms/services/registerDefaultWidgetCollectionFilters.js +62 -0
- package/src/modules/cms/services/tailwind.admin.config.js +22 -102
- package/src/modules/cms/services/tailwind.frontStore.config.js +23 -108
- package/src/modules/cms/services/widget/createWidget.js +73 -0
- package/src/modules/cms/services/widget/deleteWidget.js +49 -0
- package/src/modules/cms/services/widget/loadWidgetInstances.js +54 -0
- package/src/modules/cms/services/widget/updateWidget.js +86 -0
- package/src/modules/cms/services/widget/widgetDataSchema.json +29 -0
- package/src/modules/cod/pages/admin/paymentSetting/CODSetting.jsx +2 -2
- package/src/modules/cod/pages/frontStore/checkout/CashOnDelivery.jsx +1 -1
- package/src/modules/customer/api/createCustomer/[bodyParser]createCustomer.js +2 -2
- package/src/modules/customer/api/resetPassword/[bodyParser]resetPassword.js +2 -2
- package/src/modules/customer/api/updatePassword/[bodyParser]updatePassword.js +2 -2
- package/src/modules/customer/bootstrap.js +50 -4
- package/src/modules/customer/graphql/types/Customer/Customer.admin.resolvers.js +2 -4
- package/src/modules/customer/pages/admin/customerEdit/CustomerEditForm.jsx +3 -3
- package/src/modules/customer/pages/admin/customerEdit+customerNew/OrderHistory.jsx +1 -1
- package/src/modules/customer/pages/admin/customerGrid/Grid.jsx +110 -16
- package/src/modules/customer/pages/admin/customerGrid/index.js +1 -2
- package/src/modules/customer/pages/frontStore/account/AccountDetails.jsx +3 -3
- package/src/modules/customer/pages/frontStore/account/Layout.jsx +3 -3
- package/src/modules/customer/pages/frontStore/account/OrderHistory.jsx +1 -1
- package/src/modules/customer/pages/frontStore/account/route.json +2 -1
- package/src/modules/customer/pages/frontStore/login/LoginForm.jsx +2 -3
- package/src/modules/customer/pages/frontStore/login/route.json +2 -1
- package/src/modules/customer/pages/frontStore/register/RegisterForm.jsx +2 -2
- package/src/modules/customer/pages/frontStore/register/route.json +2 -1
- package/src/modules/customer/pages/frontStore/resetPasswordPage/ResetPasswordForm.jsx +2 -2
- package/src/modules/customer/pages/frontStore/resetPasswordPage/route.json +2 -1
- package/src/modules/customer/pages/frontStore/updatePasswordPage/UpdatePasswordForm.jsx +3 -3
- package/src/modules/customer/pages/frontStore/updatePasswordPage/route.json +2 -1
- package/src/modules/customer/services/CustomerCollection.js +22 -103
- package/src/modules/customer/services/CustomerGroupCollection.js +20 -69
- package/src/modules/customer/services/registerDefaultCustomerCollectionFilters.js +90 -0
- package/src/modules/customer/services/registerDefaultCustomerGroupCollectionFilters.js +50 -0
- package/src/modules/graphql/pages/global/[bodyParser]buildQuery[graphql].js +239 -7
- package/src/modules/graphql/pages/global/[buildQuery]graphql[notification].js +13 -9
- package/src/modules/graphql/services/graphqlMiddleware.js +1 -1
- package/src/modules/oms/bootstrap.js +104 -3
- package/src/modules/oms/graphql/types/Order/Order.admin.resolvers.js +1 -1
- package/src/modules/oms/graphql/types/Order/Order.graphql +11 -2
- package/src/modules/oms/graphql/types/Order/Order.resolvers.js +9 -2
- package/src/modules/oms/pages/admin/dashboard/Bestsellers.jsx +2 -2
- package/src/modules/oms/pages/admin/dashboard/Lifetimesales.jsx +5 -5
- package/src/modules/oms/pages/admin/orderEdit/AddTrackingButton.jsx +1 -1
- package/src/modules/oms/pages/admin/orderEdit/Items.jsx +7 -7
- package/src/modules/oms/pages/admin/orderEdit/Layout.jsx +3 -3
- package/src/modules/oms/pages/admin/orderEdit/Payment.jsx +6 -6
- package/src/modules/oms/pages/admin/orderEdit/ShipButton.jsx +1 -1
- package/src/modules/oms/pages/admin/orderGrid/Grid.jsx +154 -53
- package/src/modules/oms/pages/admin/orderGrid/index.js +1 -2
- package/src/modules/oms/services/OrderCollection.js +18 -138
- package/src/modules/oms/services/registerDefaultOrderCollectionFilters.js +121 -0
- package/src/modules/paypal/api/paypalCreateOrder/[bodyParser]createOrder.js +55 -24
- package/src/modules/paypal/pages/admin/paymentSetting/PaypalSetting.jsx +6 -6
- package/src/modules/paypal/pages/frontStore/checkout/Paypal.jsx +3 -4
- package/src/modules/promotion/bootstrap.js +35 -101
- package/src/modules/promotion/graphql/types/Coupon/Coupon.admin.resolvers.js +2 -7
- package/src/modules/promotion/pages/admin/couponEdit+couponNew/DiscountType.jsx +1 -1
- package/src/modules/promotion/pages/admin/couponEdit+couponNew/FormContent.jsx +5 -5
- package/src/modules/promotion/pages/admin/couponGrid/Grid.jsx +159 -35
- package/src/modules/promotion/pages/admin/couponGrid/index.js +1 -2
- package/src/modules/promotion/pages/frontStore/cart/Coupon.jsx +2 -2
- package/src/modules/promotion/services/CouponCollection.js +21 -130
- package/src/modules/promotion/services/couponValidator.js +4 -7
- package/src/modules/promotion/services/discountCalculator.js +2 -7
- package/src/modules/promotion/services/registerCartItemPromotionFields.js +80 -0
- package/src/modules/promotion/services/registerCartPromotionFields.js +128 -0
- package/src/modules/promotion/services/registerDefaultCalculators.js +48 -20
- package/src/modules/promotion/services/registerDefaultCouponCollectionFilters.js +72 -0
- package/src/modules/promotion/services/registerDefaultValidators.js +16 -4
- package/src/modules/setting/pages/admin/paymentSetting/PaymentSetting.jsx +2 -2
- package/src/modules/setting/pages/admin/storeSetting/StoreSetting.jsx +98 -35
- package/src/modules/stripe/api/stripeWebHook/[bodyJson]webhook.js +4 -2
- package/src/modules/stripe/pages/admin/paymentSetting/StripePayment.jsx +5 -5
- package/src/modules/stripe/pages/frontStore/checkout/Stripe.jsx +1 -1
- package/src/modules/tax/bootstrap.js +57 -5
- package/src/modules/tax/graphql/types/Product/Price/ProductPrice.resolvers.js +6 -39
- package/src/modules/tax/graphql/types/TaxSetting/TaxSetting.graphql +1 -2
- package/src/modules/tax/graphql/types/TaxSetting/TaxSetting.resolvers.js +1 -8
- package/src/modules/tax/pages/admin/taxSetting/TaxSetting.jsx +4 -4
- package/src/modules/tax/services/TaxClassCollection.js +22 -56
- package/src/modules/tax/services/calculateTaxAmount.js +12 -9
- package/src/modules/tax/services/registerCartItemTaxPercentField.js +76 -0
- package/src/modules/tax/services/registerDefaultTaxClassCollectionFilters.js +49 -0
- package/src/components/admin/oms/shippingSetting/Method.jsx +0 -73
- package/src/components/common/grid/headers/Basic.jsx +0 -55
- package/src/lib/log/debuger.js +0 -89
- package/src/modules/auth/services/adminSessionMiddleware.js +0 -0
- package/src/modules/catalog/pages/frontStore/homepage/FeaturedCategories.jsx +0 -58
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/StatusAndLayout.jsx +0 -61
- package/src/modules/cms/pages/frontStore/all/Menu.jsx +0 -46
- package/src/modules/cms/pages/frontStore/all/Menu.scss +0 -7
- package/src/modules/cms/pages/frontStore/all/MobileMenu.jsx +0 -73
- package/src/modules/cms/pages/frontStore/all/MobileMenu.scss +0 -35
- package/src/modules/cms/pages/frontStore/homepage/MainBanner.jsx +0 -31
- package/src/modules/cms/pages/frontStore/homepage/MainBanner.scss +0 -48
- package/src/modules/customer/pages/frontStore/login/LoginButton.jsx +0 -27
- /package/src/modules/{oms → checkout}/pages/admin/all/ShippingSettingMenu.jsx +0 -0
- /package/src/modules/{oms → checkout}/pages/admin/shippingSetting/index.js +0 -0
- /package/src/modules/{oms → checkout}/pages/admin/shippingSetting/route.json +0 -0
|
@@ -0,0 +1,419 @@
|
|
|
1
|
+
/* eslint-disable react/jsx-props-no-spreading */
|
|
2
|
+
/* eslint-disable react/no-array-index-key */
|
|
3
|
+
/* eslint-disable no-param-reassign */
|
|
4
|
+
import PropTypes from 'prop-types';
|
|
5
|
+
import React from 'react';
|
|
6
|
+
import Button from '@components/common/form/Button';
|
|
7
|
+
import { Input } from '@components/common/form/fields/Input';
|
|
8
|
+
import './FileBrowser.scss';
|
|
9
|
+
import Spinner from '@components/common/Spinner';
|
|
10
|
+
|
|
11
|
+
function File({ file, select }) {
|
|
12
|
+
const className = file.isSelected === true ? 'selected' : '';
|
|
13
|
+
return (
|
|
14
|
+
<div className={`col image-item ${className}`}>
|
|
15
|
+
<div className="inner">
|
|
16
|
+
<a
|
|
17
|
+
href="#"
|
|
18
|
+
onClick={(e) => {
|
|
19
|
+
e.preventDefault();
|
|
20
|
+
select(file);
|
|
21
|
+
}}
|
|
22
|
+
>
|
|
23
|
+
<img src={file.url} alt="" />
|
|
24
|
+
</a>
|
|
25
|
+
{file.isSelected === true && (
|
|
26
|
+
<div className="select fill-current text-primary">
|
|
27
|
+
<svg
|
|
28
|
+
style={{ width: '2rem' }}
|
|
29
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
30
|
+
className="h-6 w-6"
|
|
31
|
+
fill="none"
|
|
32
|
+
viewBox="0 0 24 24"
|
|
33
|
+
stroke="currentColor"
|
|
34
|
+
>
|
|
35
|
+
<path
|
|
36
|
+
strokeLinecap="round"
|
|
37
|
+
strokeLinejoin="round"
|
|
38
|
+
strokeWidth={2}
|
|
39
|
+
d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
|
|
40
|
+
/>
|
|
41
|
+
</svg>
|
|
42
|
+
</div>
|
|
43
|
+
)}
|
|
44
|
+
</div>
|
|
45
|
+
</div>
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
File.propTypes = {
|
|
50
|
+
file: PropTypes.shape({
|
|
51
|
+
isSelected: PropTypes.bool,
|
|
52
|
+
url: PropTypes.string
|
|
53
|
+
}).isRequired,
|
|
54
|
+
select: PropTypes.func.isRequired
|
|
55
|
+
};
|
|
56
|
+
|
|
57
|
+
function FileBrowser({
|
|
58
|
+
onInsert,
|
|
59
|
+
isMultiple,
|
|
60
|
+
setFileBrowser,
|
|
61
|
+
browserApi,
|
|
62
|
+
deleteApi,
|
|
63
|
+
uploadApi,
|
|
64
|
+
folderCreateApi
|
|
65
|
+
}) {
|
|
66
|
+
const [error, setError] = React.useState(null);
|
|
67
|
+
const [loading, setLoading] = React.useState(false);
|
|
68
|
+
const [folders, setFolders] = React.useState([]);
|
|
69
|
+
const [files, setFiles] = React.useState([]);
|
|
70
|
+
const [currentPath, setCurrentPath] = React.useState([]);
|
|
71
|
+
const newFolderRefInput = React.useRef(null);
|
|
72
|
+
|
|
73
|
+
const onSelectFolder = (e, f) => {
|
|
74
|
+
e.preventDefault();
|
|
75
|
+
setCurrentPath(
|
|
76
|
+
currentPath.concat({ name: f, index: currentPath.length + 1 })
|
|
77
|
+
);
|
|
78
|
+
};
|
|
79
|
+
|
|
80
|
+
const onSelectFolderFromBreadcrumb = (e, index) => {
|
|
81
|
+
e.preventDefault();
|
|
82
|
+
const newPath = [];
|
|
83
|
+
currentPath.forEach((f) => {
|
|
84
|
+
if (f.index <= index) newPath.push(f);
|
|
85
|
+
});
|
|
86
|
+
setCurrentPath(newPath);
|
|
87
|
+
};
|
|
88
|
+
|
|
89
|
+
const onSelectFile = (f) => {
|
|
90
|
+
if (isMultiple === false) {
|
|
91
|
+
setFiles(
|
|
92
|
+
files.map((file) => {
|
|
93
|
+
if (f.name === file.name) {
|
|
94
|
+
file.isSelected = !file.isSelected;
|
|
95
|
+
} else {
|
|
96
|
+
file.isSelected = false;
|
|
97
|
+
}
|
|
98
|
+
return file;
|
|
99
|
+
})
|
|
100
|
+
);
|
|
101
|
+
} else {
|
|
102
|
+
setFiles(
|
|
103
|
+
files.map((file) => {
|
|
104
|
+
if (f.name === file.name) {
|
|
105
|
+
file.isSelected = true;
|
|
106
|
+
} else {
|
|
107
|
+
file.isSelected = false;
|
|
108
|
+
}
|
|
109
|
+
return file;
|
|
110
|
+
})
|
|
111
|
+
);
|
|
112
|
+
}
|
|
113
|
+
};
|
|
114
|
+
|
|
115
|
+
const close = (e) => {
|
|
116
|
+
e.preventDefault();
|
|
117
|
+
setFileBrowser(false);
|
|
118
|
+
};
|
|
119
|
+
|
|
120
|
+
const createFolder = (e, folder) => {
|
|
121
|
+
e.preventDefault();
|
|
122
|
+
if (!folder || !folder.trim()) {
|
|
123
|
+
setError('Invalid folder name');
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
const path = currentPath.map((f) => f.name);
|
|
127
|
+
path.push(folder.trim());
|
|
128
|
+
setLoading(true);
|
|
129
|
+
fetch(folderCreateApi, {
|
|
130
|
+
method: 'POST',
|
|
131
|
+
headers: {
|
|
132
|
+
'Content-Type': 'application/json'
|
|
133
|
+
},
|
|
134
|
+
body: JSON.stringify({ path: path.join('/') }),
|
|
135
|
+
credentials: 'same-origin'
|
|
136
|
+
})
|
|
137
|
+
.then((res) => res.json())
|
|
138
|
+
.then((response) => {
|
|
139
|
+
if (!response.error) {
|
|
140
|
+
// Get the first level folder, incase of recursive folder creation
|
|
141
|
+
const recursiveFolders = folder.split('/');
|
|
142
|
+
setFolders([...new Set(folders.concat(recursiveFolders[0]))]);
|
|
143
|
+
} else {
|
|
144
|
+
setError(response.error.message);
|
|
145
|
+
}
|
|
146
|
+
})
|
|
147
|
+
.catch((err) => setError(err.message))
|
|
148
|
+
.finally(() => setLoading(false));
|
|
149
|
+
};
|
|
150
|
+
|
|
151
|
+
const deleteFile = () => {
|
|
152
|
+
let file = null;
|
|
153
|
+
files.forEach((f) => {
|
|
154
|
+
if (f.isSelected === true) {
|
|
155
|
+
file = f;
|
|
156
|
+
}
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
if (file === null) setError('No file selected');
|
|
160
|
+
else {
|
|
161
|
+
const path = currentPath.map((f) => f.name);
|
|
162
|
+
path.push(file.name);
|
|
163
|
+
setLoading(true);
|
|
164
|
+
fetch(deleteApi + path.join('/'), {
|
|
165
|
+
method: 'DELETE'
|
|
166
|
+
})
|
|
167
|
+
.then((res) => res.json())
|
|
168
|
+
.then((response) => {
|
|
169
|
+
if (!response.error) {
|
|
170
|
+
setCurrentPath(currentPath.map((f) => f));
|
|
171
|
+
} else {
|
|
172
|
+
setError(response.error.message);
|
|
173
|
+
}
|
|
174
|
+
})
|
|
175
|
+
.catch((err) => setError(err.message))
|
|
176
|
+
.finally(() => setLoading(false));
|
|
177
|
+
}
|
|
178
|
+
};
|
|
179
|
+
|
|
180
|
+
const insertFile = () => {
|
|
181
|
+
let file = null;
|
|
182
|
+
files.forEach((f) => {
|
|
183
|
+
if (f.isSelected === true) file = f;
|
|
184
|
+
});
|
|
185
|
+
|
|
186
|
+
if (file === null) {
|
|
187
|
+
setError('No file selected');
|
|
188
|
+
} else {
|
|
189
|
+
onInsert(file.url);
|
|
190
|
+
setFileBrowser(false);
|
|
191
|
+
}
|
|
192
|
+
};
|
|
193
|
+
|
|
194
|
+
const onUpload = (e) => {
|
|
195
|
+
e.persist();
|
|
196
|
+
const formData = new FormData();
|
|
197
|
+
for (let i = 0; i < e.target.files.length; i += 1)
|
|
198
|
+
formData.append('images', e.target.files[i]);
|
|
199
|
+
|
|
200
|
+
const path = [];
|
|
201
|
+
currentPath.forEach((f) => {
|
|
202
|
+
path.push(f.name);
|
|
203
|
+
});
|
|
204
|
+
|
|
205
|
+
setLoading(true);
|
|
206
|
+
fetch(uploadApi + path.join('/'), {
|
|
207
|
+
method: 'POST',
|
|
208
|
+
body: formData
|
|
209
|
+
})
|
|
210
|
+
.then((res) => res.json())
|
|
211
|
+
.then((response) => {
|
|
212
|
+
if (!response.error) {
|
|
213
|
+
setCurrentPath(currentPath.map((f) => f));
|
|
214
|
+
} else {
|
|
215
|
+
setError(response.error.message);
|
|
216
|
+
}
|
|
217
|
+
})
|
|
218
|
+
.catch((err) => setError(err.message))
|
|
219
|
+
.finally(() => setLoading(false));
|
|
220
|
+
};
|
|
221
|
+
|
|
222
|
+
React.useEffect(() => {
|
|
223
|
+
const path = currentPath.map((f) => f.name);
|
|
224
|
+
setLoading(true);
|
|
225
|
+
fetch(browserApi + path.join('/'), {
|
|
226
|
+
method: 'GET'
|
|
227
|
+
})
|
|
228
|
+
.then((res) => res.json())
|
|
229
|
+
.then((response) => {
|
|
230
|
+
if (!response.error) {
|
|
231
|
+
setFolders(response.data.folders);
|
|
232
|
+
setFiles(response.data.files);
|
|
233
|
+
} else {
|
|
234
|
+
setError(response.error.message);
|
|
235
|
+
}
|
|
236
|
+
})
|
|
237
|
+
.catch((e) => setError(e.message))
|
|
238
|
+
.finally(() => setLoading(false));
|
|
239
|
+
}, [currentPath]);
|
|
240
|
+
|
|
241
|
+
return (
|
|
242
|
+
<div className="file-browser">
|
|
243
|
+
{loading === true && (
|
|
244
|
+
<div className="fixed top-0 left-0 bottom-0 right-0 flex justify-center">
|
|
245
|
+
<Spinner width={30} height={30} className="absolute-center" />
|
|
246
|
+
</div>
|
|
247
|
+
)}
|
|
248
|
+
<div className="content">
|
|
249
|
+
<div className="flex justify-end">
|
|
250
|
+
<a
|
|
251
|
+
href="#"
|
|
252
|
+
onClick={(e) => close(e)}
|
|
253
|
+
className="text-interactive fill-current"
|
|
254
|
+
>
|
|
255
|
+
<svg
|
|
256
|
+
style={{ width: '2rem' }}
|
|
257
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
258
|
+
className="h-6 w-6"
|
|
259
|
+
fill="none"
|
|
260
|
+
viewBox="0 0 24 24"
|
|
261
|
+
stroke="currentColor"
|
|
262
|
+
>
|
|
263
|
+
<path
|
|
264
|
+
strokeLinecap="round"
|
|
265
|
+
strokeLinejoin="round"
|
|
266
|
+
strokeWidth={2}
|
|
267
|
+
d="M6 18L18 6M6 6l12 12"
|
|
268
|
+
/>
|
|
269
|
+
</svg>
|
|
270
|
+
</a>
|
|
271
|
+
</div>
|
|
272
|
+
<div>
|
|
273
|
+
<div className="grid grid-cols-4 gap-8">
|
|
274
|
+
<div className="col-span-1">
|
|
275
|
+
<div className="current-path mb-16">
|
|
276
|
+
<div className="flex">
|
|
277
|
+
<div className="pr-4">You are here:</div>
|
|
278
|
+
<div>
|
|
279
|
+
<a
|
|
280
|
+
href="#"
|
|
281
|
+
onClick={(e) => onSelectFolderFromBreadcrumb(e, 0)}
|
|
282
|
+
className="text-interactive hover:underline"
|
|
283
|
+
>
|
|
284
|
+
Root
|
|
285
|
+
</a>
|
|
286
|
+
</div>
|
|
287
|
+
{currentPath.map((f, index) => (
|
|
288
|
+
<div key={index}>
|
|
289
|
+
<span>/</span>
|
|
290
|
+
<a
|
|
291
|
+
className="text-interactive hover:underline"
|
|
292
|
+
href="#"
|
|
293
|
+
onClick={(e) =>
|
|
294
|
+
onSelectFolderFromBreadcrumb(e, f.index)
|
|
295
|
+
}
|
|
296
|
+
>
|
|
297
|
+
{f.name}
|
|
298
|
+
</a>
|
|
299
|
+
</div>
|
|
300
|
+
))}
|
|
301
|
+
</div>
|
|
302
|
+
</div>
|
|
303
|
+
<ul className="mt-6 mb-6">
|
|
304
|
+
{folders.map((f, i) => (
|
|
305
|
+
<li
|
|
306
|
+
key={i}
|
|
307
|
+
className="text-interactive fill-current flex list-group-item"
|
|
308
|
+
>
|
|
309
|
+
<svg
|
|
310
|
+
style={{ width: '2rem', height: '2rem' }}
|
|
311
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
312
|
+
className="h-6 w-6"
|
|
313
|
+
fill="none"
|
|
314
|
+
viewBox="0 0 24 24"
|
|
315
|
+
stroke="currentColor"
|
|
316
|
+
>
|
|
317
|
+
<path
|
|
318
|
+
strokeLinecap="round"
|
|
319
|
+
strokeLinejoin="round"
|
|
320
|
+
strokeWidth={2}
|
|
321
|
+
d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"
|
|
322
|
+
/>
|
|
323
|
+
</svg>
|
|
324
|
+
<a
|
|
325
|
+
className="pl-2 hover:underline"
|
|
326
|
+
href="#"
|
|
327
|
+
onClick={(e) => onSelectFolder(e, f)}
|
|
328
|
+
>
|
|
329
|
+
{f}
|
|
330
|
+
</a>
|
|
331
|
+
</li>
|
|
332
|
+
))}
|
|
333
|
+
{folders.length === 0 && (
|
|
334
|
+
<li className="list-group-item">
|
|
335
|
+
<span>There is no sub folder.</span>
|
|
336
|
+
</li>
|
|
337
|
+
)}
|
|
338
|
+
</ul>
|
|
339
|
+
<div className=" justify-between">
|
|
340
|
+
<Input
|
|
341
|
+
type="text"
|
|
342
|
+
placeholder="New folder"
|
|
343
|
+
ref={newFolderRefInput}
|
|
344
|
+
/>
|
|
345
|
+
<div className="mt-4">
|
|
346
|
+
<a
|
|
347
|
+
href="#"
|
|
348
|
+
onClick={(e) =>
|
|
349
|
+
createFolder(e, newFolderRefInput.current.value)
|
|
350
|
+
}
|
|
351
|
+
className="text-interactive hover:underline"
|
|
352
|
+
>
|
|
353
|
+
Create
|
|
354
|
+
</a>
|
|
355
|
+
</div>
|
|
356
|
+
</div>
|
|
357
|
+
</div>
|
|
358
|
+
<div className="col-span-3">
|
|
359
|
+
<div className="error text-critical mb-8">{error}</div>
|
|
360
|
+
<div className="tool-bar grid grid-cols-3 gap-4 mb-8">
|
|
361
|
+
<Button
|
|
362
|
+
variant="critical"
|
|
363
|
+
outline
|
|
364
|
+
title="Delete image"
|
|
365
|
+
onAction={() => deleteFile()}
|
|
366
|
+
/>
|
|
367
|
+
<Button
|
|
368
|
+
variant="primary"
|
|
369
|
+
title="Insert image"
|
|
370
|
+
onAction={() => insertFile()}
|
|
371
|
+
/>
|
|
372
|
+
<Button
|
|
373
|
+
title="Upload image"
|
|
374
|
+
variant="info"
|
|
375
|
+
onAction={() => {
|
|
376
|
+
document.getElementById('upload-image').click();
|
|
377
|
+
}}
|
|
378
|
+
/>
|
|
379
|
+
<label htmlFor="upload-image" className="self-center">
|
|
380
|
+
<a className="invisible">
|
|
381
|
+
<input
|
|
382
|
+
id="upload-image"
|
|
383
|
+
type="file"
|
|
384
|
+
multiple
|
|
385
|
+
onChange={onUpload}
|
|
386
|
+
/>
|
|
387
|
+
</a>
|
|
388
|
+
</label>
|
|
389
|
+
</div>
|
|
390
|
+
{files.length === 0 && <div>There is no file to display.</div>}
|
|
391
|
+
<div className="grid grid-cols-9 gap-4">
|
|
392
|
+
{files.map((f) => (
|
|
393
|
+
<File file={f} select={onSelectFile} />
|
|
394
|
+
))}
|
|
395
|
+
</div>
|
|
396
|
+
</div>
|
|
397
|
+
</div>
|
|
398
|
+
</div>
|
|
399
|
+
</div>
|
|
400
|
+
</div>
|
|
401
|
+
);
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
FileBrowser.propTypes = {
|
|
405
|
+
browserApi: PropTypes.string.isRequired,
|
|
406
|
+
deleteApi: PropTypes.string.isRequired,
|
|
407
|
+
// eslint-disable-next-line react/forbid-prop-types
|
|
408
|
+
folderCreateApi: PropTypes.string.isRequired,
|
|
409
|
+
setFileBrowser: PropTypes.string.isRequired,
|
|
410
|
+
uploadApi: PropTypes.string.isRequired,
|
|
411
|
+
onInsert: PropTypes.func.isRequired,
|
|
412
|
+
isMultiple: PropTypes.bool
|
|
413
|
+
};
|
|
414
|
+
|
|
415
|
+
FileBrowser.defaultProps = {
|
|
416
|
+
isMultiple: false
|
|
417
|
+
};
|
|
418
|
+
|
|
419
|
+
export default FileBrowser;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/* FILE BROWSER */
|
|
2
|
+
.file-browser {
|
|
3
|
+
position: fixed;
|
|
4
|
+
top: 0;
|
|
5
|
+
left: 0;
|
|
6
|
+
right: 0;
|
|
7
|
+
bottom: 0;
|
|
8
|
+
background: #fff;
|
|
9
|
+
z-index: 1000;
|
|
10
|
+
padding: 20px;
|
|
11
|
+
}
|
|
12
|
+
.file-browser .loading {
|
|
13
|
+
position: absolute;
|
|
14
|
+
top: 50%;
|
|
15
|
+
left: 50%;
|
|
16
|
+
margin-top: -40px;
|
|
17
|
+
margin-left: -40px;
|
|
18
|
+
}
|
|
19
|
+
.file-browser img {
|
|
20
|
+
max-width: 100%;
|
|
21
|
+
}
|
|
22
|
+
.file-browser .image-item .inner {
|
|
23
|
+
padding: 3px;
|
|
24
|
+
box-sizing: border-box;
|
|
25
|
+
border: 1px solid #e1e1e1;
|
|
26
|
+
position: relative;
|
|
27
|
+
}
|
|
28
|
+
.file-browser .image-item .inner .select {
|
|
29
|
+
position: absolute;
|
|
30
|
+
bottom: 5px;
|
|
31
|
+
right: 5px;
|
|
32
|
+
font-size: 20px;
|
|
33
|
+
}
|
|
34
|
+
.image-tool__image-picture {
|
|
35
|
+
margin-top: 0 !important;
|
|
36
|
+
margin-bottom: 0 !important;
|
|
37
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
const getRowClasses = (size) => {
|
|
2
|
+
switch (size) {
|
|
3
|
+
case 1:
|
|
4
|
+
return 'grid-cols-1';
|
|
5
|
+
case 2:
|
|
6
|
+
return 'grid-cols-2';
|
|
7
|
+
case 3:
|
|
8
|
+
return 'grid-cols-3';
|
|
9
|
+
case 4:
|
|
10
|
+
return 'grid-cols-4';
|
|
11
|
+
case 5:
|
|
12
|
+
return 'grid-cols-5';
|
|
13
|
+
default:
|
|
14
|
+
return 'grid-cols-1';
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
export default getRowClasses;
|
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import PropTypes from 'prop-types';
|
|
3
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
4
|
+
import getRowClasses from './GetRowClasses';
|
|
5
|
+
import getColumnClasses from './GetColumnClasses';
|
|
6
|
+
|
|
7
|
+
function RowTemplates({ addRow }) {
|
|
8
|
+
const templates = {
|
|
9
|
+
1: () => (
|
|
10
|
+
<svg
|
|
11
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
12
|
+
width="48"
|
|
13
|
+
height="48"
|
|
14
|
+
viewBox="0 0 48 48"
|
|
15
|
+
aria-hidden="true"
|
|
16
|
+
focusable="false"
|
|
17
|
+
fill="#949494"
|
|
18
|
+
>
|
|
19
|
+
<path d="M0 10a2 2 0 0 1 2-2h44a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Z" />
|
|
20
|
+
</svg>
|
|
21
|
+
),
|
|
22
|
+
'1:1': () => (
|
|
23
|
+
<svg
|
|
24
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
25
|
+
width="48"
|
|
26
|
+
height="48"
|
|
27
|
+
viewBox="0 0 48 48"
|
|
28
|
+
aria-hidden="true"
|
|
29
|
+
focusable="false"
|
|
30
|
+
fill="#949494"
|
|
31
|
+
>
|
|
32
|
+
<path d="M0 10a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm25 0a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H27a2 2 0 0 1-2-2V10Z" />
|
|
33
|
+
</svg>
|
|
34
|
+
),
|
|
35
|
+
'1:2': () => (
|
|
36
|
+
<svg
|
|
37
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
38
|
+
width="48"
|
|
39
|
+
height="48"
|
|
40
|
+
viewBox="0 0 48 48"
|
|
41
|
+
aria-hidden="true"
|
|
42
|
+
focusable="false"
|
|
43
|
+
fill="#949494"
|
|
44
|
+
>
|
|
45
|
+
<path d="M0 10a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm17 0a2 2 0 0 1 2-2h27a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H19a2 2 0 0 1-2-2V10Z" />
|
|
46
|
+
</svg>
|
|
47
|
+
),
|
|
48
|
+
'2:1': () => (
|
|
49
|
+
<svg
|
|
50
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
51
|
+
width="48"
|
|
52
|
+
height="48"
|
|
53
|
+
viewBox="0 0 48 48"
|
|
54
|
+
aria-hidden="true"
|
|
55
|
+
focusable="false"
|
|
56
|
+
fill="#949494"
|
|
57
|
+
>
|
|
58
|
+
<path d="M0 10a2 2 0 0 1 2-2h27a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm33 0a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H35a2 2 0 0 1-2-2V10Z" />
|
|
59
|
+
</svg>
|
|
60
|
+
),
|
|
61
|
+
'2:3': () => (
|
|
62
|
+
<svg
|
|
63
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
64
|
+
width="48"
|
|
65
|
+
height="48"
|
|
66
|
+
viewBox="0 0 48 48"
|
|
67
|
+
aria-hidden="true"
|
|
68
|
+
focusable="false"
|
|
69
|
+
fill="#949494"
|
|
70
|
+
>
|
|
71
|
+
<rect x="0" y="8" width="18.4" height="32" rx="2" ry="2" />
|
|
72
|
+
<rect x="21.6" y="8" width="24" height="32" rx="2" ry="2" />
|
|
73
|
+
</svg>
|
|
74
|
+
),
|
|
75
|
+
'3:2': () => (
|
|
76
|
+
<svg
|
|
77
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
78
|
+
width="48"
|
|
79
|
+
height="48"
|
|
80
|
+
viewBox="0 0 48 48"
|
|
81
|
+
aria-hidden="true"
|
|
82
|
+
focusable="false"
|
|
83
|
+
fill="#949494"
|
|
84
|
+
>
|
|
85
|
+
<rect x="0" y="8" width="24" height="32" rx="2" ry="2" />
|
|
86
|
+
<rect x="27.2" y="8" width="18.4" height="32" rx="2" ry="2" />
|
|
87
|
+
</svg>
|
|
88
|
+
),
|
|
89
|
+
'1:1:1': () => (
|
|
90
|
+
<svg
|
|
91
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
92
|
+
width="48"
|
|
93
|
+
height="48"
|
|
94
|
+
viewBox="0 0 48 48"
|
|
95
|
+
aria-hidden="true"
|
|
96
|
+
focusable="false"
|
|
97
|
+
fill="#949494"
|
|
98
|
+
>
|
|
99
|
+
<path d="M0 10a2 2 0 0 1 2-2h10.531c1.105 0 1.969.895 1.969 2v28c0 1.105-.864 2-1.969 2H2a2 2 0 0 1-2-2V10Zm16.5 0c0-1.105.864-2 1.969-2H29.53c1.105 0 1.969.895 1.969 2v28c0 1.105-.864 2-1.969 2H18.47c-1.105 0-1.969-.895-1.969-2V10Zm17 0c0-1.105.864-2 1.969-2H46a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H35.469c-1.105 0-1.969-.895-1.969-2V10Z" />
|
|
100
|
+
</svg>
|
|
101
|
+
),
|
|
102
|
+
'1:2:1': () => (
|
|
103
|
+
<svg
|
|
104
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
105
|
+
width="48"
|
|
106
|
+
height="48"
|
|
107
|
+
viewBox="0 0 48 48"
|
|
108
|
+
aria-hidden="true"
|
|
109
|
+
focusable="false"
|
|
110
|
+
fill="#949494"
|
|
111
|
+
>
|
|
112
|
+
<path d="M0 10a2 2 0 0 1 2-2h7.531c1.105 0 1.969.895 1.969 2v28c0 1.105-.864 2-1.969 2H2a2 2 0 0 1-2-2V10Zm13.5 0c0-1.105.864-2 1.969-2H32.53c1.105 0 1.969.895 1.969 2v28c0 1.105-.864 2-1.969 2H15.47c-1.105 0-1.969-.895-1.969-2V10Zm23 0c0-1.105.864-2 1.969-2H46a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2h-7.531c-1.105 0-1.969-.895-1.969-2V10Z" />
|
|
113
|
+
</svg>
|
|
114
|
+
)
|
|
115
|
+
};
|
|
116
|
+
return (
|
|
117
|
+
<div className="row-templates flex justify-center gap-7 border border-divider px-3">
|
|
118
|
+
{Object.keys(templates).map((key) => (
|
|
119
|
+
<a
|
|
120
|
+
href="#"
|
|
121
|
+
onClick={(e) => {
|
|
122
|
+
e.preventDefault();
|
|
123
|
+
const split = key.split(':').map((val) => parseInt(val, 10));
|
|
124
|
+
const sum = split.reduce((acc, val) => acc + val, 0);
|
|
125
|
+
const rowClassName = getRowClasses(sum);
|
|
126
|
+
const columns = split.map((size) => {
|
|
127
|
+
const columnClassName = getColumnClasses(size);
|
|
128
|
+
return {
|
|
129
|
+
size: parseInt(size, 10),
|
|
130
|
+
className: columnClassName,
|
|
131
|
+
id: `c__${uuidv4()}`
|
|
132
|
+
};
|
|
133
|
+
});
|
|
134
|
+
addRow({
|
|
135
|
+
id: `r__${uuidv4()}`,
|
|
136
|
+
editSetting: true,
|
|
137
|
+
columns,
|
|
138
|
+
size: sum,
|
|
139
|
+
className: rowClassName
|
|
140
|
+
});
|
|
141
|
+
}}
|
|
142
|
+
>
|
|
143
|
+
{templates[key]()}
|
|
144
|
+
</a>
|
|
145
|
+
))}
|
|
146
|
+
</div>
|
|
147
|
+
);
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
RowTemplates.propTypes = {
|
|
151
|
+
addRow: PropTypes.func.isRequired
|
|
152
|
+
};
|
|
153
|
+
|
|
154
|
+
export default RowTemplates;
|
|
@@ -13,8 +13,12 @@ const rules = {
|
|
|
13
13
|
},
|
|
14
14
|
number: {
|
|
15
15
|
handler(value) {
|
|
16
|
-
if (value === null || value === undefined || value === '')
|
|
17
|
-
|
|
16
|
+
if (value === null || value === undefined || value === '') {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
// Allowing integer and float
|
|
21
|
+
return !Number.isNaN(value);
|
|
18
22
|
},
|
|
19
23
|
errorMessage: 'Invalid number'
|
|
20
24
|
},
|
|
@@ -68,9 +68,9 @@ export default function Pagination({ total, limit, page }) {
|
|
|
68
68
|
};
|
|
69
69
|
|
|
70
70
|
return (
|
|
71
|
-
<div className="pagination flex px-
|
|
72
|
-
<div className="flex justify-between w-full space-x-
|
|
73
|
-
<div className="flex space-x-
|
|
71
|
+
<div className="pagination flex px-8">
|
|
72
|
+
<div className="flex justify-between w-full space-x-4 mt-4 mb-4">
|
|
73
|
+
<div className="flex space-x-4">
|
|
74
74
|
<div className="self-center">
|
|
75
75
|
<span>Show</span>
|
|
76
76
|
</div>
|
|
@@ -83,7 +83,7 @@ export default function Pagination({ total, limit, page }) {
|
|
|
83
83
|
<span>per page</span>
|
|
84
84
|
</div>
|
|
85
85
|
</div>
|
|
86
|
-
<div className="flex space-x-
|
|
86
|
+
<div className="flex space-x-4">
|
|
87
87
|
{page > 1 && (
|
|
88
88
|
<>
|
|
89
89
|
<div className="first self-center">
|