From 3cb0c7d52303ae48ff0597fa2ea42b636b751b64 Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 11:47:57 +0100 Subject: [PATCH 01/18] Add responsive table component --- .../ResponsiveTable/ResponsiveTable.tsx | 29 +++++++++++++++++++ src/components/ResponsiveTable/index.ts | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 src/components/ResponsiveTable/ResponsiveTable.tsx create mode 100644 src/components/ResponsiveTable/index.ts diff --git a/src/components/ResponsiveTable/ResponsiveTable.tsx b/src/components/ResponsiveTable/ResponsiveTable.tsx new file mode 100644 index 000000000..3db2ee995 --- /dev/null +++ b/src/components/ResponsiveTable/ResponsiveTable.tsx @@ -0,0 +1,29 @@ +import Table from "@material-ui/core/Table"; +import { makeStyles } from "@material-ui/styles"; +import React from "react"; + +const useStyles = makeStyles( + () => ({ + root: { + overflowX: "auto" + } + }), + { + name: "ResponsiveTable" + } +); + +const ResponsiveTable: React.FC = props => { + const { children } = props; + + const classes = useStyles(props); + + return ( +
+ {children}
+
+ ); +}; + +ResponsiveTable.displayName = "ResponsiveTable"; +export default ResponsiveTable; diff --git a/src/components/ResponsiveTable/index.ts b/src/components/ResponsiveTable/index.ts new file mode 100644 index 000000000..907f1c053 --- /dev/null +++ b/src/components/ResponsiveTable/index.ts @@ -0,0 +1,2 @@ +export { default } from "./ResponsiveTable"; +export * from "./ResponsiveTable"; From bb5990c4d54f6e77ab0c0f2352f817e355637fd9 Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 15:24:48 +0100 Subject: [PATCH 02/18] Fix responsive table props --- .../ResponsiveTable/ResponsiveTable.tsx | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/components/ResponsiveTable/ResponsiveTable.tsx b/src/components/ResponsiveTable/ResponsiveTable.tsx index 3db2ee995..370539458 100644 --- a/src/components/ResponsiveTable/ResponsiveTable.tsx +++ b/src/components/ResponsiveTable/ResponsiveTable.tsx @@ -1,10 +1,19 @@ +import { Theme } from "@material-ui/core/styles"; import Table from "@material-ui/core/Table"; import { makeStyles } from "@material-ui/styles"; import React from "react"; const useStyles = makeStyles( - () => ({ + (theme: Theme) => ({ + [theme.breakpoints.up("sm")]: { + "& table": { + tableLayout: "fixed" + } + }, root: { + "& table": { + tableLayout: "auto" + }, overflowX: "auto" } }), @@ -13,14 +22,22 @@ const useStyles = makeStyles( } ); -const ResponsiveTable: React.FC = props => { - const { children } = props; +interface ResponsiveTableProps { + children: React.ReactNode | React.ReactNodeArray; + className?: string; + key?: string; +} + +const ResponsiveTable: React.FC = props => { + const { children, className, key } = props; const classes = useStyles(props); return (
- {children}
+ + {children} +
); }; From 9911f2b2784e607d20b21b13601405e6a8c8049e Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 15:25:23 +0100 Subject: [PATCH 03/18] Use responsive table component --- .../components/AttributeList/AttributeList.tsx | 6 +++--- .../AttributeValues/AttributeValues.tsx | 6 +++--- .../components/CategoryList/CategoryList.tsx | 6 +++--- .../CategoryProductList.tsx | 6 +++--- .../CollectionList/CollectionList.tsx | 6 +++--- .../CollectionProducts/CollectionProducts.tsx | 6 +++--- .../AssignCategoryDialog.tsx | 6 +++--- .../AssignCollectionDialog.tsx | 6 +++--- .../AssignProductDialog.tsx | 6 +++--- src/components/CountryList/CountryList.tsx | 6 +++--- .../TableCellHeader.stories.tsx | 6 +++--- .../components/CustomerList/CustomerList.tsx | 6 +++--- .../CustomerOrders/CustomerOrders.tsx | 6 +++--- .../DiscountCategories/DiscountCategories.tsx | 6 +++--- .../DiscountCollections.tsx | 6 +++--- .../DiscountCountrySelectDialog.tsx | 6 +++--- .../DiscountProducts/DiscountProducts.tsx | 6 +++--- src/discounts/components/SaleList/SaleList.tsx | 6 +++--- .../components/VoucherList/VoucherList.tsx | 6 +++--- .../HomeNotificationTable.tsx | 6 +++--- .../HomeProductListCard.tsx | 6 +++--- .../components/MenuList/MenuList.tsx | 6 +++--- .../OrderDraftDetailsProducts.tsx | 6 +++--- .../OrderDraftList/OrderDraftList.tsx | 6 +++--- .../OrderFulfillment/OrderFulfillment.tsx | 6 +++--- .../OrderFulfillmentDialog.tsx | 6 +++--- src/orders/components/OrderList/OrderList.tsx | 6 +++--- .../OrderProductAddDialog.tsx | 6 +++--- .../OrderUnfulfilledItems.tsx | 6 +++--- src/pages/components/PageList/PageList.tsx | 6 +++--- .../components/PluginsList/PluginsList.tsx | 6 +++--- .../AssignAttributeDialog.tsx | 6 +++--- .../ProductTypeAttributes.tsx | 6 +++--- .../ProductTypeList/ProductTypeList.tsx | 6 +++--- .../components/ProductList/ProductList.tsx | 6 +++--- .../ProductVariantNavigation.tsx | 6 +++--- .../ProductVariants/ProductVariants.tsx | 6 +++--- .../components/ServiceList/ServiceList.tsx | 6 +++--- .../components/ServiceTokens/ServiceTokens.tsx | 6 +++--- .../ShippingZoneCountriesAssignDialog.tsx | 10 +++++----- .../ShippingZoneRates/ShippingZoneRates.tsx | 6 +++--- .../ShippingZonesList/ShippingZonesList.tsx | 6 +++--- .../SiteSettingsKeys/SiteSettingsKeys.tsx | 6 +++--- src/staff/components/StaffList/StaffList.tsx | 6 +++--- .../stories/components/EditableTableCell.tsx | 6 +++--- .../stories/components/TablePagination.tsx | 18 +++++++++--------- .../components/CountryList/CountryList.tsx | 6 +++--- .../CountryTaxesPage/CountryTaxesPage.tsx | 6 +++--- .../TranslationsEntitiesList.tsx | 6 +++--- .../TranslationsLanguageList.tsx | 6 +++--- .../components/WebhooksList/WebhooksList.tsx | 6 +++--- 51 files changed, 161 insertions(+), 161 deletions(-) diff --git a/src/attributes/components/AttributeList/AttributeList.tsx b/src/attributes/components/AttributeList/AttributeList.tsx index 9b34c1272..caa17b28e 100644 --- a/src/attributes/components/AttributeList/AttributeList.tsx +++ b/src/attributes/components/AttributeList/AttributeList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -8,6 +7,7 @@ import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import Checkbox from "@saleor/components/Checkbox"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -75,7 +75,7 @@ const AttributeList: React.FC = ({ const intl = useIntl(); return ( - + = ({ ) )} -
+ ); }; AttributeList.displayName = "AttributeList"; diff --git a/src/attributes/components/AttributeValues/AttributeValues.tsx b/src/attributes/components/AttributeValues/AttributeValues.tsx index f336e748f..c0e340d02 100644 --- a/src/attributes/components/AttributeValues/AttributeValues.tsx +++ b/src/attributes/components/AttributeValues/AttributeValues.tsx @@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import IconButton from "@material-ui/core/IconButton"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; import TableRow from "@material-ui/core/TableRow"; @@ -11,6 +10,7 @@ import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import { SortableTableBody, @@ -80,7 +80,7 @@ const AttributeValues: React.FC = ({ } /> - + @@ -138,7 +138,7 @@ const AttributeValues: React.FC = ({ ) )} -
+ ); }; diff --git a/src/categories/components/CategoryList/CategoryList.tsx b/src/categories/components/CategoryList/CategoryList.tsx index 8426d628b..216d092e6 100644 --- a/src/categories/components/CategoryList/CategoryList.tsx +++ b/src/categories/components/CategoryList/CategoryList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -9,6 +8,7 @@ import { FormattedMessage } from "react-intl"; import { CategoryFragment } from "@saleor/categories/types/CategoryFragment"; import Checkbox from "@saleor/components/Checkbox"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -73,7 +73,7 @@ const CategoryList: React.FC = props => { const classes = useStyles(props); return ( - + = props => { ) )} -
+ ); }; diff --git a/src/categories/components/CategoryProductList/CategoryProductList.tsx b/src/categories/components/CategoryProductList/CategoryProductList.tsx index 82499e54f..50fe397a4 100644 --- a/src/categories/components/CategoryProductList/CategoryProductList.tsx +++ b/src/categories/components/CategoryProductList/CategoryProductList.tsx @@ -1,11 +1,11 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; import TableRow from "@material-ui/core/TableRow"; import Checkbox from "@saleor/components/Checkbox"; import Money from "@saleor/components/Money"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import StatusLabel from "@saleor/components/StatusLabel"; import { FormattedMessage, useIntl } from "react-intl"; @@ -98,7 +98,7 @@ export const CategoryProductList: React.FC< return (
- + @@ -229,7 +229,7 @@ export const CategoryProductList: React.FC< ) )} -
+
); }; diff --git a/src/collections/components/CollectionList/CollectionList.tsx b/src/collections/components/CollectionList/CollectionList.tsx index e54764f5d..46953f107 100644 --- a/src/collections/components/CollectionList/CollectionList.tsx +++ b/src/collections/components/CollectionList/CollectionList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -8,6 +7,7 @@ import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import Checkbox from "@saleor/components/Checkbox"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import StatusLabel from "@saleor/components/StatusLabel"; import TableHead from "@saleor/components/TableHead"; @@ -68,7 +68,7 @@ const CollectionList: React.FC = props => { const intl = useIntl(); return ( - + = props => { ) )} -
+ ); }; diff --git a/src/collections/components/CollectionProducts/CollectionProducts.tsx b/src/collections/components/CollectionProducts/CollectionProducts.tsx index 871ba72b6..6d007651b 100644 --- a/src/collections/components/CollectionProducts/CollectionProducts.tsx +++ b/src/collections/components/CollectionProducts/CollectionProducts.tsx @@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import IconButton from "@material-ui/core/IconButton"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -13,6 +12,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import StatusLabel from "@saleor/components/StatusLabel"; import TableCellAvatar, { @@ -114,7 +114,7 @@ const CollectionProducts: React.FC = props => { } /> - + = props => { ) )} -
+ ); }; diff --git a/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx b/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx index d58a01ba8..cecd2b136 100644 --- a/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx +++ b/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx @@ -5,7 +5,6 @@ import DialogActions from "@material-ui/core/DialogActions"; import DialogContent from "@material-ui/core/DialogContent"; import DialogTitle from "@material-ui/core/DialogTitle"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableRow from "@material-ui/core/TableRow"; @@ -17,6 +16,7 @@ import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import FormSpacer from "@saleor/components/FormSpacer"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import useSearchQuery from "@saleor/hooks/useSearchQuery"; import { buttonMessages } from "@saleor/intl"; import { SearchCategories_search_edges_node } from "../../containers/SearchCategories/types/SearchCategories"; @@ -123,7 +123,7 @@ const AssignCategoriesDialog: React.FC = props => { }} /> - + {categories && categories.map(category => { @@ -156,7 +156,7 @@ const AssignCategoriesDialog: React.FC = props => { ); })} -
+ } /> - + @@ -143,7 +143,7 @@ const CustomerOrders: React.FC = props => { ) )} -
+ ); }; diff --git a/src/discounts/components/DiscountCategories/DiscountCategories.tsx b/src/discounts/components/DiscountCategories/DiscountCategories.tsx index c7e60843a..fb1263b77 100644 --- a/src/discounts/components/DiscountCategories/DiscountCategories.tsx +++ b/src/discounts/components/DiscountCategories/DiscountCategories.tsx @@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import IconButton from "@material-ui/core/IconButton"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -13,6 +12,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -84,7 +84,7 @@ const DiscountCategories: React.FC = props => { } /> - + = props => { ) )} -
+ ); }; diff --git a/src/discounts/components/DiscountCollections/DiscountCollections.tsx b/src/discounts/components/DiscountCollections/DiscountCollections.tsx index b903b2cee..0d196c4b2 100644 --- a/src/discounts/components/DiscountCollections/DiscountCollections.tsx +++ b/src/discounts/components/DiscountCollections/DiscountCollections.tsx @@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import IconButton from "@material-ui/core/IconButton"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -13,6 +12,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -84,7 +84,7 @@ const DiscountCollections: React.FC = props => { } /> - + = props => { ) )} -
+ ); }; diff --git a/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx b/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx index 5a865c866..160345883 100644 --- a/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx +++ b/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx @@ -4,7 +4,6 @@ import DialogActions from "@material-ui/core/DialogActions"; import DialogContent from "@material-ui/core/DialogContent"; import DialogTitle from "@material-ui/core/DialogTitle"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableRow from "@material-ui/core/TableRow"; @@ -21,6 +20,7 @@ import ConfirmButton, { import Form from "@saleor/components/Form"; import FormSpacer from "@saleor/components/FormSpacer"; import Hr from "@saleor/components/Hr"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; // tslint:disable no-submodule-imports import { ShopInfo_shop_countries } from "@saleor/components/Shop/types/ShopInfo"; import { buttonMessages } from "@saleor/intl"; @@ -122,7 +122,7 @@ const DiscountCountrySelectDialog: React.FC< description="country selection" /> - + {filter(countries, data.query, { key: "country" @@ -164,7 +164,7 @@ const DiscountCountrySelectDialog: React.FC< ); })} -
+ } /> - + = props => { ) )} -
+ ); }; diff --git a/src/discounts/components/SaleList/SaleList.tsx b/src/discounts/components/SaleList/SaleList.tsx index 5cdcedae1..c3a31884e 100644 --- a/src/discounts/components/SaleList/SaleList.tsx +++ b/src/discounts/components/SaleList/SaleList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -11,6 +10,7 @@ import Checkbox from "@saleor/components/Checkbox"; import Date from "@saleor/components/Date"; import Money from "@saleor/components/Money"; import Percent from "@saleor/components/Percent"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -77,7 +77,7 @@ const SaleList: React.FC = props => { const classes = useStyles(props); return ( - + = props => { ) )} -
+ ); }; SaleList.displayName = "SaleList"; diff --git a/src/discounts/components/VoucherList/VoucherList.tsx b/src/discounts/components/VoucherList/VoucherList.tsx index 9ed3c1974..45afba2d3 100644 --- a/src/discounts/components/VoucherList/VoucherList.tsx +++ b/src/discounts/components/VoucherList/VoucherList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -11,6 +10,7 @@ import Checkbox from "@saleor/components/Checkbox"; import Date from "@saleor/components/Date"; import Money from "@saleor/components/Money"; import Percent from "@saleor/components/Percent"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -92,7 +92,7 @@ const VoucherList: React.FC = props => { const classes = useStyles(props); return ( - + = props => { ) )} -
+ ); }; VoucherList.displayName = "VoucherList"; diff --git a/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx b/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx index f7c311d69..a7318cb5b 100644 --- a/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx +++ b/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx @@ -1,6 +1,5 @@ import Card from "@material-ui/core/Card"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableRow from "@material-ui/core/TableRow"; @@ -10,6 +9,7 @@ import React from "react"; import { FormattedMessage } from "react-intl"; import RequirePermissions from "@saleor/components/RequirePermissions"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import { UserPermissionProps } from "@saleor/types"; import { PermissionEnum } from "@saleor/types/globalTypes"; @@ -47,7 +47,7 @@ const HomeNotificationTable: React.FC = props => { return ( - + = props => { -
+ ); }; diff --git a/src/home/components/HomeProductListCard/HomeProductListCard.tsx b/src/home/components/HomeProductListCard/HomeProductListCard.tsx index 215ad30d4..2854c922d 100644 --- a/src/home/components/HomeProductListCard/HomeProductListCard.tsx +++ b/src/home/components/HomeProductListCard/HomeProductListCard.tsx @@ -1,6 +1,5 @@ import Card from "@material-ui/core/Card"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableRow from "@material-ui/core/TableRow"; @@ -11,6 +10,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; import Money from "@saleor/components/Money"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableCellAvatar from "@saleor/components/TableCellAvatar"; import { maybe, renderCollection } from "../../../misc"; @@ -58,7 +58,7 @@ export const HomeProductList: React.FC = props => { id: "homeProductsListCardHeader" })} /> - + {renderCollection( topProducts, @@ -139,7 +139,7 @@ export const HomeProductList: React.FC = props => { ) )} -
+ ); }; diff --git a/src/navigation/components/MenuList/MenuList.tsx b/src/navigation/components/MenuList/MenuList.tsx index 191b0a19f..e5bb1343c 100644 --- a/src/navigation/components/MenuList/MenuList.tsx +++ b/src/navigation/components/MenuList/MenuList.tsx @@ -1,6 +1,5 @@ import Card from "@material-ui/core/Card"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -11,6 +10,7 @@ import { FormattedMessage } from "react-intl"; import Checkbox from "@saleor/components/Checkbox"; import IconButtonTableCell from "@saleor/components/IconButtonTableCell"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -65,7 +65,7 @@ const MenuList: React.FC = props => { return ( - + = props => { ) )} -
+ ); }; diff --git a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx index 6b4d2d18d..cde3c7bf9 100644 --- a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx @@ -1,6 +1,5 @@ import IconButton from "@material-ui/core/IconButton"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; @@ -14,6 +13,7 @@ import { FormattedMessage } from "react-intl"; import { DebounceForm } from "@saleor/components/DebounceForm"; import Form from "@saleor/components/Form"; import Money from "@saleor/components/Money"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableCellAvatar, { AVATAR_MARGIN @@ -76,7 +76,7 @@ const OrderDraftDetailsProducts: React.FC< const classes = useStyles(props); return ( - + {maybe(() => !!lines.length) && ( @@ -187,7 +187,7 @@ const OrderDraftDetailsProducts: React.FC< )) )} -
+ ); }; OrderDraftDetailsProducts.displayName = "OrderDraftDetailsProducts"; diff --git a/src/orders/components/OrderDraftList/OrderDraftList.tsx b/src/orders/components/OrderDraftList/OrderDraftList.tsx index 41cbe6751..6e7cb3add 100644 --- a/src/orders/components/OrderDraftList/OrderDraftList.tsx +++ b/src/orders/components/OrderDraftList/OrderDraftList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -10,6 +9,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import Checkbox from "@saleor/components/Checkbox"; import { DateTime } from "@saleor/components/Date"; import Money from "@saleor/components/Money"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -83,7 +83,7 @@ export const OrderDraftList: React.FC = props => { : undefined; return ( - + = props => { ) )} -
+ ); }; OrderDraftList.displayName = "OrderDraftList"; diff --git a/src/orders/components/OrderFulfillment/OrderFulfillment.tsx b/src/orders/components/OrderFulfillment/OrderFulfillment.tsx index a3be33a78..c3399ee1f 100644 --- a/src/orders/components/OrderFulfillment/OrderFulfillment.tsx +++ b/src/orders/components/OrderFulfillment/OrderFulfillment.tsx @@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import CardActions from "@material-ui/core/CardActions"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; @@ -14,6 +13,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import CardMenu from "@saleor/components/CardMenu"; import CardTitle from "@saleor/components/CardTitle"; import Money from "@saleor/components/Money"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import StatusLabel from "@saleor/components/StatusLabel"; import TableCellAvatar, { @@ -142,7 +142,7 @@ const OrderFulfillment: React.FC = props => { ) } /> - + @@ -226,7 +226,7 @@ const OrderFulfillment: React.FC = props => { )} -
+ {status === FulfillmentStatus.FULFILLED && !fulfillment.trackingNumber && ( } /> - + = props => { ) )} -
+ ); }; diff --git a/src/productTypes/components/ProductTypeList/ProductTypeList.tsx b/src/productTypes/components/ProductTypeList/ProductTypeList.tsx index eb45189aa..17eb98f4d 100644 --- a/src/productTypes/components/ProductTypeList/ProductTypeList.tsx +++ b/src/productTypes/components/ProductTypeList/ProductTypeList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -9,6 +8,7 @@ import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import Checkbox from "@saleor/components/Checkbox"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -61,7 +61,7 @@ const ProductTypeList: React.FC = props => { const intl = useIntl(); return ( - + = props => { ) )} -
+ ); }; ProductTypeList.displayName = "ProductTypeList"; diff --git a/src/products/components/ProductList/ProductList.tsx b/src/products/components/ProductList/ProductList.tsx index 2040e6235..14210ce09 100644 --- a/src/products/components/ProductList/ProductList.tsx +++ b/src/products/components/ProductList/ProductList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -10,6 +9,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import Checkbox from "@saleor/components/Checkbox"; import Money from "@saleor/components/Money"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import StatusLabel from "@saleor/components/StatusLabel"; import TableCellAvatar, { @@ -131,7 +131,7 @@ export const ProductList: React.FC = props => { return (
- + @@ -392,7 +392,7 @@ export const ProductList: React.FC = props => { ) )} -
+
); }; diff --git a/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx b/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx index 8e3dc7661..4e1e7ae6a 100644 --- a/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx +++ b/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx @@ -1,7 +1,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableRow from "@material-ui/core/TableRow"; @@ -10,6 +9,7 @@ import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableCellAvatar from "@saleor/components/TableCellAvatar"; import { maybe, renderCollection } from "../../../misc"; @@ -64,7 +64,7 @@ const ProductVariantNavigation: React.FC< description: "section header" })} /> - + {renderCollection(variants, variant => ( )} -
+ ); }; diff --git a/src/products/components/ProductVariants/ProductVariants.tsx b/src/products/components/ProductVariants/ProductVariants.tsx index 3e81ee4f2..6e46489a9 100644 --- a/src/products/components/ProductVariants/ProductVariants.tsx +++ b/src/products/components/ProductVariants/ProductVariants.tsx @@ -3,7 +3,6 @@ import Card from "@material-ui/core/Card"; import CardContent from "@material-ui/core/CardContent"; import Hidden from "@material-ui/core/Hidden"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableRow from "@material-ui/core/TableRow"; @@ -14,6 +13,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; import Money from "@saleor/components/Money"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import StatusLabel from "@saleor/components/StatusLabel"; import TableHead from "@saleor/components/TableHead"; @@ -133,7 +133,7 @@ export const ProductVariants: React.FC = props => { )} {hasVariants && ( - + = props => { ); })} -
+ )} ); diff --git a/src/services/components/ServiceList/ServiceList.tsx b/src/services/components/ServiceList/ServiceList.tsx index 576b87f22..0a68c2216 100644 --- a/src/services/components/ServiceList/ServiceList.tsx +++ b/src/services/components/ServiceList/ServiceList.tsx @@ -1,6 +1,5 @@ import IconButton from "@material-ui/core/IconButton"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -12,6 +11,7 @@ import EditIcon from "@material-ui/icons/Edit"; import React from "react"; import { FormattedMessage } from "react-intl"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TablePagination from "@saleor/components/TablePagination"; import { maybe, renderCollection, stopPropagation } from "@saleor/misc"; @@ -68,7 +68,7 @@ const ServiceList: React.FC = props => { const classes = useStyles(props); return ( - + @@ -154,7 +154,7 @@ const ServiceList: React.FC = props => { ) )} -
+ ); }; ServiceList.displayName = "ServiceList"; diff --git a/src/services/components/ServiceTokens/ServiceTokens.tsx b/src/services/components/ServiceTokens/ServiceTokens.tsx index fee1fb703..7568847ea 100644 --- a/src/services/components/ServiceTokens/ServiceTokens.tsx +++ b/src/services/components/ServiceTokens/ServiceTokens.tsx @@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import IconButton from "@material-ui/core/IconButton"; import makeStyles from "@material-ui/core/styles/makeStyles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; @@ -12,6 +11,7 @@ import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import { maybe, renderCollection } from "@saleor/misc"; import { ServiceDetailsFragment_tokens } from "@saleor/services/types/ServiceDetailsFragment"; @@ -64,7 +64,7 @@ const ServiceTokens: React.FC = props => { } /> - + @@ -117,7 +117,7 @@ const ServiceTokens: React.FC = props => { ) )} -
+ ); }; diff --git a/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx b/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx index 0503a31f0..9895bf892 100644 --- a/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx +++ b/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx @@ -4,7 +4,6 @@ import DialogActions from "@material-ui/core/DialogActions"; import DialogContent from "@material-ui/core/DialogContent"; import DialogTitle from "@material-ui/core/DialogTitle"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableRow from "@material-ui/core/TableRow"; @@ -21,6 +20,7 @@ import ConfirmButton, { import Form from "@saleor/components/Form"; import FormSpacer from "@saleor/components/FormSpacer"; import Hr from "@saleor/components/Hr"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import { ShopInfo_shop_countries } from "@saleor/components/Shop/types/ShopInfo"; import { buttonMessages } from "@saleor/intl"; @@ -122,7 +122,7 @@ const ShippingZoneCountriesAssignDialog: React.FC< - + @@ -149,7 +149,7 @@ const ShippingZoneCountriesAssignDialog: React.FC< -
+ @@ -159,7 +159,7 @@ const ShippingZoneCountriesAssignDialog: React.FC< description="country selection" /> - + {filter(countries, data.query, { key: "country" @@ -201,7 +201,7 @@ const ShippingZoneCountriesAssignDialog: React.FC< ); })} -
+ } /> - + @@ -172,7 +172,7 @@ const ShippingZoneRates: React.FC = props => { ) )} -
+ ); }; diff --git a/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx b/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx index aa7f12cd2..15c0ac7c2 100644 --- a/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx +++ b/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx @@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import IconButton from "@material-ui/core/IconButton"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -13,6 +12,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; @@ -88,7 +88,7 @@ const ShippingZonesList: React.FC = props => { } /> - + = props => { ) )} -
+ ); }; diff --git a/src/siteSettings/components/SiteSettingsKeys/SiteSettingsKeys.tsx b/src/siteSettings/components/SiteSettingsKeys/SiteSettingsKeys.tsx index 995cf39d3..fa3cb16a4 100644 --- a/src/siteSettings/components/SiteSettingsKeys/SiteSettingsKeys.tsx +++ b/src/siteSettings/components/SiteSettingsKeys/SiteSettingsKeys.tsx @@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button"; import Card from "@material-ui/core/Card"; import IconButton from "@material-ui/core/IconButton"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; @@ -12,6 +11,7 @@ import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import CardTitle from "@saleor/components/CardTitle"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import { authorizationKeyTypes, maybe, renderCollection } from "../../../misc"; import { ICONBUTTON_SIZE } from "../../../theme"; @@ -58,7 +58,7 @@ const SiteSettingsKeys: React.FC = props => { } /> - + @@ -109,7 +109,7 @@ const SiteSettingsKeys: React.FC = props => { ) )} -
+ ); }; diff --git a/src/staff/components/StaffList/StaffList.tsx b/src/staff/components/StaffList/StaffList.tsx index 1c65cd16f..ede1d6b7d 100644 --- a/src/staff/components/StaffList/StaffList.tsx +++ b/src/staff/components/StaffList/StaffList.tsx @@ -1,5 +1,4 @@ import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -10,6 +9,7 @@ import classNames from "classnames"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TablePagination from "@saleor/components/TablePagination"; import { @@ -78,7 +78,7 @@ const StaffList: React.FC = props => { const intl = useIntl(); return ( - + @@ -167,7 +167,7 @@ const StaffList: React.FC = props => { ) )} -
+ ); }; StaffList.displayName = "StaffList"; diff --git a/src/storybook/stories/components/EditableTableCell.tsx b/src/storybook/stories/components/EditableTableCell.tsx index e9d7a87e4..90b6171d6 100644 --- a/src/storybook/stories/components/EditableTableCell.tsx +++ b/src/storybook/stories/components/EditableTableCell.tsx @@ -1,4 +1,3 @@ -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; @@ -7,6 +6,7 @@ import { storiesOf } from "@storybook/react"; import React from "react"; import EditableTableCell from "@saleor/components/EditableTableCell"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import CardDecorator from "../../CardDecorator"; import Decorator from "../../Decorator"; @@ -14,7 +14,7 @@ storiesOf("Generics / EditableTableCell", module) .addDecorator(CardDecorator) .addDecorator(Decorator) .add("default", () => ( - + Some header Some header @@ -30,5 +30,5 @@ storiesOf("Generics / EditableTableCell", module) Some value -
+ )); diff --git a/src/storybook/stories/components/TablePagination.tsx b/src/storybook/stories/components/TablePagination.tsx index 9151647ee..e25557a7e 100644 --- a/src/storybook/stories/components/TablePagination.tsx +++ b/src/storybook/stories/components/TablePagination.tsx @@ -1,7 +1,7 @@ -import Table from "@material-ui/core/Table"; import { storiesOf } from "@storybook/react"; import React from "react"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import TablePagination from "@saleor/components/TablePagination"; import CardDecorator from "../../CardDecorator"; import Decorator from "../../Decorator"; @@ -10,7 +10,7 @@ storiesOf("Generics / TablePagination", module) .addDecorator(CardDecorator) .addDecorator(Decorator) .add("no previous / next page", () => ( - + -
+ )) .add("previous page available", () => ( - + -
+ )) .add("next page available", () => ( - + -
+ )) .add("both previous and next pages are available", () => ( - + -
+ )); diff --git a/src/taxes/components/CountryList/CountryList.tsx b/src/taxes/components/CountryList/CountryList.tsx index 97235b2cd..6eeeabb88 100644 --- a/src/taxes/components/CountryList/CountryList.tsx +++ b/src/taxes/components/CountryList/CountryList.tsx @@ -1,6 +1,5 @@ import Card from "@material-ui/core/Card"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; @@ -9,6 +8,7 @@ import classNames from "classnames"; import React from "react"; import { FormattedMessage } from "react-intl"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import { maybe, renderCollection } from "../../../misc"; import { CountryList_shop_countries } from "../../types/CountryList"; @@ -34,7 +34,7 @@ const CountryList: React.FC = props => { return ( - + @@ -83,7 +83,7 @@ const CountryList: React.FC = props => { ) )} -
+ ); }; diff --git a/src/taxes/components/CountryTaxesPage/CountryTaxesPage.tsx b/src/taxes/components/CountryTaxesPage/CountryTaxesPage.tsx index 9cd0a2e76..93c988c28 100644 --- a/src/taxes/components/CountryTaxesPage/CountryTaxesPage.tsx +++ b/src/taxes/components/CountryTaxesPage/CountryTaxesPage.tsx @@ -1,6 +1,5 @@ import Card from "@material-ui/core/Card"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; @@ -12,6 +11,7 @@ import AppHeader from "@saleor/components/AppHeader"; import { Container } from "@saleor/components/Container"; import Grid from "@saleor/components/Grid"; import PageHeader from "@saleor/components/PageHeader"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import { sectionNames } from "@saleor/intl"; import { TaxRateType } from "@saleor/types/globalTypes"; @@ -165,7 +165,7 @@ const CountryTaxesPage: React.FC = props => {
- + @@ -206,7 +206,7 @@ const CountryTaxesPage: React.FC = props => { ) )} -
+
diff --git a/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx b/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx index dc2751710..2b58938f7 100644 --- a/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx +++ b/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx @@ -1,6 +1,5 @@ import { Omit } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -12,6 +11,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import { ListProps } from "../../../types"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TablePagination from "@saleor/components/TablePagination"; import { maybe, renderCollection } from "../../../misc"; @@ -58,7 +58,7 @@ const TranslationsEntitiesList: React.FC< const intl = useIntl(); return ( - + @@ -126,7 +126,7 @@ const TranslationsEntitiesList: React.FC< ) )} -
+ ); }; TranslationsEntitiesList.displayName = "TranslationsEntitiesList"; diff --git a/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx b/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx index 7400c15ea..e613d7a72 100644 --- a/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx +++ b/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx @@ -1,6 +1,5 @@ import Card from "@material-ui/core/Card"; import { makeStyles } from "@material-ui/core/styles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableHead from "@material-ui/core/TableHead"; @@ -8,6 +7,7 @@ import TableRow from "@material-ui/core/TableRow"; import React from "react"; import { FormattedMessage } from "react-intl"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import { ShopInfo_shop_languages } from "@saleor/components/Shop/types/ShopInfo"; import Skeleton from "@saleor/components/Skeleton"; import { maybe, renderCollection } from "../../../misc"; @@ -35,7 +35,7 @@ const TranslationsLanguageList: React.FC< return ( - + @@ -70,7 +70,7 @@ const TranslationsLanguageList: React.FC< ) )} -
+ ); }; diff --git a/src/webhooks/components/WebhooksList/WebhooksList.tsx b/src/webhooks/components/WebhooksList/WebhooksList.tsx index 69f409036..2b9015983 100644 --- a/src/webhooks/components/WebhooksList/WebhooksList.tsx +++ b/src/webhooks/components/WebhooksList/WebhooksList.tsx @@ -1,6 +1,5 @@ import IconButton from "@material-ui/core/IconButton"; import makeStyles from "@material-ui/core/styles/makeStyles"; -import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; import TableCell from "@material-ui/core/TableCell"; import TableFooter from "@material-ui/core/TableFooter"; @@ -11,6 +10,7 @@ import EditIcon from "@material-ui/icons/Edit"; import React from "react"; import { useIntl } from "react-intl"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TablePagination from "@saleor/components/TablePagination"; import { maybe, renderCollection, stopPropagation } from "@saleor/misc"; @@ -68,7 +68,7 @@ const WebhooksList: React.FC = ({ const classes = useStyles({}); return ( - + @@ -156,7 +156,7 @@ const WebhooksList: React.FC = ({ ) )} -
+ ); }; WebhooksList.displayName = "WebhooksList"; From 8e4a5b25f5d3dc61e7ac2defed30b57b875f5a74 Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 20:31:23 +0100 Subject: [PATCH 04/18] Fix page header on mobile --- src/components/AppHeader/AppHeader.tsx | 11 +++++++++-- .../ExtendedPageHeader/ExtendedPageHeader.tsx | 10 ++++++++-- src/components/PageHeader/PageHeader.tsx | 5 +++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/components/AppHeader/AppHeader.tsx b/src/components/AppHeader/AppHeader.tsx index 07f2e815e..f7e941fba 100644 --- a/src/components/AppHeader/AppHeader.tsx +++ b/src/components/AppHeader/AppHeader.tsx @@ -30,7 +30,10 @@ const useStyles = makeStyles(theme => ({ cursor: "pointer", display: "flex", marginTop: theme.spacing(0.5), - transition: theme.transitions.duration.standard + "ms" + transition: theme.transitions.duration.standard + "ms", + [theme.breakpoints.down("sm")]: { + display: "none" + } }, skeleton: { marginBottom: theme.spacing(2), @@ -40,9 +43,13 @@ const useStyles = makeStyles(theme => ({ color: "inherit", flex: 1, marginLeft: theme.spacing(), - textTransform: "uppercase" + textTransform: "uppercase", + [theme.breakpoints.down("sm")]: { + display: "none" + } } })); + const AppHeader: React.FC = props => { const { children, onBack } = props; diff --git a/src/components/ExtendedPageHeader/ExtendedPageHeader.tsx b/src/components/ExtendedPageHeader/ExtendedPageHeader.tsx index 70d1c6a1a..5972b3619 100644 --- a/src/components/ExtendedPageHeader/ExtendedPageHeader.tsx +++ b/src/components/ExtendedPageHeader/ExtendedPageHeader.tsx @@ -4,7 +4,10 @@ import React from "react"; const useStyles = makeStyles(theme => ({ action: { - flex: "0 0 auto" + flex: "0 0 auto", + [theme.breakpoints.down("sm")]: { + paddingLeft: 10 + } }, grid: { padding: theme.spacing(2) @@ -18,7 +21,10 @@ const useStyles = makeStyles(theme => ({ root: { alignItems: "center", display: "flex", - marginBottom: theme.spacing(3) + marginBottom: theme.spacing(3), + [theme.breakpoints.down("sm")]: { + display: "block" + } }, subtitle: { alignItems: "center", diff --git a/src/components/PageHeader/PageHeader.tsx b/src/components/PageHeader/PageHeader.tsx index a78c57737..3800a254e 100644 --- a/src/components/PageHeader/PageHeader.tsx +++ b/src/components/PageHeader/PageHeader.tsx @@ -10,6 +10,11 @@ const useStyles = makeStyles(theme => ({ display: "flex" }, title: { + [theme.breakpoints.down("sm")]: { + fontSize: 20, + paddingBottom: 20, + paddingLeft: 10 + }, flex: 1, fontSize: 24, paddingBottom: theme.spacing(2) From ac8dabf34d1ac65bd190e8da463039dfbe8928af Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 20:32:57 +0100 Subject: [PATCH 05/18] Fix configuration grid on mobile --- src/configuration/ConfigurationPage.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/configuration/ConfigurationPage.tsx b/src/configuration/ConfigurationPage.tsx index ce6976363..4e2e0a1e5 100644 --- a/src/configuration/ConfigurationPage.tsx +++ b/src/configuration/ConfigurationPage.tsx @@ -61,6 +61,9 @@ const useStyles = makeStyles(theme => ({ paddingTop: theme.spacing(3) }, configurationItem: { + [theme.breakpoints.down("md")]: { + gridTemplateColumns: "1fr" + }, display: "grid", gridColumnGap: theme.spacing(4), gridTemplateColumns: "1fr 1fr" From f2caca15fecf1e15a9e322c652cf1714cd121007 Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 20:44:17 +0100 Subject: [PATCH 06/18] Fix menu mobile --- src/components/AppLayout/MenuNested.tsx | 8 ++++---- src/components/AppLayout/ResponsiveDrawer.tsx | 8 ++++++-- src/components/AppLayout/consts.ts | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/components/AppLayout/MenuNested.tsx b/src/components/AppLayout/MenuNested.tsx index 4b486f21d..85ed202bb 100644 --- a/src/components/AppLayout/MenuNested.tsx +++ b/src/components/AppLayout/MenuNested.tsx @@ -8,7 +8,7 @@ import SVG from "react-inlinesvg"; import menuArrowIcon from "@assets/images/menu-arrow-icon.svg"; import useTheme from "@saleor/hooks/useTheme"; import { createHref } from "@saleor/misc"; -import { drawerWidthExpanded } from "./consts"; +import { drawerWidthExpanded, drawerWidthExpandedMobile } from "./consts"; import { IActiveSubMenu } from "./MenuList"; import { IMenuItem } from "./menuStructure"; @@ -26,9 +26,9 @@ const useStyles = makeStyles(theme => ({ menuListNestedClose: { "& svg": { fill: theme.palette.primary.main, - left: 7, + left: 11, position: "relative", - top: -2 + top: 1 }, border: `solid 1px #EAEAEA`, borderRadius: "100%", @@ -71,7 +71,7 @@ const useStyles = makeStyles(theme => ({ menuListNestedOpen: { [theme.breakpoints.down("sm")]: { right: 0, - width: drawerWidthExpanded, + width: drawerWidthExpandedMobile, zIndex: 2 }, right: -300, diff --git a/src/components/AppLayout/ResponsiveDrawer.tsx b/src/components/AppLayout/ResponsiveDrawer.tsx index 6925a5076..86f1dbb83 100644 --- a/src/components/AppLayout/ResponsiveDrawer.tsx +++ b/src/components/AppLayout/ResponsiveDrawer.tsx @@ -2,7 +2,11 @@ import Drawer from "@material-ui/core/Drawer"; import Hidden from "@material-ui/core/Hidden"; import { makeStyles } from "@material-ui/core/styles"; import React from "react"; -import { drawerWidth, drawerWidthExpanded } from "./consts"; +import { + drawerWidth, + drawerWidthExpanded, + drawerWidthExpandedMobile +} from "./consts"; const useStyles = makeStyles( theme => ({ @@ -22,7 +26,7 @@ const useStyles = makeStyles( width: drawerWidth }, drawerMobile: { - width: drawerWidthExpanded + width: drawerWidthExpandedMobile } }), { name: "ResponsiveDrawer" } diff --git a/src/components/AppLayout/consts.ts b/src/components/AppLayout/consts.ts index 342ad7b55..a513c3112 100644 --- a/src/components/AppLayout/consts.ts +++ b/src/components/AppLayout/consts.ts @@ -1,4 +1,5 @@ export const drawerWidthExpanded = 210; +export const drawerWidthExpandedMobile = 250; export const drawerWidth = 80; export const navigationBarHeight = 64; export const appLoaderHeight = 4; From 89d351ccc6ac990f3262552f9edabb2080f52d83 Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 21:31:49 +0100 Subject: [PATCH 07/18] Fix dialog tables on mobile --- .../ResponsiveTable/ResponsiveTable.tsx | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/components/ResponsiveTable/ResponsiveTable.tsx b/src/components/ResponsiveTable/ResponsiveTable.tsx index 370539458..b886bb066 100644 --- a/src/components/ResponsiveTable/ResponsiveTable.tsx +++ b/src/components/ResponsiveTable/ResponsiveTable.tsx @@ -1,20 +1,20 @@ -import { Theme } from "@material-ui/core/styles"; import Table from "@material-ui/core/Table"; -import { makeStyles } from "@material-ui/styles"; +import makeStyles from "@material-ui/core/styles/makeStyles"; import React from "react"; const useStyles = makeStyles( - (theme: Theme) => ({ - [theme.breakpoints.up("sm")]: { - "& table": { - tableLayout: "fixed" - } - }, + theme => ({ root: { + [theme.breakpoints.up("sm")]: { + "& table": { + tableLayout: "fixed" + } + }, "& table": { tableLayout: "auto" }, - overflowX: "auto" + overflowX: "auto", + width: "100%" } }), { @@ -29,15 +29,13 @@ interface ResponsiveTableProps { } const ResponsiveTable: React.FC = props => { - const { children, className, key } = props; + const { children, className } = props; const classes = useStyles(props); return (
- - {children} -
+ {children}
); }; From d4d91f5fe2feeb835cf1452b479d3227849212fd Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 21:36:11 +0100 Subject: [PATCH 08/18] Fix order details header mobile --- src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index e26c1b47a..9e53e3851 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -29,6 +29,7 @@ const useStyles = makeStyles(theme => ({ marginTop: -theme.spacing(2) }, header: { + display: "flex", marginBottom: 0 } })); From 0ab414ab33a8a49cff880d16d3ac7cbf4d82d9ac Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 22:01:36 +0100 Subject: [PATCH 09/18] Update snapshots --- .../__snapshots__/Stories.test.ts.snap | 64232 ++++++++-------- 1 file changed, 32484 insertions(+), 31748 deletions(-) diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index 2ee2c975f..b8570bfc7 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -1245,61 +1245,65 @@ exports[`Storyshots Generics / EditableTableCell default 1`] = `
- - - - - - - - - - - - + + + + + - Some value - - - -
- Some header - - Some header - - Some header -
- Some value - -
+
- Some editable text - - - + + Some header + + Some header +
+ + Some value + + +
+ Some editable text +
+ + + Some value + + + + +
@@ -5583,83 +5587,87 @@ exports[`Storyshots Generics / Table header ascending 1`] = ` class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id" style="margin:auto;width:400px" > - - - - - - - - - + + + - - - - -
-
- Name +
+ Name +
+
- -
- 		-
+
- Type +
+ Type +
- -
- Apple Juice - - Juice -
+ + Apple Juice + + + Juice + + + + + `; @@ -5672,83 +5680,87 @@ exports[`Storyshots Generics / Table header descending 1`] = ` class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id" style="margin:auto;width:400px" > - - - - - - - - - + + + - - - - -
-
- Name +
+ Name +
+
- -
- 		-
+
- Type +
+ Type +
- -
- Apple Juice - - Juice -
+ + Apple Juice + + + Juice + + + + + `; @@ -5761,83 +5773,87 @@ exports[`Storyshots Generics / Table header interactive 1`] = ` class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id" style="margin:auto;width:400px" > - - - - - - - - - + + + - - - - -
-
- Name +
+ Name +
+
- -
- 		-
+
- Type +
+ Type +
- -
- Apple Juice - - Juice -
+ + Apple Juice + + + Juice + + + + + `; @@ -5853,82 +5869,86 @@ exports[`Storyshots Generics / TablePagination both previous and next pages are
- - - - + + - - -
-
+
-
- - + + + + +
- -
+ + + + +
@@ -5945,83 +5965,87 @@ exports[`Storyshots Generics / TablePagination next page available 1`] = `
- - - - + + - - -
-
+
-
- - + + + + +
- -
+ + + + +
@@ -6038,84 +6062,88 @@ exports[`Storyshots Generics / TablePagination no previous / next page 1`] = `
- - - - + + - - -
-
+
-
- - + + + + +
- -
+ + + + +
@@ -6132,83 +6160,87 @@ exports[`Storyshots Generics / TablePagination previous page available 1`] = `
- - - - + + - - -
-
+
-
- - + + + + +
- -
+ + + + +
@@ -8034,194 +8066,198 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = `
- - - - - - - - - + + + + + - - - - - - - + - - - - - -
- - Admin - - Default Store View - -
+ Admin + + Default Store View + +
- - - john-doe - - John Doe - - -
- + + + + + + + + - - - - - - - - - - milionare-pirate - - Milionare Pirate - - - + + -
+ + + + + + + + + + + milionare-pirate + + + Milionare Pirate + + + + + + + +
@@ -8667,194 +8703,198 @@ exports[`Storyshots Views / Attributes / Attribute details default 1`] = `
- - - - - - - - - + + + + + - - - - - - - + - - - - - -
- - Admin - - Default Store View - -
+ Admin + + Default Store View + +
- - - john-doe - - John Doe - - -
- + + + + + + + + - - - - - - - - - - milionare-pirate - - Milionare Pirate - - - + + -
+ + + + + + + + + + + milionare-pirate + + + Milionare Pirate + + + + + + + +
@@ -9305,194 +9345,198 @@ exports[`Storyshots Views / Attributes / Attribute details form errors 1`] = `
- - - - - - - - - + + + + + - - - - - - - + - - - - - -
- - Admin - - Default Store View - -
+ Admin + + Default Store View + +
- - - john-doe - - John Doe - - -
- + + + + + + + + - - - - - - - - - - milionare-pirate - - Milionare Pirate - - - + + -
+ + + + + + + + + + + milionare-pirate + + + Milionare Pirate + + + + + + + +
@@ -9952,127 +9996,131 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
- - - - - - - - - + + + + + - - - - + - - -
- - Admin - - Default Store View - -
+ Admin + + Default Store View + +
- - - - ‌ - - - - ‌ - - - - + ‌ - -
+ + + + ‌ + + + + + + + + +
@@ -10527,194 +10575,198 @@ exports[`Storyshots Views / Attributes / Attribute details multiple select input
- - - - - - - - - + + + + + - - - - - - - + - - - - - -
- - Admin - - Default Store View - -
+ Admin + + Default Store View + +
- - - john-doe - - John Doe - - -
- + + + + + + + + - - - - - - - - - - milionare-pirate - - Milionare Pirate - - - + + -
+ + + + + + + + + + + milionare-pirate + + + Milionare Pirate + + + + + + + +
@@ -11160,126 +11212,130 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
- - - - - - - - - + + + + + - - - - + - - -
- - Admin - - Default Store View - -
+ Admin + + Default Store View + +
- - - - ‌ - - - - ‌ - - - - + ‌ - -
+ + + + ‌ + + + + + + + + +
@@ -11588,805 +11644,809 @@ exports[`Storyshots Views / Attributes / Attribute list default 1`] = `
- - - - - - - - - - - - - - + + + + + + + + + - - - - + + + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - collar - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - size - - + + + + + + + - Size - - + + + + + + + - Yes - - + + + + + + + - Yes - - + + + + + + + - Yes - - - -
- - - Attribute Code - - Default Label - - Visible - - Searchable - - Use in faceted search -
-
-
-
- + +
+ Attribute Code + + Default Label + + Visible + + Searchable + + Use in faceted search +
+
+
+
- - - - - + + + + +
-
-
- - - author - - Author - - Yes - - Yes - - No -
- + - - - - box-size - - Box Size - - No - - Yes - - No -
- - - - - brand - - Brand - - No - - No - - Yes -
- - - - - candy-box-size - - Candy Box Size - - No - - Yes - - Yes -
- - - - - coffee-genre - - Coffee Genre - - Yes - - Yes - - Yes -
- - - - +
- Collar - - Yes - - No - - Yes -
- - - color - - Color - - Yes - - No - - No -
- + - - - - cover - - Cover - - No - - Yes - - No -
- - - - - flavor - - Flavor - - Yes - - Yes - - Yes -
- - - - - language - - Language - - Yes - - No - - Yes -
- - - - - publisher - - Publisher - - Yes - - Yes - - Yes -
- - - - +
+ + + brand + + Brand + + No + + No + + Yes +
+ + + candy-box-size + + Candy Box Size + + No + + Yes + + Yes +
+ + + coffee-genre + + Coffee Genre + + Yes + + Yes + + Yes +
+ + + collar + + Collar + + Yes + + No + + Yes +
+ + + + + color + + + Color + + + Yes + + + No + + + No + + + + + + + + cover + + + Cover + + + No + + + Yes + + + No + + + + + + + + flavor + + + Flavor + + + Yes + + + Yes + + + Yes + + + + + + + + language + + + Language + + + Yes + + + No + + + Yes + + + + + + + + publisher + + + Publisher + + + Yes + + + Yes + + + Yes + + + + + + + + size + + + Size + + + Yes + + + Yes + + + Yes + + + + +
@@ -12504,221 +12564,225 @@ exports[`Storyshots Views / Attributes / Attribute list loading 1`] = `
- - - - - - - - - - - - - - - - - - + + + + + + + + + + - + + + + + - + - + - + - + - + - - -
- - - Attribute Code - - Default Label - - Visible - - Searchable - - Use in faceted search -
-
-
-
- - -
-
-
+ Attribute Code + + Default Label + + Visible + + Searchable + + Use in faceted search +
- + + + +
+ - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -12836,139 +12900,143 @@ exports[`Storyshots Views / Attributes / Attribute list no data 1`] = `
- - - - - - - - - - - - + Attribute Code + + + + + + + + - - - - - + + + - - - -
- Attribute Code - - Default Label - - Visible - - Searchable - - Use in faceted search -
+ Default Label + + Visible + + Searchable + + Use in faceted search +
-
-
- - + + + + +
-
-
- No attributes found -
+ + No attributes found + + + + + @@ -14016,391 +14084,395 @@ exports[`Storyshots Views / Categories / Category list default 1`] = `
- - - - - - - - - - - + + + + + + + + + - + + + + - - - - - + - - - - - - - - - - - - - + - Excepteur sint occaecat cupidatat non proident - - - - - - - - - - - - + - - - - - - - + + - Neque porro quisquam est - - + + + + + - 11 - - + + + + + - 21 - - - -
- - - Category Name - - Subcategories - - No. of Products -
+ Category Name + + Subcategories + + No. of Products +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - - - -
- + - - - - Lorem ipsum dolor - - 2 - - 4 -
- - - - - Mauris vehicula tortor vulputate - - 54 - - 3 -
- - - - +
- 2 - - 6 -
- - - Ut enim ad minim veniam - - 6 - - 12 -
- + - - - - Duis aute irure dolor in reprehenderit - - 76 - - 43 -
- - - - + + 3 +
+ + + Excepteur sint occaecat cupidatat non proident + + 2 + + 6 +
+ + + Ut enim ad minim veniam + + 6 + + 12 +
+ + + + + Duis aute irure dolor in reprehenderit + + + 76 + + + 43 + + + + + + + + Neque porro quisquam est + + + 11 + + + 21 + + + + + @@ -14518,163 +14590,167 @@ exports[`Storyshots Views / Categories / Category list empty 1`] = `
- - - - - - - - - - + Category Name + + + + + + - - - - - + + + - - - -
- Category Name - - Subcategories - - No. of Products -
+ Subcategories + + No. of Products +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No categories found -
+ + No categories found + + + + + @@ -14792,217 +14868,221 @@ exports[`Storyshots Views / Categories / Category list loading 1`] = `
- - - - - - - - - - - + + + + + + + + + - - - - - + + + - - + - + - + - - -
- - - Category Name - - Subcategories - - No. of Products -
+ Category Name + + Subcategories + + No. of Products +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -16764,126 +16844,130 @@ Ctrl + K"
- - - - - - - - - - + Category Name + + + + + + - - - - - + + + - - - -
- Category Name - - Subcategories - - No. of Products -
+ Subcategories + + No. of Products +
-
-
- - + + + + +
-
-
- No subcategories found -
+ + No subcategories found + + + + + @@ -17454,186 +17538,190 @@ Ctrl + K"
- - - - - - - - - - - - - - - - + + + + + + + + - + + + + + - + - + - + - - -
- - - Category Name - - Subcategories - - No. of Products -
-
-
-
- - -
-
-
+ Category Name + + Subcategories + + No. of Products +
- + + + +
+ - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -18439,126 +18527,130 @@ Ctrl + K"
- - - - - - - - - - + Category Name + + + + + + - - - - - + + + - - - -
- Category Name - - Subcategories - - No. of Products -
+ Subcategories + + No. of Products +
-
-
- - + + + + +
-
-
- No subcategories found -
+ + No subcategories found + + + + + @@ -19413,151 +19505,155 @@ Ctrl + K"
- - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + - - - -
- - Name - - - Type - - Published - - Price -
-
-
-
- - -
-
-
+ Type + + Published + + Price +
- No products found -
+ +
+
+
+ + +
+
+ + + + + + + No products found + + + + +
@@ -20410,126 +20506,130 @@ Ctrl + K"
- - - - - - - - - - + Category Name + + + + + + - - - - - + + + - - - -
- Category Name - - Subcategories - - No. of Products -
+ Subcategories + + No. of Products +
-
-
- - + + + + +
-
-
- No subcategories found -
+ + No subcategories found + + + + + @@ -21384,747 +21484,751 @@ Ctrl + K"
- - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + - - - - - -
- - - - Name - - - Type - - Published - - Price -
-
-
-
- + +
+ + Name + + + Type + + Published + + Price +
+
+
+
- - - - - + +
+
+
+ + +
+
- - - - + +
+
+ Gardner-Schultz +
- -
- - - - -
+
- +
+ $83.30 +
+ - Coffee - -
- Published -
- 		- $83.30 -
- - -
+
- + +
+
+ James, Martinez and Murray +
+ + 		+ Coffee + +
+ Published +
+ 		+ $68.27 +
+ - Coffee - -
- Published -
- 		- $68.27 -
- - -
+
- + +
+
+ Curtis, Joyce and Turner +
+ + 		+ Coffee + +
+ Published +
+ 		+ $21.43 +
+ - Coffee - -
- Published -
- 		- $21.43 -
- - -
+
- + +
+
+ Davis, Brown and Ray +
+ + 		+ Coffee + +
+ Published +
+ 		+ $62.76 +
+ - Coffee - -
- Published -
- 		- $62.76 -
- - -
+
- + +
+
+ Gallegos Ltd +
+ + 		+ Coffee + +
+ Published +
+ 		+ $7.13 +
+ - Coffee - -
- Published -
- 		- $7.13 -
- - -
+
- + +
+
+ Franklin Inc +
+ + 		+ Coffee + +
+ Published +
+ 		+ $48.82 +
+ - Coffee - -
- Published -
- 		- $48.82 -
- - -
+
- + +
+
+ Williams-Taylor +
+ + 		+ Coffee + +
+ Published +
+ 		+ $27.34 +
+ - Coffee - -
- Published -
- 		- $27.34 -
- - -
+
- + +
+
+ Riddle, Evans and Hicks +
+ + 		+ Coffee + +
+ Published +
+ 		+ $75.42 +
+ - Coffee - -
- Published -
- 		- $75.42 -
- - -
+
- + +
+
+ Hebert-Sherman +
+ + 		+ Coffee + +
+ Published +
+ 		+ $86.62 +
+ - Coffee - -
- Published -
- 		- $86.62 -
- - -
+
- +
+ +
+
+ Carter and Sons +
-
- Carter and Sons -
- - 		- Coffee - -
+
- Published - - - $48.66 -
+ Coffee + + +
+ Published +
+ + + $48.66 + + + + +
@@ -22916,457 +23020,461 @@ Ctrl + K"
- - - - - - - - - - - - + + + + + + + - - - - + + + - - + - - - - - - + - + + + + + - - - - - - + - + + + + + - - - - - - + - + + + + + - - - - - -
- - - - Name - - - Type - - Published - -
-
-
-
- + +
+ + Name + + + Type + + Published + +
+
+
+
- - - - - + + + + +
-
-
- - -
-
- -
+ +
- Murray Inc -
- - 		- Mugs - -
- Published -
- 		- -
- - - - -
+
- +
+ +
+ +
- Williams-Taylor -
- - 		- Coffee - -
- Published -
- 		- -
- - - - -
+
- +
+ +
+ +
- Hebert-Sherman -
- - 		- Coffee - -
- Published -
- 		- -
- - - - -
+
- +
+ +
+ +
- Estes, Johnson and Graham -
- - 		- Books - -
- Published -
- 		- -
+ +
+ Estes, Johnson and Graham +
+ + + + Books + + +
+ Published +
+ + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - -
- - - - Name - - - Type - - Published - -
-
-
-
- - -
-
-
- - -
-
- -
-
- - ‌ - -
-
- 		- - ‌ - - - - ‌ - - - + + - + Name - - -
+ + + Type + + + Published + + + + + + + +
+
+
+ + +
+
+ + + + + + + + + +
+
+ +
+
+ + ‌ + +
+
+ + + + ‌ + + + + + ‌ + + + + + + + + +
- - - - - - - - - - - - - - - + + + + + + - - - -
- - Name - - - Type - - Published - -
-
-
-
- - -
-
-
+ Type + + Published + +
- - No products found -
+ +
+
+
+ + +
+
+ + + + + + + + No products found + + + + +
- - - - - - - - - - - + + + + + + + + + - + + + + + + + - - - - - + - - - - - + - - - - - - - - - + + - - - - - + - - - - - - - - - + + - - - - - + - - - - - - - - -
- - - Category Name - - No. of Products - - Availability -
+ Category Name + + No. of Products + + Availability +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - + + + + Summer collection + + 4 + +
+ Published
- -
+
- Summer collection - - 4 - -
+ + +
- Published - -
- - - - - Winter sale - - 4 - -
+
- Published - -
+ Published + +
- Vintage vibes - - 4 - -
+ + +
- Published - -
- - - - - Merry Christmas - - 4 - -
+
- Published - -
+ Published + +
- 80s Miami - - 4 - -
+ + +
- Published - -
- - - - - Yellow Submarine 2019 - - 4 - -
+
- Published - -
+
+ Published +
+ + + + + + + + 80s Miami + + + 4 + + +
+ Published +
+ + + + + + + + Yellow Submarine 2019 + + + 4 + + +
+ Published +
+ + + + +
@@ -26419,223 +26539,227 @@ exports[`Storyshots Views / Collections / Collection list loading 1`] = `
- - - - - - - - - - - + + + + + + + + + - - - - - + + + - - + - + - + - - -
- - - Category Name - - No. of Products - - Availability -
+ Category Name + + No. of Products + + Availability +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -26753,163 +26877,167 @@ exports[`Storyshots Views / Collections / Collection list no data 1`] = `
- - - - - - - - - - + Category Name + + + + + + - - - - - + + + - - - -
- Category Name - - No. of Products - - Availability -
+ No. of Products + + Availability +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No collections found -
+ + No collections found + + + + + @@ -32058,80 +32186,84 @@ exports[`Storyshots Views / Customers / Customer details default 1`] = `
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- #8234 - - - -
+
- Fully paid - - - $1,215.89 -
+ + + +
+ Fully paid +
+ + + $1,215.89 + + + + +
@@ -32586,80 +32718,84 @@ exports[`Storyshots Views / Customers / Customer details different addresses 1`]
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- #8234 - - - -
+
- Fully paid - - - $1,215.89 -
+ + + +
+ Fully paid +
+ + + $1,215.89 + + + + +
@@ -33166,80 +33302,84 @@ exports[`Storyshots Views / Customers / Customer details form errors 1`] = `
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- #8234 - - - -
+
- Fully paid - - - $1,215.89 -
+ + + +
+ Fully paid +
+ + + $1,215.89 + + + + +
@@ -33710,86 +33850,90 @@ exports[`Storyshots Views / Customers / Customer details loading 1`] = `
- - - - - - - - - - - + No. of Order + + + + + + + - - + - + - + - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + +
@@ -34213,80 +34357,84 @@ exports[`Storyshots Views / Customers / Customer details never logged 1`] = `
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- #8234 - - - -
+
- Fully paid - - - $1,215.89 -
+ + + +
+ Fully paid +
+ + + $1,215.89 + + + + +
@@ -34735,80 +34883,84 @@ exports[`Storyshots Views / Customers / Customer details never placed order 1`]
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- #8234 - - - -
+
- Fully paid - - - $1,215.89 -
+ + + +
+ Fully paid +
+ + + $1,215.89 + + + + +
@@ -35257,80 +35409,84 @@ exports[`Storyshots Views / Customers / Customer details no address at all 1`] =
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- #8234 - - - -
+
- Fully paid - - - $1,215.89 -
+ + + +
+ Fully paid +
+ + + $1,215.89 + + + + +
@@ -35760,80 +35916,84 @@ exports[`Storyshots Views / Customers / Customer details no default billing addr
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- #8234 - - - -
+
- Fully paid - - - $1,215.89 -
+ + + +
+ Fully paid +
+ + + $1,215.89 + + + + +
@@ -36288,80 +36448,84 @@ exports[`Storyshots Views / Customers / Customer details no default shipping add
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - - -
- No. of Order - - Date - - Status - - Total -
+ Date + + Status + + Total +
- #8234 - - - -
+
- Fully paid - - - $1,215.89 -
+ + + +
+ Fully paid +
+ + + $1,215.89 + + + + +
@@ -36620,985 +36784,989 @@ exports[`Storyshots Views / Customers / Customer list default 1`] = `
- - - - - - - - - - - + + + + + + + + + - + + + + - - - - - + - - - - - - - - - - - - - + - Elizabeth Vaughn - - - - - - - - - - - - + - - - - - - - - - - - - - + - James Bqall - - - - - - - - - - - - + - - - - - - - - - - - - - + - Laura Stone - - - - - - - - - - - - + - - - - - - - - - - - - - + - Hanson Sharon - - - - - - - - - - - - + - - - - - - - - - - - - - + - David Lawson - - - - - - - - - - - - + - - - - - - - - - - - - - + - Jason Gray - - - - - - - + + + + + - Tom Cooper - - + + + + + - admin@example.com - - + + + + + - 6 - - - -
- - - Customer Name - - Customer Email - - No. of Orders -
+ Customer Name + + Customer Email + + No. of Orders +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - - - -
- + - - - - curtis Bailey - - Curtis.bailey@example.com - - 2 -
- - - - - Curtis Bailey - - curtis.bailey@example.com - - 2 -
- - - - +
- elizabeth.vaughn@example.com - - 1 -
- - - Michael Martinez - - michael.martinez@example.com - - 1 -
- + - - - - Kayla Griffin - - kayla.griffin@example.com - - 0 -
- - - - - Donna Robinson - - donna.robinson@example.com - - 0 -
- - - - +
- james.ball@example.com - - 1 -
- - - Anthony Gonzalez - - anthony.gonzalez@example.com - - 2 -
- + - - - - Anthony Gonzalez - - anthony.gonzalez@example.com - - 2 -
- - - - - Wesley Davis - - wesley.davis@example.com - - 1 -
- - - - +
- laura.stone@example.com - - 1 -
- - - William Miller - - william.miller@example.com - - 0 -
- + - - - - Donald Solomon - - donald.solomon@example.com - - 0 -
- - - - - Anthony Young - - anthony.young@example.com - - 0 -
- - - - +
- sharon.hanson@example.com - - 0 -
- - - Laura Jensen - - laura.jensen@example.com - - 1 -
- + - - - - Mark Lee - - mark.lee@example.com - - 1 -
- - - - - David Lawson - - david.lawson@example.com - - 2 -
- - - - +
- david.lawson@example.com - - 2 -
- - - Faith Smith - - faith.smith@example.com - - 0 -
- + - - - - John Jones - - john.jones@example.com - - 0 -
- - - - - Ronald Fisher - - ronald.fisher@example.com - - 0 -
- - - - +
- jason.gray@example.com - - 0 -
- - + + + + James Bqall + + james.ball@example.com + + 1 +
+ + + Anthony Gonzalez + + anthony.gonzalez@example.com + + 2 +
+ + + Anthony Gonzalez + + anthony.gonzalez@example.com + + 2 +
+ + + + + Wesley Davis + + + wesley.davis@example.com + + + 1 + + + + + + + + Laura Stone + + + laura.stone@example.com + + + 1 + + + + + + + + William Miller + + + william.miller@example.com + + + 0 + + + + + + + + Donald Solomon + + + donald.solomon@example.com + + + 0 + + + + + + + + Anthony Young + + + anthony.young@example.com + + + 0 + + + + + + + + Hanson Sharon + + + sharon.hanson@example.com + + + 0 + + + + + + + + Laura Jensen + + + laura.jensen@example.com + + + 1 + + + + + + + + Mark Lee + + + mark.lee@example.com + + + 1 + + + + + + + + David Lawson + + + david.lawson@example.com + + + 2 + + + + + + + + David Lawson + + + david.lawson@example.com + + + 2 + + + + + + + + Faith Smith + + + faith.smith@example.com + + + 0 + + + + + + + + John Jones + + + john.jones@example.com + + + 0 + + + + + + + + Ronald Fisher + + + ronald.fisher@example.com + + + 0 + + + + + + + + Jason Gray + + + jason.gray@example.com + + + 0 + + + + + + + + Tom Cooper + + + admin@example.com + + + 6 + + + + +
@@ -37717,214 +37885,218 @@ exports[`Storyshots Views / Customers / Customer list loading 1`] = `
- - - - - - - - - - - + + + + + + + + + - - - - - + + + - - + - + - - -
- - - Customer Name - - Customer Email - - No. of Orders -
+ Customer Name + + Customer Email + + No. of Orders +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - - + + + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -38042,163 +38214,167 @@ exports[`Storyshots Views / Customers / Customer list no data 1`] = `
- - - - - - - - - - + Customer Name + + + + + + - - - - - + + + - - - -
- Customer Name - - Customer Email - - No. of Orders -
+ Customer Email + + No. of Orders +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No customers found -
+ + No customers found + + + + + @@ -39658,185 +39834,189 @@ exports[`Storyshots Views / Discounts / Sale details collections 1`] = `
- - - - - - - - - - - + + + + + + - - - - + + + - - - - + + + - - -
- - - Collection name - - Products - -
-
-
-
- + +
+ Collection name + + Products + +
+
+
+
- - - - - + + + + +
-
-
- - - Winter Collection - - 110 - - + + Winter Collection + + 110 + + -
+ + + + + + + +
- - - - - - - - - - - + + + + + + - - - - + + + - - - - + + + - - -
- - - Category name - - Products - -
-
-
-
- + +
+ Category name + + Products + +
+
+
+
- - - - - + + + + +
-
-
- - - Apparel - - 18 - - + + Apparel + + 18 + + -
+ + + + + + + +
- - - - - - - - - - - + + + + + + - - - - + + + - - - - + + + - - -
- - - Category name - - Products - -
-
-
-
- + +
+ Category name + + Products + +
+
+
+
- - - - - + + + + +
-
-
- - - Apparel - - 18 - - + + Apparel + + 18 + + -
+ + + + + + + +
- - - - - - - - - - - - - - - + + + + + + + - + + + + + - - - + - - -
- - - Category name - - Products - -
-
-
-
- - -
-
-
+ Category name + + Products + +
- + + + +
+ - - - ‌ - - - - ‌ - - - + - + ‌ - -
+ + + + ‌ + + + + + + + + +
- - - - - - - - - - - - + + + + + + + - - - - + + + - - + - - - - - - + - + + + + + - - - - - - + - + + + + + - - - - - - + - + + + + + - - - - - -
- - - - Product Name - - - Product Type - - Published - -
-
-
-
- + +
+ + Product Name + + + Product Type + + Published + +
+
+
+
- - - - - + + + + +
-
-
- - -
-
- -
+ +
- Orange Juice -
- - 		- Juice - -
- Published -
- 		- -
- - - - -
+
- +
+ +
+ +
- Carrot Juice -
- - 		- Juice - -
- Published -
- 		- -
- - - - -
+
- +
+ +
+ +
- Bean Juice -
- - 		- Juice - -
- Published -
- 		- -
- - - - -
+
- +
+ +
+ +
- Black Hoodie -
- - 		- Top (clothing) - -
- Published -
- 		- -
+
+
+ Black Hoodie +
+ + + + Top (clothing) + + +
+ Published +
+ + + + + + + +
- - - - - - - - - - - - + + + + + + + + + + - + + + + - - - - - + - - - - - - - + - - - + - - - - - - - - - + - - - - - - - + - - - - - - + - Happy year day! - - - + + + + + + - - - - + + + + + + - 10% - - - -
- - - Name - - Starts - - Ends - - Value -
+ Name + + Starts + + Ends + + Value +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - - - -
- + - - - - Happy front day! - - - in 5 months - - - - - - 40% -
- - - - - Happy minute day! - - - in 5 months - - +
- $30.00 -
- - - Happy class day! - - - in 5 months - - - - - - 10% -
- - - - - Happy human day! - - + - in 5 months - - - - - - 20% -
- - - - +
- - + + + + Happy class day! + + + + - + + 10% +
+ + + Happy human day! + + + + - + + 20% +
+ + + + + Happy year day! + + + + + + - + + + 10% + + + + +
@@ -43994,230 +44194,234 @@ exports[`Storyshots Views / Discounts / Sale list loading 1`] = `
- - - - - - - - - - - - + + + + + + + + + + - - - - - + + + - - + - + - + - + - - -
- - - Name - - Starts - - Ends - - Value -
+ Name + + Starts + + Ends + + Value +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -44335,169 +44539,173 @@ exports[`Storyshots Views / Discounts / Sale list no data 1`] = `
- - - - - - - - - - - + Name + + + + + + + - - - - - + + + - - - -
- Name - - Starts - - Ends - - Value -
+ Starts + + Ends + + Value +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No sales found -
+ + No sales found + + + + + @@ -49500,297 +49708,301 @@ exports[`Storyshots Views / Discounts / Voucher list default 1`] = `
- - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + - - - - - + - - - - - - - - - - - - + - + + + - - - - - - - -
- - - Code - - Min. Spent - - Starts - - Ends - - Value - - Uses -
+ Code + + Min. Spent + + Starts + + Ends + + Value + + Uses +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - - - -
- + - - - - FREE2019 - - - - - - in 5 months - - - - - - 100% - - - -
- - - - - FREE2020 - - $200.00 - - + - in 5 months - - + + 100% + + - +
- $25.00 - - 150 -
+ + + + + FREE2020 + + + $200.00 + + + + + + - + + + $25.00 + + + 150 + + + + + @@ -49908,260 +50120,264 @@ exports[`Storyshots Views / Discounts / Voucher list loading 1`] = `
- - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + - - + - + - + - + - + - + - - -
- - - Code - - Min. Spent - - Starts - - Ends - - Value - - Uses -
+ Code + + Min. Spent + + Starts + + Ends + + Value + + Uses +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -50279,181 +50495,185 @@ exports[`Storyshots Views / Discounts / Voucher list no data 1`] = `
- - - - - - - - - - - - - + Code + + + + + + + + + - - - - - + + + - - - -
- Code - - Min. Spent - - Starts - - Ends - - Value - - Uses -
+ Min. Spent + + Starts + + Ends + + Value + + Uses +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No vouchers found -
+ + No vouchers found + + + + + @@ -50640,101 +50860,105 @@ exports[`Storyshots Views / HomePage default 1`] = `
- - - - - + + + - - - - - + + + -
- No payments waiting for capture -
- - + - - - - - - -
-
- - 1 - - Orders are ready to fulfill -
- 		+ + 1 + + Orders are ready to fulfill + + + +
+ No payments waiting for capture + + + +
- - - -
-
- No products out of stock -
- 		- -
+ + + + + +
- - - - + - + - - - -
-
- + +
+
+
-
- 		-
+ Gardner-Martin +
+
+ XS +
+
+ One ordered +
+ 		- Gardner-Martin - -
- XS -
-
- One ordered -
- 		-
- $37.65 -
-
+
+ $37.65 +
+ + + + +
- - - - - + + + - - - - - + + + - - ‌ - - - + - - - - - - -
- - ‌ - - + ‌ + + + +
+ ‌ + + + +
- - - -
- - ‌ - - - -
+ + + + + +
- - - - - - - - -
-
- + +
+
-
-
-
- - ‌ - - -
+
‌ - -
+ + +
+ + ‌ + +
+ + + + +
- - - - - + + + - - - - - + + + -
- No payments waiting for capture -
- - + - - - - - - -
-
- - 1 - - Orders are ready to fulfill -
- 		+ + 1 + + Orders are ready to fulfill + + + +
+ No payments waiting for capture + + + +
- - - -
-
- No products out of stock -
- 		- -
+ + + + + +
- - - - - - -
-
- No products found -
-
+
+ No products found +
+ + + + +
- - -
+ + +
+
- - - - - + + + - - - - - + - - - -
-
- - 1 - - Orders are ready to fulfill -
- 		+ + 1 + + Orders are ready to fulfill + + + +
-
+ No payments waiting for capture +
+ 		- No payments waiting for capture - - - -
+ + + + + +
- - - - - + - - -
-
- No products out of stock -
- 		- - - -
+ + + + + +
- - - - - - - - - - + + + + + + + + - - - - - + + + - - - - - - - + - - - - - -
- - - Menu Title - - Items - -
+ Menu Title + + Items + +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - navbar - - 3 - - -
- + - - - - footer - - 2 - - - + + -
+ + + + + + + + + + + footer + + + 2 + + + + + + + +
@@ -53954,235 +54214,239 @@ exports[`Storyshots Views / Navigation / Menu list loading 1`] = `
- - - - - - - - - - + + + + + + + + - - - - - + + + - - - - + - - -
- - - Menu Title - - Items - -
+ Menu Title + + Items + +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - - ‌ - - - - ‌ - - - + - + ‌ - -
+ + + + ‌ + + + + + + + + +
@@ -54226,161 +54490,165 @@ exports[`Storyshots Views / Navigation / Menu list no data 1`] = `
- - - - - - - - - + Menu Title + + + + + - - - - - + + + - - - -
- Menu Title - - Items - -
+ Items + +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No menus found -
+ + No menus found + + + + +
@@ -54552,1075 +54820,1079 @@ exports[`Storyshots Views / Orders / Draft order list default 1`] = `
- - - - - - - - - - - - + + + + + + + + + + - + + + + - - - - - + - - - - - - - + - - - + - Elizabeth Vaughn - - - - - - - + - - - - - - - + - - - - - - + - #16 - - - - - - - + - - - - - - - + - - - + - Wesley Davis - - - - - - - + - - - - - - - + - - - - - - + - #11 - - - - - - - + - - - - - - - + - - - + - Melissa Simon - - - - - - - + - - - - - - - + - - - - - - + - #6 - - - - - - - + - - - - - - - + - - - + - Lauren Watson - - - - - - - + - - - - - - - + - - - - - - + - #1 - - - + + + + + + - Curtis Bailey - - + + + + + + - $557.00 - - - -
- - - No. of Order - - Date - - Customer - - Total -
+ No. of Order + + Date + + Customer + + Total +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - - - -
- + - - - - #20 - - - in a month - - - Laura Stone 1 2 - - $305.17 -
- - - - - #19 - - - in a month - - +
- $1,215.89 -
- - - #18 - - - in a month - - - david.lawson@example.com - - $321.71 -
- - - - - #17 - - + - in a month - - - Aaron Randall - - $271.95 -
- - - - +
- - - Laura Jensen - - $335.84 -
- + - - - - #15 - - - in a month - - - Jenna Villa - - $1,042.15 -
- - - - - #14 - - - in a month - - +
- $213.69 -
- - - #13 - - - in a month - - - Anthony Gonzalez - - $367.03 -
- - - - - #12 - - + - in a month - - - Denise Freeman - - $298.76 -
- - - - +
- - - James Ball - - $663.69 -
- + - - - - #10 - - - in a month - - - Michael Martinez - - $280.41 -
- - - - - #9 - - - in a month - - +
- $234.93 -
- - - #8 - - - in a month - - - Justin Mccoy - - $485.19 -
- - - - - #7 - - + - in a month - - - Anthony Gonzalez - - $223.54 -
- - - - +
- - - Bradley Ford - - $237.55 -
- + - - - - #5 - - - in a month - - - David Lawson - - $453.55 -
- - - - - #4 - - - in a month - - +
- $812.67 -
- - - #3 - - - in a month - - - Mark Lee - - $481.41 -
- - - - - #2 - - + - in a month - - - Kara Murphy - - $569.19 -
- - - - +
- - + + + + #12 + + + + Denise Freeman + + $298.76 +
+ + + #11 + + + + James Ball + + $663.69 +
+ + + + + #10 + + + + + + Michael Martinez + + + $280.41 + + + + + + + + #9 + + + + + + Melissa Simon + + + $234.93 + + + + + + + + #8 + + + + + + Justin Mccoy + + + $485.19 + + + + + + + + #7 + + + + + + Anthony Gonzalez + + + $223.54 + + + + + + + + #6 + + + + + + Bradley Ford + + + $237.55 + + + + + + + + #5 + + + + + + David Lawson + + + $453.55 + + + + + + + + #4 + + + + + + Lauren Watson + + + $812.67 + + + + + + + + #3 + + + + + + Mark Lee + + + $481.41 + + + + + + + + #2 + + + + + + Kara Murphy + + + $569.19 + + + + + + + + #1 + + + + + + Curtis Bailey + + + $557.00 + + + + + @@ -55739,235 +56011,239 @@ exports[`Storyshots Views / Orders / Draft order list loading 1`] = `
- - - - - - - - - - - - + + + + + + + + + + - - - - - + + + - - + - + - + - + - - -
- - - No. of Order - - Date - - Customer - - Total -
+ No. of Order + + Date + + Customer + + Total +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -56085,169 +56361,173 @@ exports[`Storyshots Views / Orders / Draft order list when no data 1`] = `
- - - - - - - - - - - + No. of Order + + + + + + + - - - - - + + + - - - -
- No. of Order - - Date - - Customer - - Total -
+ Date + + Customer + + Total +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No draft orders found -
+ + No draft orders found + + + + + @@ -56320,90 +56600,94 @@ exports[`Storyshots Views / Orders / Order details cancelled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -57279,90 +57575,94 @@ exports[`Storyshots Views / Orders / Order details default 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -57438,90 +57738,94 @@ exports[`Storyshots Views / Orders / Order details default 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -58098,90 +58402,94 @@ exports[`Storyshots Views / Orders / Order details fulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -58257,90 +58565,94 @@ exports[`Storyshots Views / Orders / Order details fulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -58416,90 +58728,94 @@ exports[`Storyshots Views / Orders / Order details fulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -59079,113 +59395,117 @@ exports[`Storyshots Views / Orders / Order details loading 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - + - + - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- + +
+
+ + ‌ + +
-
+
+ - - ‌ - - - - - + - ‌ - - - + ‌ + + - ‌ - - - - ‌ - -
+ + ‌ + + + + + +
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -59779,90 +60103,94 @@ exports[`Storyshots Views / Orders / Order details no customer note 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -59938,90 +60266,94 @@ exports[`Storyshots Views / Orders / Order details no customer note 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -60598,90 +60930,94 @@ exports[`Storyshots Views / Orders / Order details no payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -60757,90 +61093,94 @@ exports[`Storyshots Views / Orders / Order details no payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -60916,90 +61256,94 @@ exports[`Storyshots Views / Orders / Order details no payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -61576,90 +61920,94 @@ exports[`Storyshots Views / Orders / Order details no shipping address 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -61735,90 +62083,94 @@ exports[`Storyshots Views / Orders / Order details no shipping address 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -61894,90 +62246,94 @@ exports[`Storyshots Views / Orders / Order details no shipping address 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -62554,90 +62910,94 @@ exports[`Storyshots Views / Orders / Order details partially fulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -62713,90 +63073,94 @@ exports[`Storyshots Views / Orders / Order details partially fulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -62872,90 +63236,94 @@ exports[`Storyshots Views / Orders / Order details partially fulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -63532,90 +63900,94 @@ exports[`Storyshots Views / Orders / Order details payment confirmed 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -63691,90 +64063,94 @@ exports[`Storyshots Views / Orders / Order details payment confirmed 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -63850,90 +64226,94 @@ exports[`Storyshots Views / Orders / Order details payment confirmed 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -64510,90 +64890,94 @@ exports[`Storyshots Views / Orders / Order details payment error 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -64669,90 +65053,94 @@ exports[`Storyshots Views / Orders / Order details payment error 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -64828,90 +65216,94 @@ exports[`Storyshots Views / Orders / Order details payment error 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -65488,90 +65880,94 @@ exports[`Storyshots Views / Orders / Order details pending payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -65647,90 +66043,94 @@ exports[`Storyshots Views / Orders / Order details pending payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -65806,90 +66206,94 @@ exports[`Storyshots Views / Orders / Order details pending payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -66466,90 +66870,94 @@ exports[`Storyshots Views / Orders / Order details refunded payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -66625,90 +67033,94 @@ exports[`Storyshots Views / Orders / Order details refunded payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -66784,90 +67196,94 @@ exports[`Storyshots Views / Orders / Order details refunded payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -67444,90 +67860,94 @@ exports[`Storyshots Views / Orders / Order details rejected payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -67603,90 +68023,94 @@ exports[`Storyshots Views / Orders / Order details rejected payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -67762,90 +68186,94 @@ exports[`Storyshots Views / Orders / Order details rejected payment 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -68422,90 +68850,94 @@ exports[`Storyshots Views / Orders / Order details unfulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Watkins-Gonzalez (Soft) +
-
- Watkins-Gonzalez (Soft) -
-
- 		- 3 - - $18.51 - - $55.53 -
+ + + 3 + + + $18.51 + + + $55.53 + + + + +
@@ -68581,90 +69013,94 @@ exports[`Storyshots Views / Orders / Order details unfulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -68740,90 +69176,94 @@ exports[`Storyshots Views / Orders / Order details unfulfilled 1`] = `
- - - - - - - - - - - + Product + + + + + + + + - - - - - - -
- - Product - - - Quantity - - Price - - Total -
+ Quantity + + Price + + Total +
-
- +
+ +
+
+ Williams, Garcia and Walker (XS) +
-
- Williams, Garcia and Walker (XS) -
-
- 		- 1 - - $79.71 - - $79.71 -
+ + + 1 + + + $79.71 + + + $79.71 + + + + +
@@ -69408,262 +69848,266 @@ exports[`Storyshots Views / Orders / Order draft default 1`] = `
- - - - - - - - - - - - - - - - - - + + + + + + - - - - - + + + + + + - - -
- - Product - - - Quantity - - Price - - Total - -
-
-
- -
-
-
- Davis Group (Hard) -
-
- 58-1338 -
-
-
- 		-
-
-
- - -
-
-
- 		- $65.95 - - $131.90 - - -
+ Quantity + + Price + + Total + +
-
- -
-
- Anderson PLC (15-1337) -
-
- 15-1337 -
-
-
- 		-
-
-
- - + Davis Group (Hard) +
+
+ 58-1338 +
-
- 		- $68.20 - - $136.40 - - - -
- + + +
+ + + 		+ $65.95 + + $131.90 + + +
+
+
+ - - - -
+
+
+
+ Anderson PLC (15-1337) +
+
+ 15-1337 +
+
+ + + +
+
+
+ + +
+
+
+ + + $68.20 + + + $136.40 + + + + + + + +
@@ -70023,102 +70467,106 @@ exports[`Storyshots Views / Orders / Order draft loading 1`] = `
- - - - - - - - - - -
-
- -
-
-
+
- ‌ - + + ‌ + +
- - 		- - ‌ - - - - ‌ - - - - ‌ - - - - + ‌ - -
+ + + + ‌ + + + + + ‌ + + + + + + + + +
@@ -70417,262 +70865,266 @@ exports[`Storyshots Views / Orders / Order draft no user permissions 1`] = `
- - - - - - - - - - - - - - - - - - + + + + + + - - - - - + + + + + + - - -
- - Product - - - Quantity - - Price - - Total - -
-
-
- -
-
-
- Davis Group (Hard) -
-
- 58-1338 -
-
-
- 		-
-
-
- - -
-
-
- 		- $65.95 - - $131.90 - - -
+ Quantity + + Price + + Total + +
-
- -
-
- Anderson PLC (15-1337) -
-
- 15-1337 -
-
-
- 		-
-
-
- - + Davis Group (Hard) +
+
+ 58-1338 +
-
- 		- $68.20 - - $136.40 - - - -
- + + +
+ + + 		+ $65.95 + + $131.90 + + +
+
+
+ - - - -
+
+
+
+ Anderson PLC (15-1337) +
+
+ 15-1337 +
+
+ + + +
+
+
+ + +
+
+
+ + + $68.20 + + + $136.40 + + + + + + + +
@@ -71020,24 +71472,28 @@ exports[`Storyshots Views / Orders / Order draft without lines 1`] = `
- - - - - - -
- No Products added to Order -
+ + No Products added to Order + + + + +
- - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - No. of Order - - Date - - Customer - - Payment - - Fulfillment status - - Total -
+ No. of Order + + Date + + Customer + + Payment + + Fulfillment status + + Total +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - + + + + #20 + + + + Laura Stone 1 2 + +
+ Fully paid
- -
- - - #20 - - - - Laura Stone 1 2 - -
- Fully paid -
- 		-
- Cancelled -
- 		- $305.17 -
- - - #19 - - - - Elizabeth Vaughn - -
- Fully paid -
- 		-
- Cancelled -
- 		- $1,215.89 -
- - - #18 - - - - david.lawson@example.com - -
- Unpaid -
- 		-
- Draft -
- 		- $321.71 -
- - - #17 - - - - Aaron Randall - -
- Unpaid -
- 		-
- Cancelled -
- 		- $271.95 -
- - - #16 - - - - Laura Jensen - -
- Unpaid -
- 		-
- Cancelled -
- 		- $335.84 -
- - - #15 - - - - Jenna Villa - -
- Unpaid -
- 		-
- Cancelled -
- 		- $1,042.15 -
- - - #14 - - - - Wesley Davis - -
- Unpaid -
- 		-
- Cancelled -
- 		- $213.69 -
- - - #13 - - - - Anthony Gonzalez - -
- Unpaid -
- 		-
- Cancelled -
- 		- $367.03 -
- - - #12 - - - - Denise Freeman - -
- Unpaid -
- 		-
- Cancelled -
- 		- $298.76 -
- - - #11 - - - - James Ball - -
- Fully paid -
- 		-
- Unfulfilled -
- 		- $663.69 -
- - - #10 - - - - Michael Martinez - -
- Unpaid -
- 		-
- Cancelled -
- 		- $280.41 -
- - - #9 - - - - Melissa Simon - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $234.93 -
- - - #8 - - - - Justin Mccoy - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $485.19 -
- - - #7 - - - - Anthony Gonzalez - -
- Fully paid -
- 		-
- Partially fulfilled -
- 		- $223.54 -
- - - #6 - - - - Bradley Ford - -
- Unpaid -
- 		-
- Fulfilled -
- 		- $237.55 -
- - - #5 - - - - David Lawson - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $453.55 -
- - - #4 - - - - Lauren Watson - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $812.67 -
- - - #3 - - - - Mark Lee - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $481.41 -
- - - #2 - - - - Kara Murphy - -
- Fully paid -
- 		-
- Partially fulfilled -
- 		- $569.19 -
- - - #1 - - - - Curtis Bailey - -
- Fully paid -
- 		-
- Partially fulfilled -
- 		- $557.00 -
+ + +
+ Cancelled +
+ + + $305.17 + + + + + + + + #19 + + + + + + Elizabeth Vaughn + + +
+ Fully paid +
+ + +
+ Cancelled +
+ + + $1,215.89 + + + + + + + + #18 + + + + + + david.lawson@example.com + + +
+ Unpaid +
+ + +
+ Draft +
+ + + $321.71 + + + + + + + + #17 + + + + + + Aaron Randall + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $271.95 + + + + + + + + #16 + + + + + + Laura Jensen + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $335.84 + + + + + + + + #15 + + + + + + Jenna Villa + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $1,042.15 + + + + + + + + #14 + + + + + + Wesley Davis + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $213.69 + + + + + + + + #13 + + + + + + Anthony Gonzalez + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $367.03 + + + + + + + + #12 + + + + + + Denise Freeman + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $298.76 + + + + + + + + #11 + + + + + + James Ball + + +
+ Fully paid +
+ + +
+ Unfulfilled +
+ + + $663.69 + + + + + + + + #10 + + + + + + Michael Martinez + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $280.41 + + + + + + + + #9 + + + + + + Melissa Simon + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $234.93 + + + + + + + + #8 + + + + + + Justin Mccoy + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $485.19 + + + + + + + + #7 + + + + + + Anthony Gonzalez + + +
+ Fully paid +
+ + +
+ Partially fulfilled +
+ + + $223.54 + + + + + + + + #6 + + + + + + Bradley Ford + + +
+ Unpaid +
+ + +
+ Fulfilled +
+ + + $237.55 + + + + + + + + #5 + + + + + + David Lawson + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $453.55 + + + + + + + + #4 + + + + + + Lauren Watson + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $812.67 + + + + + + + + #3 + + + + + + Mark Lee + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $481.41 + + + + + + + + #2 + + + + + + Kara Murphy + + +
+ Fully paid +
+ + +
+ Partially fulfilled +
+ + + $569.19 + + + + + + + + #1 + + + + + + Curtis Bailey + + +
+ Fully paid +
+ + +
+ Partially fulfilled +
+ + + $557.00 + + + + +
@@ -72969,265 +73429,269 @@ exports[`Storyshots Views / Orders / Order list loading 1`] = `
- - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + - - + - + - + - + - + - + - - -
- - - No. of Order - - Date - - Customer - - Payment - - Fulfillment status - - Total -
+ No. of Order + + Date + + Customer + + Payment + + Fulfillment status + + Total +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -73369,181 +73833,185 @@ exports[`Storyshots Views / Orders / Order list when no data 1`] = `
- - - - - - - - - - - - - + No. of Order + + + + + + + + + - - - - - + + + - - - -
- No. of Order - - Date - - Customer - - Payment - - Fulfillment status - - Total -
+ Date + + Customer + + Payment + + Fulfillment status + + Total +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No orders found -
+ + No orders found + + + + + @@ -74080,1447 +74548,1451 @@ exports[`Storyshots Views / Orders / Order list with custom filters 1`] = ` - - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - No. of Order - - Date - - Customer - - Payment - - Fulfillment status - - Total -
+ No. of Order + + Date + + Customer + + Payment + + Fulfillment status + + Total +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - + + + + #20 + + + + Laura Stone 1 2 + +
+ Fully paid
- -
- - - #20 - - - - Laura Stone 1 2 - -
- Fully paid -
- 		-
- Cancelled -
- 		- $305.17 -
- - - #19 - - - - Elizabeth Vaughn - -
- Fully paid -
- 		-
- Cancelled -
- 		- $1,215.89 -
- - - #18 - - - - david.lawson@example.com - -
- Unpaid -
- 		-
- Draft -
- 		- $321.71 -
- - - #17 - - - - Aaron Randall - -
- Unpaid -
- 		-
- Cancelled -
- 		- $271.95 -
- - - #16 - - - - Laura Jensen - -
- Unpaid -
- 		-
- Cancelled -
- 		- $335.84 -
- - - #15 - - - - Jenna Villa - -
- Unpaid -
- 		-
- Cancelled -
- 		- $1,042.15 -
- - - #14 - - - - Wesley Davis - -
- Unpaid -
- 		-
- Cancelled -
- 		- $213.69 -
- - - #13 - - - - Anthony Gonzalez - -
- Unpaid -
- 		-
- Cancelled -
- 		- $367.03 -
- - - #12 - - - - Denise Freeman - -
- Unpaid -
- 		-
- Cancelled -
- 		- $298.76 -
- - - #11 - - - - James Ball - -
- Fully paid -
- 		-
- Unfulfilled -
- 		- $663.69 -
- - - #10 - - - - Michael Martinez - -
- Unpaid -
- 		-
- Cancelled -
- 		- $280.41 -
- - - #9 - - - - Melissa Simon - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $234.93 -
- - - #8 - - - - Justin Mccoy - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $485.19 -
- - - #7 - - - - Anthony Gonzalez - -
- Fully paid -
- 		-
- Partially fulfilled -
- 		- $223.54 -
- - - #6 - - - - Bradley Ford - -
- Unpaid -
- 		-
- Fulfilled -
- 		- $237.55 -
- - - #5 - - - - David Lawson - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $453.55 -
- - - #4 - - - - Lauren Watson - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $812.67 -
- - - #3 - - - - Mark Lee - -
- Unpaid -
- 		-
- Partially fulfilled -
- 		- $481.41 -
- - - #2 - - - - Kara Murphy - -
- Fully paid -
- 		-
- Partially fulfilled -
- 		- $569.19 -
- - - #1 - - - - Curtis Bailey - -
- Fully paid -
- 		-
- Partially fulfilled -
- 		- $557.00 -
+ + +
+ Cancelled +
+ + + $305.17 + + + + + + + + #19 + + + + + + Elizabeth Vaughn + + +
+ Fully paid +
+ + +
+ Cancelled +
+ + + $1,215.89 + + + + + + + + #18 + + + + + + david.lawson@example.com + + +
+ Unpaid +
+ + +
+ Draft +
+ + + $321.71 + + + + + + + + #17 + + + + + + Aaron Randall + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $271.95 + + + + + + + + #16 + + + + + + Laura Jensen + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $335.84 + + + + + + + + #15 + + + + + + Jenna Villa + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $1,042.15 + + + + + + + + #14 + + + + + + Wesley Davis + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $213.69 + + + + + + + + #13 + + + + + + Anthony Gonzalez + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $367.03 + + + + + + + + #12 + + + + + + Denise Freeman + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $298.76 + + + + + + + + #11 + + + + + + James Ball + + +
+ Fully paid +
+ + +
+ Unfulfilled +
+ + + $663.69 + + + + + + + + #10 + + + + + + Michael Martinez + + +
+ Unpaid +
+ + +
+ Cancelled +
+ + + $280.41 + + + + + + + + #9 + + + + + + Melissa Simon + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $234.93 + + + + + + + + #8 + + + + + + Justin Mccoy + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $485.19 + + + + + + + + #7 + + + + + + Anthony Gonzalez + + +
+ Fully paid +
+ + +
+ Partially fulfilled +
+ + + $223.54 + + + + + + + + #6 + + + + + + Bradley Ford + + +
+ Unpaid +
+ + +
+ Fulfilled +
+ + + $237.55 + + + + + + + + #5 + + + + + + David Lawson + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $453.55 + + + + + + + + #4 + + + + + + Lauren Watson + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $812.67 + + + + + + + + #3 + + + + + + Mark Lee + + +
+ Unpaid +
+ + +
+ Partially fulfilled +
+ + + $481.41 + + + + + + + + #2 + + + + + + Kara Murphy + + +
+ Fully paid +
+ + +
+ Partially fulfilled +
+ + + $569.19 + + + + + + + + #1 + + + + + + Curtis Bailey + + +
+ Fully paid +
+ + +
+ Partially fulfilled +
+ + + $557.00 + + + + + @@ -78052,321 +78524,325 @@ exports[`Storyshots Views / Pages / Page list default 1`] = `
- - - - - - - - - - - + + + + + + + + + - + + + + + + + - - - - - + - - - - - + - - - - - - - - - + + - - - - - + - - - - - - - - -
- - - Title - - Slug - - Visibility -
+ Title + + Slug + + Visibility +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
-
+
+ - + + + + About + + about + +
+ Published
- -
+
- About - - about - -
+ + +
- Published - -
- - - - - About - - about - -
+
- Not Published - -
+ Not Published + +
- About - - about - -
+ + +
- Published - -
- - - - - About - - about - -
+
- Published - -
+
+ Published +
+ + + + + + + + About + + + about + + +
+ Published +
+ + + + +
@@ -78411,220 +78887,224 @@ exports[`Storyshots Views / Pages / Page list loading 1`] = `
- - - - - - - - - - - + + + + + + + + + - - - - - + + + - - + - + - + - - -
- - - Title - - Slug - - Visibility -
+ Title + + Slug + + Visibility +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + +
@@ -78668,163 +79148,167 @@ exports[`Storyshots Views / Pages / Page list no data 1`] = `
- - - - - - - - - - + Title + + + + + + - - - - - + + + - - - -
- Title - - Slug - - Visibility -
+ Slug + + Visibility +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No pages found -
+ + No pages found + + + + +
@@ -79926,221 +80410,225 @@ exports[`Storyshots Views / Plugins / Plugin list default 1`] = `
- - - - - - - - - - - + + + + + + -
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
+ +
+ + + + + - - - - - - - + + -
- -
- - - - - - - - -
- Name - - Active - - Action -
+ + Name + + Active + + Action +
+ Avalara +
- - + Yes
- -
- Avalara - -
+
- Yes - - + + +
- VatLayer - -
- No -
- 		-
-
- - -
-
+ No +
+ + +
+ +
+ + + + + @@ -80172,191 +80660,195 @@ exports[`Storyshots Views / Plugins / Plugin list loading 1`] = `
- - - - - - - - - - - + + + + + + -
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- - - - - - + + + - - - - - -
- Name - - Active - - Action -
+ + Name + + Active + + Action +
- - ‌ - - - - ‌ - - -
- -
-
+ ‌ + + + + + ‌ + + + +
+ +
+ + + + +
@@ -80388,161 +80880,165 @@ exports[`Storyshots Views / Plugins / Plugin list no data 1`] = `
- - - - - - - - - - - + + + + + + -
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- - - - - - + + + - - - -
- Name - - Active - - Action -
+ + Name + + Active + + Action +
- No plugins found -
+ + No plugins found + + + + +
@@ -81475,343 +81971,347 @@ exports[`Storyshots Views / Product types / Product type details default 1`] = `
- - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - + - - - - + + + - - -
- - - - - - Attribute name - - Slug - -
- - - - - Author - - author - - -
+ Attribute name + + Slug + +
- - - - - Language - - language - - -
- + + + + + + + + - - - - - - - - - - - - Publisher - - publisher - - + + Author + + author + + -
+ + + + + + + + + + + + + + Language + + + language + + + + + + + + + + + + + + Publisher + + + publisher + + + + + + + +
- - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - + - - - - + + + - - -
- - - - - - Attribute name - - Slug - -
- - - - - Author - - author - - -
+ Attribute name + + Slug + +
- - - - - Language - - language - - -
- + + + + + + + + - - - - - - - - - - - - Publisher - - publisher - - + + Author + + author + + -
+ + + + + + + + + + + + + + Language + + + language + + + + + + + + + + + + + + Publisher + + + publisher + + + + + + + +
- - - - - - - - - - + + + + + + + + - - + - - - + - - -
- - - - - - Attribute name - - Slug - -
+ Attribute name + + Slug + +
- - - - - - - - ‌ - - - - ‌ - - - + - + ‌ - -
+ + + + ‌ + + + + + + + + +
- - - - - - - - - + Attribute name + + + + + - - - -
- Attribute name - - Slug - -
+ Slug + +
- No attributes found -
+ + No attributes found + + + + +
- - - - - - - - - - - - + + + + + + + - - - - + + + - - + + - - - - - - + - - E-books - -
+ + + +
- - - - - + - + + - - - - - + - + - + - Physical - - - - - - + + - + + - Physical - - - - -
- - - Type Name - - Type - - Tax -
-
-
-
- + +
+ Type Name + + Type + + Tax +
+
+
+
- - - - - + + + + +
-
-
- - - + + + - Candy - -
+ Candy + +
+ Configurable +
+
- Configurable - - - Physical - - PB100000 -
- - - - +
- Simple product - - - Digital - - PH403682 -
- - - - - + - Mugs - -
+
- Simple product - - - Physical - - PC077426 -
- + - - - - + Mugs + +
+ Simple product +
+ 		- Coffee - -
+
- Configurable - - +
- PB100000 -
- - - + + + - T-Shirt - -
+ Coffee + +
+ Configurable +
+
- Configurable - - + + PB100000 +
- PH403970 -
+ + + + + + T-Shirt + +
+ Configurable +
+ + + Physical + + + PH403970 + + + + +
@@ -83996,185 +84512,189 @@ exports[`Storyshots Views / Product types / Product types list loading 1`] = `
- - - - - - - - - - - - - - - - + + + + + + + + - + + + + + - + - + - + - - -
- - - Type Name - - Type - - Tax -
-
-
-
- - -
-
-
+ Type Name + + Type + + Tax +
- + + + +
+ - - + + + - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + + @@ -84292,127 +84812,131 @@ exports[`Storyshots Views / Product types / Product types list no data 1`] = `
- - - - - - - - - - + Type Name + + + + + + - - - - - + + + - - - -
- Type Name - - Type - - Tax -
+ Type + + Tax +
-
-
- - + + + + +
-
-
- No product types found -
+ + No product types found + + + + + @@ -89957,68 +90481,72 @@ exports[`Storyshots Views / Products / Create product variant add first variant
- - - - - - - -
-
- + +
+
-
-
-
- New Variant -
+ + + New Variant + + + + +
@@ -90410,124 +90938,128 @@ exports[`Storyshots Views / Products / Create product variant default 1`] = `
- - - - - - - - - - - - - + + - New Variant - - - -
-
- -
-
-
-
- Cordoba Oro -
-
-
- -
-
-
-
- silver -
-
-
- +
+
-
-
-
+ + Cordoba Oro +
+ +
+
+ +
+
+
+ + + silver + + + + +
+
+ +
+
+
+ + + New Variant + + + + +
@@ -90919,107 +91451,111 @@ exports[`Storyshots Views / Products / Create product variant when loading data
- - - - - - - - - + + - New Variant - - - -
-
- + +
+
-
-
-
- + - ‌ - -
-
-
- -
-
-
-
+
+ +
+
+ +
+
+
+ + + New Variant + + + + +
@@ -91354,124 +91890,128 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
- - - - - - - - - - - - - + + - New Variant - - - -
-
- -
-
-
-
- Cordoba Oro -
-
-
- -
-
-
-
- silver -
-
-
- +
+
-
-
-
+ + Cordoba Oro +
+ +
+
+ +
+
+
+ + + silver + + + + +
+
+ +
+
+
+ + + New Variant + + + + +
@@ -92771,140 +93311,144 @@ Ctrl + K"
- - - - - - - - - - - + + + + + + + + + - - - + - - - - - - + - + - 69055-15190 - - - -
- - - Name - - Status - - SKU -
+ Name + + Status + + SKU +
- - - Cordoba Oro - -
+ + +
- Available - - - 87192-94370 -
- - - - - silver - -
+ Available +
+ 		- Available - - +
+ + + + + silver + + +
+ Available +
+ + + 69055-15190 + + + + +
- - - - - - - - - - - + + + + + + + + + - - - + - - - - - - + - + - 69055-15190 - - - -
- - - Name - - Status - - SKU -
+ Name + + Status + + SKU +
- - - Cordoba Oro - -
+ + +
- Available - - - 87192-94370 -
- - - - - silver - -
+ Available +
+ 		- Available - - +
+ + + + + silver + + +
+ Available +
+ + + 69055-15190 + + + + +
- - - - - - - - - - - + + + + + + + + + - - - + - - - - - - + - + - 69055-15190 - - - -
- - - Name - - Status - - SKU -
+ Name + + Status + + SKU +
- - - Cordoba Oro - -
+ + +
- Available - - - 87192-94370 -
- - - - - silver - -
+ Available +
+ 		- Available - - +
+ + + + + silver + + +
+ Available +
+ + + 69055-15190 + + + + +
- - - - - - - - - - - + + + + + + + + + - - - + - - - - - - + - + - 69055-15190 - - - -
- - - Name - - Status - - SKU -
+ Name + + Status + + SKU +
- - - Cordoba Oro - -
+ + +
- Available - - - 87192-94370 -
- - - - - silver - -
+ Available +
+ 		- Available - - +
+ + + + + silver + + +
+ Available +
+ + + 69055-15190 + + + + +
- - - - - - - - - - + + + + + + + - - + - - + + + + + + + + + + + + + + + + -
+ + +
- - - - + + + + + + + - - - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + - - - - - - - - - - - - - - - - - - - -
- - -
+ + +
- - Name - + + Name + +
+ - - - 		-
+
- Type +
+ Type +
- - 		-
+
+
+ Published +
+
+ 		+
+
+ Price +
+
+
+
+
+
+ + No of Rows: + +
+
+ 20 +
+ + +
+
+
+
+ + +
+
+
+ + +
+
+ +
+
+ Nebula Night Sky Paint +
+
+ 		+ Paint + +
Published
- - - 		+ + $15.00 +
- Price -
- - -
-
-
-
- - No of Rows: - -
-
- 20 -
- - -
+
+ +
+
+ Light Speed Yellow Paint
+
+ Paint +
-
+ $15.00 +
+ + +
+
- - - - -
+
- - - - + Hyperspace Turquoise Paint +
- -
- - - - -
+
- +
+ $15.00 +
+ - Paint - -
- Published -
- 		- $15.00 -
- - -
+
- + +
+
+ Pineapple Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Paint - -
- Published -
- 		- $15.00 -
- - -
+
- + +
+
+ Coconut Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Paint - -
- Published -
- 		- $15.00 -
- - -
+
- + +
+
+ Apple Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Orange Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Banana Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Bean Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Carrot Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Green Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Code Division T-shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Polo Shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Polo Shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Polo Shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Polo Shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Black Hoodie +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Blue Hoodie +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Mustard Hoodie +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- +
+ +
+
+ Colored Parrot Cushion +
-
- Blue Hoodie -
- - 		- Top (clothing) - -
+
- Published - - - $30.00 -
- - -
+
- + Published
-
- Mustard Hoodie -
- - 		- Top (clothing) - -
+
- Published - - - $30.00 -
- - -
-
- -
-
- Colored Parrot Cushion -
-
- 		- Cushion - -
- Published -
- 		- $20.00 -
+ $20.00 + + + + +
@@ -103681,332 +104241,336 @@ exports[`Storyshots Views / Products / Product list loading 1`] = `
- - - - - - - - - - + + + + + + + - - + - - - - - - - - - - - - - - + + + - - ‌ - - - - -
- - -
+ + +
- - Name - -
- - - 		-
-
- Type -
-
- 		-
-
- Published -
-
- 		-
-
- Price -
-
-
-
-
-
- No of Rows: + Name -
-
- 20 -
- - -
-
-
- - -
-
-
- - -
-
+ +
- - ‌ - + Type +
- - - 		- + - ‌ - - - - +
+ Published +
+ + + 		- ‌ - - - +
+ Price +
+ + +
+
+
+
+ + No of Rows: + +
+
+ 20 +
+ + +
+
+
+
+ + +
+
+ + + + + + + + + +
+
+ +
+
+ + ‌ + +
+
+ + + + ‌ + + + + + ‌ + + + + + ‌ + + + + + +
@@ -104179,239 +104743,243 @@ exports[`Storyshots Views / Products / Product list no data 1`] = `
- - - - - - - - - - + + + + + + + - - - - - - - - - + - - - + + + + - - - -
-
- - Name - -
- -
- 		-
-
- Type -
-
- 		-
-
- Published -
-
- 		-
-
- Price -
-
-
-
-
-
- No of Rows: + Name -
-
- 20 -
- - -
+
+ +
+ +
+
+
+ Type
+
- - + Published +
- - -
+
+
+ Price +
+
+
- No products found -
+ +
+
+
+ + No of Rows: + +
+
+ 20 +
+ + +
+
+
+
+ + +
+
+ + + + + + + No products found + + + + +
@@ -104979,1545 +105547,1549 @@ exports[`Storyshots Views / Products / Product list with custom filters 1`] = `
- - - - - - - - - - + + + + + + + - - + - - + + + + + + + + + + + + + + + + -
+ + +
- - - - + + + + + + + - - - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + - - - - - - - - - - - - - - - - - - - -
- - -
+ + +
- - Name - + + Name + +
+ - - - 		-
+
- Type +
+ Type +
- - 		-
+
+
+ Published +
+
+ 		+
+
+ Price +
+
+
+
+
+
+ + No of Rows: + +
+
+ 20 +
+ + +
+
+
+
+ + +
+
+
+ + +
+
+ +
+
+ Nebula Night Sky Paint +
+
+ 		+ Paint + +
Published
- - - 		+ + $15.00 +
- Price -
- - -
-
-
-
- - No of Rows: - -
-
- 20 -
- - -
+
+ +
+
+ Light Speed Yellow Paint
+
+ Paint +
-
+ $15.00 +
+ + +
+
- - - - -
+
- - - - + Hyperspace Turquoise Paint +
- -
- - - - -
+
- +
+ $15.00 +
+ - Paint - -
- Published -
- 		- $15.00 -
- - -
+
- + +
+
+ Pineapple Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Paint - -
- Published -
- 		- $15.00 -
- - -
+
- + +
+
+ Coconut Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Paint - -
- Published -
- 		- $15.00 -
- - -
+
- + +
+
+ Apple Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Orange Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Banana Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Bean Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Carrot Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Green Juice +
+ + 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Code Division T-shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Polo Shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Juice - -
- Published -
- 		- $3.00 -
- - -
+
- + +
+
+ Polo Shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Polo Shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Polo Shirt +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Black Hoodie +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Blue Hoodie +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- + +
+
+ Mustard Hoodie +
+ + 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ - Top (clothing) - -
- Published -
- 		- $30.00 -
- - -
+
- +
+ +
+
+ Colored Parrot Cushion +
-
- Blue Hoodie -
- - 		- Top (clothing) - -
+
- Published - - - $30.00 -
- - -
+
- + Published
-
- Mustard Hoodie -
- - 		- Top (clothing) - -
+
- Published - - - $30.00 -
- - -
-
- -
-
- Colored Parrot Cushion -
-
- 		- Cushion - -
- Published -
- 		- $20.00 -
+ $20.00 + + + + +
@@ -106573,146 +107145,150 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
- - - - - + + - Extended Hard - - - - - + + - Extended Soft - - - - - + + - Normal Hard - - - - - - - - + + - - -
-
- + +
+
-
-
-
+ + Extended Hard +
-
- + +
+
-
-
-
+ + Extended Soft +
-
- + +
+
-
-
-
+ + Normal Hard +
-
- + +
+
-
-
-
- Normal Soft -
- - +
+ -
+ + Add variant + + + + + + +
@@ -107264,146 +107840,150 @@ exports[`Storyshots Views / Products / Product variant details when loaded data
- - - - - + + - Extended Hard - - - - - + + - Extended Soft - - - - - + + - Normal Hard - - - - - - - - + + - - -
-
- + +
+
-
-
-
+ + Extended Hard +
-
- + +
+
-
-
-
+ + Extended Soft +
-
- + +
+
-
-
-
+ + Normal Hard +
-
- + +
+
-
-
-
- Normal Soft -
- - +
+ -
+ + Add variant + + + + + + +
@@ -107942,73 +108522,77 @@ exports[`Storyshots Views / Products / Product variant details when loading data
- - - - - - - - - - -
-
- + +
+
-
-
-
- - ‌ - -
- - Add variant + ‌ - -
+ + + + + + + + + +
@@ -110035,79 +110619,83 @@ exports[`Storyshots Views / Services / Service details default 1`] = `
- - - - - - - - - - - - - + + + + + + + + - - -
- Token Note - - Key - - Actions -
- default - - **** AK05 - - + Key + + Actions +
+ default + + **** AK05 + + -
+ + + + + + + +
@@ -110743,79 +111331,83 @@ exports[`Storyshots Views / Services / Service details default token 1`] = `
- - - - - - - - - - - - - + + + + + + + + - - -
- Token Note - - Key - - Actions -
- default - - **** AK05 - - + Key + + Actions +
+ default + + **** AK05 + + -
+ + + + + + + +
@@ -111373,79 +111965,83 @@ exports[`Storyshots Views / Services / Service details form errors 1`] = `
- - - - - - - - - - - - - + + + + + + + + - - -
- Token Note - - Key - - Actions -
- default - - **** AK05 - - + Key + + Actions +
+ default + + **** AK05 + + -
+ + + + + + + +
@@ -112004,87 +112600,91 @@ exports[`Storyshots Views / Services / Service details loading 1`] = `
- - - - - - - - - - + Token Note + + + + + + - - - - - -
- Token Note - - Key - - Actions -
+ Key + + Actions +
- - ‌ - - - - ‌ - - - -
+ + + + ‌ + + + + + + + + +
@@ -112654,340 +113254,344 @@ exports[`Storyshots Views / Services / Service list default 1`] = `
- - - - - - - - + Name + + + + - + + + + + - - - - - - + + - - - - - + + - - Facebook Market - -
- active -
- - - - - + - - - -
- Name - -
+
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
+
+ + Slack +
- - + active
- -
- + - Slack - -
- active -
- 		+ + + + + +
- - - - -
- - -
- + - Magento Importer - -
- inactive -
- 		- - + -
+ + + + + + + +
@@ -113105,213 +113709,217 @@ exports[`Storyshots Views / Services / Service list loading 1`] = `
- - - - - - - - + Name + + + + - - - - - + + + - - + - - -
- Name - -
+
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - ‌ - - -
-
- - - - - - -
+ + + + + + + + + @@ -113429,155 +114037,159 @@ exports[`Storyshots Views / Services / Service list no data 1`] = `
- - - - - - - - + Name + + + + - - - - - + + + - - - -
- Name - -
+
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No service accounts found -
+ + No service accounts found + + + + + @@ -113717,48 +114329,52 @@ exports[`Storyshots Views / Shipping / Create shipping zone default 1`] = `
- - - - - - - -
- 0 Countries - - + -
+ + + + + + + +
@@ -113901,48 +114517,52 @@ exports[`Storyshots Views / Shipping / Create shipping zone form errors 1`] = `
- - - - - - - -
- 0 Countries - - + -
+ + + + + + + +
@@ -114080,48 +114700,52 @@ exports[`Storyshots Views / Shipping / Shipping zone details default 1`] = `
- - - - - - - -
- 51 Countries - - + -
+ + + + + + + +
- - - - - - - - - - + Name + + + + + + - - - - - - - - - - - - - - -
- Name - - Value Range - - Price - - -
+ Value Range + + Price + + +
- UPS - - from $0.00 - - $48.11 - - - - - - - - -
- DHL - - from $0.00 - - $95.24 - - - - - - - - - - - - -
+ + + + + + + + + + + DHL + + + from $0.00 + + + $95.24 + + + + + + + + + + +
- - - - - - - - - - + Name + + + + + + - - - - - - - - - - - - - - -
- Name - - Weight Range - - Price - - -
+ Weight Range + + Price + + +
- DB Schenker - - 0 kg - 80 kg - - $45.93 - - - - - - - - -
- Registred priority - - from 0 kg - - $73.87 - - - - - - - - - - - - -
+ + + + + + + + + + + Registred priority + + + from 0 kg + + + $73.87 + + + + + + + + + + +
@@ -114698,48 +115330,52 @@ exports[`Storyshots Views / Shipping / Shipping zone details form errors 1`] = `
- - - - - - - -
- 51 Countries - - + -
+ + + + + + + +
- - - - - - - - - - + Name + + + + + + - - - - - - - - - - - - - - -
- Name - - Value Range - - Price - - -
+ Value Range + + Price + + +
- UPS - - from $0.00 - - $48.11 - - - - - - - - -
- DHL - - from $0.00 - - $95.24 - - - - - - - - - - - - -
+ + + + + + + + + + + DHL + + + from $0.00 + + + $95.24 + + + + + + + + + + +
- - - - - - - - - - + Name + + + + + + - - - - - - - - - - - - - - -
- Name - - Weight Range - - Price - - -
+ Weight Range + + Price + + +
- DB Schenker - - 0 kg - 80 kg - - $45.93 - - - - - - - - -
- Registred priority - - from 0 kg - - $73.87 - - - - - - - - - - - - -
+ + + + + + + + + + + Registred priority + + + from 0 kg + + + $73.87 + + + + + + + + + + +
@@ -115316,48 +115960,52 @@ exports[`Storyshots Views / Shipping / Shipping zone details loading 1`] = `
- - - - - - - -
- ... Countries - - + -
+ + + + + + + +
- - - - - - - - - - + Name + + + + + + - - - - - - - -
- Name - - Value Range - - Price - - -
+ Value Range + + Price + + +
- - ‌ - - - - ‌ - - - - ‌ - - - - - - + ‌ - -
+ + + + ‌ + + + + + + + + + + + +
- - - - - - - - - - + Name + + + + + + - - - - - - - -
- Name - - Weight Range - - Price - - -
+ Weight Range + + Price + + +
- - ‌ - - - - ‌ - - - - ‌ - - - - - - + ‌ - -
+ + + + ‌ + + + + + + + + + + + +
@@ -115751,437 +116407,441 @@ exports[`Storyshots Views / Shipping / Shipping zones list default 1`] = `
- - - - - - - - - - + + + + + + + + - - - - - + + + - - - - - - - + - - - - - - + + - - - - - - - - + - - - - - - + + - - - - - + + + - - -
- - - Name - - Countries - -
+ Name + + Countries + +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - Europe - - 51 - - -
- + - - - - Oceania - - 29 - - - + + -
- Asia - - 51 - - -
- + - - - - Americas - - 57 - - - + + -
- Africa - - 60 - - + + Asia + + 51 + + -
+ + + + + + + + + + + Americas + + + 57 + + + + + + + + + + + Africa + + + 60 + + + + + + + +
@@ -116356,235 +117016,239 @@ exports[`Storyshots Views / Shipping / Shipping zones list loading 1`] = `
- - - - - - - - - - + + + + + + + + - - - - - + + + - - - - + - - -
- - - Name - - Countries - -
+ Name + + Countries + +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - - ‌ - - - - ‌ - - - + - + ‌ - -
+ + + + ‌ + + + + + + + + +
@@ -116758,161 +117422,165 @@ exports[`Storyshots Views / Shipping / Shipping zones list no data 1`] = `
- - - - - - - - - + Name + + + + + - - - - - + + + - - - -
- Name - - Countries - -
+ Countries + +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No shipping zones found -
+ + No shipping zones found + + + + +
@@ -117087,437 +117755,441 @@ exports[`Storyshots Views / Shipping / Shipping zones list no site settings perm
- - - - - - - - - - + + + + + + + + - - - - - + + + - - - - - - - + - - - - - - + + - - - - - - - - + - - - - - - + + - - - - - + + + - - -
- - - Name - - Countries - -
+ Name + + Countries + +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - - Europe - - 51 - - -
- + - - - - Oceania - - 29 - - - + + -
- Asia - - 51 - - -
- + - - - - Americas - - 57 - - - + + -
- Africa - - 60 - - + + Asia + + 51 + + -
+ + + + + + + + + + + Americas + + + 57 + + + + + + + + + + + Africa + + + 60 + + + + + + + +
@@ -118305,77 +118977,81 @@ exports[`Storyshots Views / Site settings / Page default 1`] = `
- - - - - - - - - - - - + + + + + + + - - -
- Authentication Type - - Key - -
- Facebook - - n1n62jkn2123:123n - - + Key + +
+ Facebook + + n1n62jkn2123:123n + + -
+ + + + + + + +
@@ -119172,77 +119848,81 @@ exports[`Storyshots Views / Site settings / Page form errors 1`] = `
- - - - - - - - - - - - + + + + + + + - - -
- Authentication Type - - Key - -
- Facebook - - n1n62jkn2123:123n - - + Key + +
+ Facebook + + n1n62jkn2123:123n + + -
+ + + + + + + + @@ -120046,85 +120726,89 @@ exports[`Storyshots Views / Site settings / Page loading 1`] = `
- - - - - - - - - + Authentication Type + + + + + - - - - - -
- Authentication Type - - Key - -
+ Key + +
- - ‌ - - - - ‌ - - - -
+ + + + ‌ + + + + + + + + + @@ -122147,519 +122831,523 @@ exports[`Storyshots Views / Staff / Staff members default 1`] = `
- - - - - - - - - + Name + + + + + - + + + + + - - - - - + + + -
- -
-
+ +
+
+ Jacob Smith +
+
+ Inactive +
+ + - + - admin@example.com - - - - + + + -
- -
-
+ +
+
+ Jacob Smith +
+
+ Active +
+ + - + - admin@example.com - - - - + + + -
- -
-
+ +
+
+ Jacob Smith +
+
+ Active +
+ + - + - admin@example.com - - - - + + + -
- -
-
+ +
+
+ Jacob Smith +
+
+ Active +
+ + - + - admin@example.com - - - - + + + -
- -
-
+ +
+
+ Jacob Smith +
+
+ Inactive +
+ + - + - admin@example.com - - - - + + + -
- -
-
+ +
+
+ Jacob Smith +
+
+ Active +
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Name - - Email Address -
+ Email Address +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
+
+
+
+
- - + Chris Cooper
- -
+ Active + + + admin@example.com +
- Chris Cooper - -
- Active -
- 		+
+
+ +
+
+ Jacob Smith +
+
+ Active +
+ 		+ admin@example.com +
- Jacob Smith - -
- Inactive -
- 		+
+
+ +
+
+ Jacob Smith +
+
+ Active +
+ 		+ admin@example.com +
- Jacob Smith - -
- Active -
- 		+
+
+ +
+
+ Jacob Smith +
+
+ Inactive +
+ 		+ admin@example.com +
- Jacob Smith - -
- Active -
- 		+
+
+ +
+
+ Jacob Smith +
+
+ Active +
+ 		+ admin@example.com +
- Jacob Smith - -
- Active -
- 		+
+
+ +
+
+ Jacob Smith +
+
+ Inactive +
+ 		+ admin@example.com +
- Jacob Smith - -
- Active -
- 		- admin@example.com -
-
- -
-
- Jacob Smith -
-
- Inactive -
- 		- admin@example.com -
-
- -
-
- Jacob Smith -
-
- Active -
- 		- admin@example.com -
-
- -
-
- Jacob Smith -
-
- Active -
- 		- admin@example.com -
-
- -
-
- Jacob Smith -
-
- Inactive -
- 		- admin@example.com -
-
- -
-
- Jacob Smith -
-
- Inactive -
- 		- admin@example.com -
-
- -
-
- Jacob Smith -
-
- Active -
- 		- admin@example.com -
+ admin@example.com + + + + + @@ -122777,194 +123465,198 @@ exports[`Storyshots Views / Staff / Staff members when loading 1`] = `
- - - - - - - - - + Name + + + + + - + + + + + - - - - - - - - -
- Name - - Email Address -
+ Email Address +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
+
+ + +
+
+
+
+
+
+
- - + ‌ +
-
-
-
-
+ + ‌ +
-
-
+
‌ - -
- - ‌ - -
- 		- - ‌ - -
+ + + + + @@ -123119,572 +123811,576 @@ exports[`Storyshots Views / Taxes / Country List default 1`] = `
- - - - - - - - - - + Country Code + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Country Code - - Country Name - - Reduced Tax Rates -
+ Country Name + + Reduced Tax Rates +
- AT - - Austria - - 8 -
- BE - - Belgia - - 10 -
- BG - - Bułgaria - - 1 -
- CY - - Cypr - - 11 -
- CZ - - Czechy - - 11 -
- DE - - Niemcy - - 8 -
- DK - - Dania - - 0 -
- EE - - Estonia - - 4 -
- ES - - Hiszpania - - 8 -
- FI - - Finlandia - - 10 -
- FR - - Francja - - 13 -
- GB - - Wielka Brytania - - 8 -
- GR - - Grecja - - 9 -
- HR - - Chorwacja - - 2 -
- HU - - Węgry - - 5 -
- IE - - Irlandia - - 10 -
- IT - - Włochy - - 10 -
- LT - - Litwa - - 3 -
- LU - - Luksemburg - - 17 -
- LV - - Łotwa - - 5 -
- MT - - Malta - - 8 -
- NL - - Holandia - - 9 -
- PL - - Polska - - 10 -
- PT - - Portugalia - - 8 -
- RO - - Rumunia - - 9 -
- SE - - Szwecja - - 2 -
- SI - - Słowenia - - 9 -
- SK - - Słowacja - - 6 -
+ + + AT + + + Austria + + + 8 + + + + + BE + + + Belgia + + + 10 + + + + + BG + + + Bułgaria + + + 1 + + + + + CY + + + Cypr + + + 11 + + + + + CZ + + + Czechy + + + 11 + + + + + DE + + + Niemcy + + + 8 + + + + + DK + + + Dania + + + 0 + + + + + EE + + + Estonia + + + 4 + + + + + ES + + + Hiszpania + + + 8 + + + + + FI + + + Finlandia + + + 10 + + + + + FR + + + Francja + + + 13 + + + + + GB + + + Wielka Brytania + + + 8 + + + + + GR + + + Grecja + + + 9 + + + + + HR + + + Chorwacja + + + 2 + + + + + HU + + + Węgry + + + 5 + + + + + IE + + + Irlandia + + + 10 + + + + + IT + + + Włochy + + + 10 + + + + + LT + + + Litwa + + + 3 + + + + + LU + + + Luksemburg + + + 17 + + + + + LV + + + Łotwa + + + 5 + + + + + MT + + + Malta + + + 8 + + + + + NL + + + Holandia + + + 9 + + + + + PL + + + Polska + + + 10 + + + + + PT + + + Portugalia + + + 8 + + + + + RO + + + Rumunia + + + 9 + + + + + SE + + + Szwecja + + + 2 + + + + + SI + + + Słowenia + + + 9 + + + + + SK + + + Słowacja + + + 6 + + + + +
@@ -123849,71 +124545,75 @@ exports[`Storyshots Views / Taxes / Country List loading 1`] = `
- - - - - - - - - - + Country Code + + + + + + - - + - + - - -
- Country Code - - Country Name - - Reduced Tax Rates -
+ Country Name + + Reduced Tax Rates +
- - ‌ - - - + ‌ + + - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + +
@@ -123952,146 +124652,150 @@ exports[`Storyshots Views / Taxes / Reduced Tax Categories default 1`] = `
- - - - - - - - - + Category + + + + + - - + + + - 10 - - - - + + + - Admission to entertainment events - - + + + - 10 - - - - + + + - Books - - + + + - 10 - - - - + + + - Foodstuffs - - + + + - 10 - - - - - - - - - - - - - - - - - - - -
- Category - - Tax Rate -
+ Tax Rate +
- Admission to cultural events - + Admission to cultural events + + 10 +
+ Admission to entertainment events + + 10 +
+ Books + + 10 +
+ Foodstuffs + + 10 +
+ Hotels + + 10 +
+ Newspapers + + 10 +
+ Passenger transport + + 10 +
- Hotels - - 10 -
- Newspapers - - 10 -
- Passenger transport - - 10 -
- Pharmaceuticals - - 10 -
+ + Pharmaceuticals + + + 10 + + + + +
@@ -124134,56 +124838,60 @@ exports[`Storyshots Views / Taxes / Reduced Tax Categories loading 1`] = `
- - - - - - - - - + Category + + + + + - - + - - -
- Category - - Tax Rate -
+ Tax Rate +
- - ‌ - - - + ‌ + + - ‌ - -
+ + ‌ + + + + + +
@@ -124351,139 +125059,143 @@ exports[`Storyshots Views / Translations / Entity list default 1`] = `
- - - - - - - - - + Name + + + + + - - - - - + + + - - + + + - 1 of 3 - - - - - - - -
- Name - - Completed Translations -
+ Completed Translations +
-
-
- - + + + + +
-
-
- White Hoodie - + White Hoodie + + 1 of 3 +
- Brown Supreme Hoodie - - 2 of 3 -
+ + Brown Supreme Hoodie + + + 2 of 3 + + + + + @@ -124515,64 +125227,68 @@ exports[`Storyshots Views / Translations / Language list default 1`] = `
- - - - - - - - + Language + + + + - - - - + + - angielski - - - - + + - hiszpański - - - - + + - polski - - - -
- Language -
- niemiecki -
+ niemiecki +
+ angielski +
+ hiszpański +
+ + polski + + + + +
@@ -124604,41 +125320,45 @@ exports[`Storyshots Views / Translations / Language list loading 1`] = `
- - - - - - - - - - - -
- Language -
- - ‌ - -
+ Language + + + + + + + + ‌ + + + + + +
@@ -124670,38 +125390,42 @@ exports[`Storyshots Views / Translations / Language list no data 1`] = `
- - - - - - - - + Language + + + + - - - -
- Language -
- No languages found -
+ + No languages found + + + + +
@@ -128074,273 +128798,277 @@ exports[`Storyshots Views / Webhooks / Webhook list default 1`] = `
- - - - - - - - - - + Name + + + + + + - - - - - + + + - - - - - - - - + + + + - - -
- Name - - Service Account - - Action -
+ Service Account + + Action +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- Webhook Test - - Test Account - - - - - - - -
- Webhook Test 2 - - Test Account 2 - - - - - - - + +
- + + Test Account 2 + + -
+ + + + + + + + + @@ -128458,222 +129186,226 @@ exports[`Storyshots Views / Webhooks / Webhook list loading 1`] = `
- - - - - - - - - - + Name + + + + + + - - - - - + + + - - - - - -
- Name - - Service Account - - Action -
+ Service Account + + Action +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- - ‌ - - - - ‌ - - - - - + ‌ - -
+ + + + + + + + + @@ -128791,163 +129523,167 @@ exports[`Storyshots Views / Webhooks / Webhook list no data 1`] = `
- - - - - - - - - - + Name + + + + + + - - - - - + + + - - - -
- Name - - Service Account - - Action -
+ Service Account + + Action +
-
-
- - No of Rows: - -
+
+
+ + No of Rows: +
- 20 -
- -
+ - + +
-
-
- - + + + + +
- -
- No webhooks found -
+ + No webhooks found + + + + + From 2d2eea5967d67b89eeac7cecb8f4ab19fdb22636 Mon Sep 17 00:00:00 2001 From: Krzysztof Bialoglowicz Date: Mon, 4 Nov 2019 22:04:27 +0100 Subject: [PATCH 10/18] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 053f66dd9..6e7cb2333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,3 +61,4 @@ All notable, unreleased changes to this project will be documented in this file. - Fix permission handling - #231 by @dominik-zeglen - Use React.FC instead of deprecated React.StatelessComponent type - #245 by @dominik-zeglen - Update @material-ui to v4 - #234 by @dominik-zeglen +- Improve mobile appearance - #240 by @benekex2 From 1c9b9743e06aa29feb67cbe12e1f173399ab7daf Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Tue, 12 Nov 2019 17:07:29 +0100 Subject: [PATCH 11/18] Add theme-color meta --- src/components/Theme/ThemeProvider.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/Theme/ThemeProvider.tsx b/src/components/Theme/ThemeProvider.tsx index 169a663b6..591358b2b 100644 --- a/src/components/Theme/ThemeProvider.tsx +++ b/src/components/Theme/ThemeProvider.tsx @@ -1,5 +1,6 @@ import { MuiThemeProvider } from "@material-ui/core/styles"; import React from "react"; +import Helmet from "react-helmet"; import Baseline from "../../Baseline"; import createTheme from "../../theme"; @@ -27,6 +28,8 @@ const ThemeProvider: React.FC = ({ localStorage.setItem("theme", (!isDark).toString()); }; + const theme = createTheme(isDark ? dark : light); + return ( = ({ toggleTheme }} > - + + + + {children} From b2fa51ce946fd7f02410225beb76dca1594dfc13 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Tue, 12 Nov 2019 17:28:21 +0100 Subject: [PATCH 12/18] Fix minor bugs --- src/components/AppLayout/AppLayout.tsx | 30 +++++++++++++++++-- src/components/AppLayout/MenuNested.tsx | 1 + src/components/ColumnPicker/ColumnPicker.tsx | 2 +- .../ColumnPicker/ColumnPickerContent.tsx | 3 ++ src/components/Container.tsx | 29 ++++++++++-------- .../ExtendedPageHeader/ExtendedPageHeader.tsx | 2 +- src/components/PageHeader/PageHeader.tsx | 4 +-- 7 files changed, 53 insertions(+), 18 deletions(-) diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx index 0362dc578..32517e68e 100644 --- a/src/components/AppLayout/AppLayout.tsx +++ b/src/components/AppLayout/AppLayout.tsx @@ -64,6 +64,12 @@ const useStyles = makeStyles( marginLeft: theme.spacing(2), transition: theme.transitions.duration.standard + "ms" }, + avatar: { + "&&": { + height: 32, + width: 32 + } + }, content: { [theme.breakpoints.down("sm")]: { paddingLeft: 0 @@ -79,9 +85,16 @@ const useStyles = makeStyles( paddingLeft: drawerWidth }, darkThemeSwitch: { + [theme.breakpoints.down("sm")]: { + marginRight: -theme.spacing(1.5) + }, marginRight: theme.spacing(2) }, header: { + [theme.breakpoints.down("sm")]: { + height: 88, + marginBottom: 0 + }, display: "flex", height: 40, marginBottom: theme.spacing(3) @@ -179,6 +192,9 @@ const useStyles = makeStyles( [theme.breakpoints.up("md")]: { display: "none" }, + [theme.breakpoints.down("sm")]: { + left: 0 + }, background: theme.palette.background.paper, borderRadius: "50%", cursor: "pointer", @@ -239,12 +255,20 @@ const useStyles = makeStyles( flex: 1 }, userBar: { + [theme.breakpoints.down("sm")]: { + alignItems: "flex-end", + flexDirection: "column-reverse", + overflow: "hidden" + }, alignItems: "center", display: "flex" }, userChip: { backgroundColor: theme.palette.background.paper, - color: theme.palette.text.primary + borderRadius: 24, + color: theme.palette.text.primary, + height: 40, + padding: theme.spacing(0.5) }, userMenuContainer: { position: "relative" @@ -415,6 +439,9 @@ const AppLayout: React.FC = ({ children }) => { ) } + classes={{ + avatar: classes.avatar + }} className={classes.userChip} label={ <> @@ -433,7 +460,6 @@ const AppLayout: React.FC = ({ children }) => { open={isMenuOpened} anchorEl={anchor.current} transition - disablePortal placement="bottom-end" > {({ TransitionProps, placement }) => ( diff --git a/src/components/AppLayout/MenuNested.tsx b/src/components/AppLayout/MenuNested.tsx index 85ed202bb..314156aa9 100644 --- a/src/components/AppLayout/MenuNested.tsx +++ b/src/components/AppLayout/MenuNested.tsx @@ -75,6 +75,7 @@ const useStyles = makeStyles(theme => ({ zIndex: 2 }, right: -300, + width: drawerWidthExpanded, zIndex: -1 }, subHeader: { diff --git a/src/components/ColumnPicker/ColumnPicker.tsx b/src/components/ColumnPicker/ColumnPicker.tsx index aa1f55275..83b05f306 100644 --- a/src/components/ColumnPicker/ColumnPicker.tsx +++ b/src/components/ColumnPicker/ColumnPicker.tsx @@ -29,7 +29,7 @@ const useStyles = makeStyles( popper: { boxShadow: `0px 5px 10px 0 ${fade(theme.palette.common.black, 0.05)}`, marginTop: theme.spacing(2), - zIndex: 1 + zIndex: 2 } }), { diff --git a/src/components/ColumnPicker/ColumnPickerContent.tsx b/src/components/ColumnPicker/ColumnPickerContent.tsx index 8580d4391..5977f5f55 100644 --- a/src/components/ColumnPicker/ColumnPickerContent.tsx +++ b/src/components/ColumnPicker/ColumnPickerContent.tsx @@ -43,6 +43,9 @@ const useStyles = makeStyles(theme => ({ marginRight: theme.spacing(2) }, content: { + [theme.breakpoints.down("sm")]: { + gridTemplateColumns: "repeat(2, 1fr)" + }, display: "grid", gridColumnGap: theme.spacing(3), gridTemplateColumns: "repeat(3, 1fr)", diff --git a/src/components/Container.tsx b/src/components/Container.tsx index c2e48752a..3f4e5533b 100644 --- a/src/components/Container.tsx +++ b/src/components/Container.tsx @@ -2,19 +2,24 @@ import { makeStyles } from "@material-ui/core/styles"; import classNames from "classnames"; import React from "react"; -const useStyles = makeStyles(theme => ({ - root: { - [theme.breakpoints.up("lg")]: { - marginLeft: "auto", - marginRight: "auto", - maxWidth: theme.breakpoints.width("lg") - }, - [theme.breakpoints.up("sm")]: { - padding: theme.spacing(0, 3) - }, - padding: theme.spacing(0, 1) +const useStyles = makeStyles( + theme => ({ + root: { + [theme.breakpoints.up("lg")]: { + marginLeft: "auto", + marginRight: "auto", + maxWidth: theme.breakpoints.width("lg") + }, + [theme.breakpoints.up("sm")]: { + padding: theme.spacing(0, 3) + }, + padding: theme.spacing(0, 1) + } + }), + { + name: "Container" } -})); +); interface ContainerProps { className?: string; diff --git a/src/components/ExtendedPageHeader/ExtendedPageHeader.tsx b/src/components/ExtendedPageHeader/ExtendedPageHeader.tsx index 5972b3619..e34fbb468 100644 --- a/src/components/ExtendedPageHeader/ExtendedPageHeader.tsx +++ b/src/components/ExtendedPageHeader/ExtendedPageHeader.tsx @@ -6,7 +6,7 @@ const useStyles = makeStyles(theme => ({ action: { flex: "0 0 auto", [theme.breakpoints.down("sm")]: { - paddingLeft: 10 + marginTop: theme.spacing() } }, grid: { diff --git a/src/components/PageHeader/PageHeader.tsx b/src/components/PageHeader/PageHeader.tsx index 3800a254e..515e9aa9f 100644 --- a/src/components/PageHeader/PageHeader.tsx +++ b/src/components/PageHeader/PageHeader.tsx @@ -12,8 +12,8 @@ const useStyles = makeStyles(theme => ({ title: { [theme.breakpoints.down("sm")]: { fontSize: 20, - paddingBottom: 20, - paddingLeft: 10 + marginTop: theme.spacing(2), + padding: 0 }, flex: 1, fontSize: 24, From c8fa856dd171e8c3e464806f13d23fa8ff20cd47 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Tue, 12 Nov 2019 17:30:11 +0100 Subject: [PATCH 13/18] Update snapshots --- .../__snapshots__/Stories.test.ts.snap | 386 +++++++++--------- 1 file changed, 193 insertions(+), 193 deletions(-) diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index b8570bfc7..c8727d5f1 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -7822,7 +7822,7 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = ` >
Date: Wed, 13 Nov 2019 13:56:51 +0100 Subject: [PATCH 14/18] Improve responsiveness --- src/components/AppLayout/MenuList.tsx | 2 +- src/components/AppLayout/MenuNested.tsx | 12 ++- src/components/AppLayout/consts.ts | 1 + src/components/ColumnPicker/ColumnPicker.tsx | 2 +- .../ColumnPicker/ColumnPickerContent.tsx | 5 +- .../ExtendedPageHeader/ExtendedPageHeader.tsx | 82 +++++++++++-------- src/components/PageHeader/PageHeader.tsx | 8 +- .../OrderDetailsPage/OrderDetailsPage.tsx | 24 ++++-- .../OrderDraftPage/OrderDraftPage.tsx | 5 +- 9 files changed, 86 insertions(+), 55 deletions(-) diff --git a/src/components/AppLayout/MenuList.tsx b/src/components/AppLayout/MenuList.tsx index 410ac2301..4e29d600b 100644 --- a/src/components/AppLayout/MenuList.tsx +++ b/src/components/AppLayout/MenuList.tsx @@ -101,7 +101,7 @@ const useStyles = makeStyles(theme => ({ content: "''", height: 0, position: "absolute", - right: -35, + right: -30, top: 15, width: 0 }, diff --git a/src/components/AppLayout/MenuNested.tsx b/src/components/AppLayout/MenuNested.tsx index 314156aa9..39ccd41bc 100644 --- a/src/components/AppLayout/MenuNested.tsx +++ b/src/components/AppLayout/MenuNested.tsx @@ -8,7 +8,11 @@ import SVG from "react-inlinesvg"; import menuArrowIcon from "@assets/images/menu-arrow-icon.svg"; import useTheme from "@saleor/hooks/useTheme"; import { createHref } from "@saleor/misc"; -import { drawerWidthExpanded, drawerWidthExpandedMobile } from "./consts"; +import { + drawerNestedMenuWidth, + drawerWidthExpanded, + drawerWidthExpandedMobile +} from "./consts"; import { IActiveSubMenu } from "./MenuList"; import { IMenuItem } from "./menuStructure"; @@ -20,7 +24,7 @@ const useStyles = makeStyles(theme => ({ right: 0, top: 0, transition: `right ${theme.transitions.duration.shorter}ms ease`, - width: 300, + width: drawerNestedMenuWidth, zIndex: -1 }, menuListNestedClose: { @@ -74,8 +78,8 @@ const useStyles = makeStyles(theme => ({ width: drawerWidthExpandedMobile, zIndex: 2 }, - right: -300, - width: drawerWidthExpanded, + right: -drawerNestedMenuWidth, + width: drawerNestedMenuWidth, zIndex: -1 }, subHeader: { diff --git a/src/components/AppLayout/consts.ts b/src/components/AppLayout/consts.ts index a513c3112..b5184b016 100644 --- a/src/components/AppLayout/consts.ts +++ b/src/components/AppLayout/consts.ts @@ -1,5 +1,6 @@ export const drawerWidthExpanded = 210; export const drawerWidthExpandedMobile = 250; export const drawerWidth = 80; +export const drawerNestedMenuWidth = 300; export const navigationBarHeight = 64; export const appLoaderHeight = 4; diff --git a/src/components/ColumnPicker/ColumnPicker.tsx b/src/components/ColumnPicker/ColumnPicker.tsx index 83b05f306..f2a1c9434 100644 --- a/src/components/ColumnPicker/ColumnPicker.tsx +++ b/src/components/ColumnPicker/ColumnPicker.tsx @@ -28,7 +28,7 @@ const useStyles = makeStyles( theme => ({ popper: { boxShadow: `0px 5px 10px 0 ${fade(theme.palette.common.black, 0.05)}`, - marginTop: theme.spacing(2), + marginTop: theme.spacing(1), zIndex: 2 } }), diff --git a/src/components/ColumnPicker/ColumnPickerContent.tsx b/src/components/ColumnPicker/ColumnPickerContent.tsx index 5977f5f55..7ea3e865f 100644 --- a/src/components/ColumnPicker/ColumnPickerContent.tsx +++ b/src/components/ColumnPicker/ColumnPickerContent.tsx @@ -69,6 +69,9 @@ const useStyles = makeStyles(theme => ({ }, root: { boxShadow: "0px 4px 4px rgba(0, 0, 0, 0.25)" + }, + titleContainer: { + padding: theme.spacing(1.5, 3.5) } })); @@ -97,7 +100,7 @@ const ColumnPickerContent: React.FC = props => { return ( - + ({ - action: { - flex: "0 0 auto", - [theme.breakpoints.down("sm")]: { - marginTop: theme.spacing() +const useStyles = makeStyles( + theme => ({ + action: { + flex: "0 0 auto", + [theme.breakpoints.down("sm")]: { + marginTop: theme.spacing() + } + }, + block: { + [theme.breakpoints.down("sm")]: { + "&&": { + display: "block" + } + } + }, + grid: { + padding: theme.spacing(2) + }, + menuButton: { + flex: "0 0 auto", + marginLeft: -theme.spacing(2), + marginRight: theme.spacing(3), + marginTop: -theme.spacing(2) + }, + root: { + alignItems: "center", + display: "flex", + marginBottom: theme.spacing(3) + }, + subtitle: { + alignItems: "center", + display: "flex", + marginBottom: theme.spacing(2) + }, + title: { + flex: 1, + paddingBottom: theme.spacing(2) } - }, - grid: { - padding: theme.spacing(2) - }, - menuButton: { - flex: "0 0 auto", - marginLeft: -theme.spacing(2), - marginRight: theme.spacing(3), - marginTop: -theme.spacing(2) - }, - root: { - alignItems: "center", - display: "flex", - marginBottom: theme.spacing(3), - [theme.breakpoints.down("sm")]: { - display: "block" - } - }, - subtitle: { - alignItems: "center", - display: "flex", - marginBottom: theme.spacing(2) - }, - title: { - flex: 1, - paddingBottom: theme.spacing(2) + }), + { + name: "ExtendedPageHeader" } -})); +); interface ExtendedPageHeaderProps { children?: React.ReactNode; className?: string; + inline?: boolean; title?: React.ReactNode; } const ExtendedPageHeader: React.FC = props => { - const { children, className, title } = props; + const { children, className, inline, title } = props; const classes = useStyles(props); return ( -
+
{title}
{children}
diff --git a/src/components/PageHeader/PageHeader.tsx b/src/components/PageHeader/PageHeader.tsx index 515e9aa9f..d1457663b 100644 --- a/src/components/PageHeader/PageHeader.tsx +++ b/src/components/PageHeader/PageHeader.tsx @@ -15,26 +15,28 @@ const useStyles = makeStyles(theme => ({ marginTop: theme.spacing(2), padding: 0 }, + alignSelf: "flex-start", flex: 1, - fontSize: 24, - paddingBottom: theme.spacing(2) + fontSize: 24 } })); interface PageHeaderProps { children?: React.ReactNode; className?: string; + inline?: boolean; title?: string; } const PageHeader: React.FC = props => { - const { children, className, title } = props; + const { children, className, inline, title } = props; const classes = useStyles(props); return ( {title !== undefined ? title : } diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index 9e53e3851..886d46d9c 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -23,16 +23,21 @@ import OrderHistory, { FormData as HistoryFormData } from "../OrderHistory"; import OrderPayment from "../OrderPayment/OrderPayment"; import OrderUnfulfilledItems from "../OrderUnfulfilledItems/OrderUnfulfilledItems"; -const useStyles = makeStyles(theme => ({ - date: { - marginBottom: theme.spacing(3), - marginTop: -theme.spacing(2) - }, - header: { - display: "flex", - marginBottom: 0 +const useStyles = makeStyles( + theme => ({ + date: { + marginBottom: theme.spacing(3), + marginTop: -theme.spacing(2) + }, + header: { + display: "flex", + marginBottom: 0 + } + }), + { + name: "OrderDetailsPage" } -})); +); export interface OrderDetailsPageProps extends UserPermissionProps { order: OrderDetails_order; @@ -96,6 +101,7 @@ const OrderDetailsPage: React.FC = props => { order.number) ? "#" + order.number : undefined} > {canCancel && ( diff --git a/src/orders/components/OrderDraftPage/OrderDraftPage.tsx b/src/orders/components/OrderDraftPage/OrderDraftPage.tsx index 77cf46f3a..dbe3ea00c 100644 --- a/src/orders/components/OrderDraftPage/OrderDraftPage.tsx +++ b/src/orders/components/OrderDraftPage/OrderDraftPage.tsx @@ -25,10 +25,10 @@ import OrderHistory, { FormData as HistoryFormData } from "../OrderHistory"; const useStyles = makeStyles(theme => ({ date: { - marginBottom: theme.spacing(3), - marginLeft: theme.spacing(7) + marginBottom: theme.spacing(3) }, header: { + display: "flex", marginBottom: 0 } })); @@ -99,6 +99,7 @@ const OrderDraftPage: React.FC = props => { order.number) ? "#" + order.number : undefined} > Date: Wed, 13 Nov 2019 13:57:46 +0100 Subject: [PATCH 15/18] Remove unused import --- src/components/AppLayout/MenuNested.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/AppLayout/MenuNested.tsx b/src/components/AppLayout/MenuNested.tsx index 39ccd41bc..978882807 100644 --- a/src/components/AppLayout/MenuNested.tsx +++ b/src/components/AppLayout/MenuNested.tsx @@ -8,11 +8,7 @@ import SVG from "react-inlinesvg"; import menuArrowIcon from "@assets/images/menu-arrow-icon.svg"; import useTheme from "@saleor/hooks/useTheme"; import { createHref } from "@saleor/misc"; -import { - drawerNestedMenuWidth, - drawerWidthExpanded, - drawerWidthExpandedMobile -} from "./consts"; +import { drawerNestedMenuWidth, drawerWidthExpandedMobile } from "./consts"; import { IActiveSubMenu } from "./MenuList"; import { IMenuItem } from "./menuStructure"; From 77982d9c3545c19dcc38dd7fbfeb8c92c4a125d9 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Wed, 13 Nov 2019 14:00:53 +0100 Subject: [PATCH 16/18] Sort imports --- src/components/ResponsiveTable/ResponsiveTable.tsx | 2 +- .../components/AssignAttributeDialog/AssignAttributeDialog.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ResponsiveTable/ResponsiveTable.tsx b/src/components/ResponsiveTable/ResponsiveTable.tsx index b886bb066..23cd083a9 100644 --- a/src/components/ResponsiveTable/ResponsiveTable.tsx +++ b/src/components/ResponsiveTable/ResponsiveTable.tsx @@ -1,5 +1,5 @@ -import Table from "@material-ui/core/Table"; import makeStyles from "@material-ui/core/styles/makeStyles"; +import Table from "@material-ui/core/Table"; import React from "react"; const useStyles = makeStyles( diff --git a/src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx b/src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx index 621147481..afc397718 100644 --- a/src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx +++ b/src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx @@ -20,10 +20,10 @@ import Checkbox from "@saleor/components/Checkbox"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; import useElementScroll, { isScrolledToBottom } from "@saleor/hooks/useElementScroll"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; import useSearchQuery from "@saleor/hooks/useSearchQuery"; From 72da2b4a09228d99acbdc74d2fc3f51a81cd4192 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Wed, 13 Nov 2019 14:05:01 +0100 Subject: [PATCH 17/18] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e7cb2333..d8b7dacaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable, unreleased changes to this project will be documented in this file. - Update customer's details page design - #248 by @dominik-zeglen - Use Apollo Hooks - #254 by @dominik-zeglen - Fix disappearing products description - #259 by @dominik-zeglen +- Improve mobile appearance - #240 by @benekex2 and @dominik-zeglen ## 2.0.0 @@ -61,4 +62,3 @@ All notable, unreleased changes to this project will be documented in this file. - Fix permission handling - #231 by @dominik-zeglen - Use React.FC instead of deprecated React.StatelessComponent type - #245 by @dominik-zeglen - Update @material-ui to v4 - #234 by @dominik-zeglen -- Improve mobile appearance - #240 by @benekex2 From 5ce5ed039f2b017ff4e4d28d3fbc2146265969b1 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Tue, 19 Nov 2019 13:52:05 +0100 Subject: [PATCH 18/18] Update snapshots --- .../__snapshots__/Stories.test.ts.snap | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index c8727d5f1..21cc3a558 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -3073,7 +3073,7 @@ exports[`Storyshots Generics / PageHeader with title 1`] = ` style="padding:24px" >