Commit Graph

19 Commits

Author SHA1 Message Date
berislav grgičak 83517af699
Merge branch 'trunk' into feature/marketplace-subscriptions 2023-10-18 12:11:16 +02:00
berislav grgičak 7cd33b5e95
Marketplace search improvements (#40667)
* Show themes first if no extensions

* Empty search load discover page

* Show three items per row if not dividable by four

* Update search per page to 8 for large screens

* Show 8 items on large screens

* Prevent same tab click

* Add changefile(s) from automation for the following project(s): woocommerce

* Fix function name

---------

Co-authored-by: github-actions <github-actions@github.com>
2023-10-17 18:32:23 +02:00
Dan Q 44d0d22053 Merge branch 'trunk' into feature/marketplace-subscriptions 2023-10-11 12:49:35 +01:00
Dan Q 514fd937ee Hook up my My subscriptions section to tabs 2023-10-05 10:31:59 +03:00
Bero a8cf772aaf Reset url state on tab click 2023-10-04 19:57:04 +02:00
Kyle Nel d8adecf783
Marketplace Themes: Feature Branch (#40159)
* Support for themes in in-app marketplace.

Contains the changes from:

https://github.com/woocommerce/woocommerce/pull/40247
https://github.com/woocommerce/woocommerce/pull/40272
https://github.com/woocommerce/woocommerce/pull/40302
https://github.com/woocommerce/woocommerce/pull/40303
https://github.com/woocommerce/woocommerce/pull/40333
https://github.com/woocommerce/woocommerce/pull/40368
https://github.com/woocommerce/woocommerce/pull/40375
https://github.com/woocommerce/woocommerce/pull/40375
https://github.com/woocommerce/woocommerce/pull/40389

* `.woocommerce-marketplace__discover`: changed `align-items` `flex-start` to `stretch` to properly display products on large and very large viewports.

* Delete plugins/woocommerce/changelog/add-18026-marketplace-theme-cards

Removing from feature branch before final review

* Delete plugins/woocommerce/changelog/add-18027-themes-to-in-app-search

Removing from feature branch before final review

* Delete plugins/woocommerce/changelog/add-marketplace-theme-discover-section

Removing from feature branch before final review

* Delete plugins/woocommerce/changelog/update-in-app-multiple-category-filters

Removing from feature branch before final review

* Delete plugins/woocommerce/changelog/update-theme-no-result-style

Removing from feature branch before final review

* Add changefile(s) from automation for the following project(s): woocommerce

---------

Co-authored-by: And Finally <andfinally@users.noreply.github.com>
Co-authored-by: Dan Q <dan@danq.me>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Dan Q <danq@automattic.com>
2023-10-04 18:59:34 +02:00
And Finally 6d65d54ed5 [wccom-17942] Making sure snackbar doesn't appear before content has loaded.
- Fixing `prettier` linter errors.
2023-09-04 15:45:24 +01:00
And Finally 3c8f4861e4 [wccom-17942] Only showing feedback snackbar when content of in-app marketplace has finished loading. Making sure snackbar is fixed position, so it's visible wherever you are on the page.
- `ProductListContextProvider` provides `setIsLoading` function as well as `isLoading`.
- `Discover` uses these values from context, instead of keeping a loading state in itself.
- `FeedbackModal` calls `maybSetTimeout` when `isLoading` changes. If `isLoading` isn't truthy, and snackbar hasn't already rendered, it sets a timeout of 5 seconds to show it.

- Removed wrapping <WooFooterItem> from around Footer component, so it's no longer a child of the WooCommerce Admin `.woocommerce-layout__footer` footer.
- Removed the `position: relative` from `.woocommerce-layout__footer`. It needs to be `position: fixed`.
- Added FooterContent component to Footer, to allow the layout we want.

- Changed use of context. This now only has states for the selected tab and loading state.
- We use this context in `Tabs` and `Content` to keep track of which tab is selected, and set the selected tab.
- We also use it in `Discover` and `Extensions`, which both report loading state to the context. This allows us to use it to only render the snackbar when loading is complete.
- Extensions: moved `productList` and `setProductList` and logic for getting product list from the context provider to a state in this component. We don't need to share the list of products in the context.
- Renamed `ProductListContext`, `ProductListContextProvider` and `productListContextValue` to more generic `MarketplaceContext`, `MarketplaceContextProvider` and `marketplaceContextValue`.
- Renamed a constant and created constants for API paths.
- Only shows snackbar after content has loaded, and after a timeout. We set a date `marketplace_redesign_2023_last_shown_date` in local storage to ensure we only show one snackbar.
2023-08-26 12:47:23 +01:00
And Finally 87706c5e5a [wccom-17713] Addressing design feedback.
- Removed duplicate `Search` styles from `header.scss`.
- Removed 10px top padding from `Header`. Applied it to title, meta and search containers instead.
- Deleted duplicate search button style from `header.scss`.
- Swapped round order of search component and header meta div so tab navigation order is correct.
- Added focus style to search component.
- Reduced footer side padding on mobile.
- Changed `.woocommerce-marketplace__header-title` page title to an h1 for accessibility.
- Removed top margin from product cards – the css grid handles the gap.
- Removed margin from `.woocommerce-marketplace__product-card__description`.
- Reduced font weight of price in product cards.
- Set margin below product list header.
- Removed right margin from tab buttons – css grid handles the gap.
- Increased top padding of `.woocommerce-marketplace__content`.

Addressing linter error.
2023-08-18 15:20:00 +01:00
And Finally cc6ae76c42
Fix child keys error in `Tabs` component and and remove unnecessary `sanitizeHTML` call from `FeedbackModal` component (#39734) 2023-08-16 10:17:33 +01:00
raicem 31aa9ebd59 Marketplace: add category filtering 2023-08-15 09:38:17 +03:00
And Finally d3012bd0b8 Fixing issue with missing keys in `Tabs` component children.
Removing unnecessary `sanitizeHTML` call in `FeedbackModal`.
2023-08-14 14:53:07 +01:00
Kyle Nel c1f24735ca
Remove marketplace tour temporarily (#39618)
* Tour: reconfigure to work with new layout

- Started Reconfiguring the existing tour to work with the new layout and components.
- Updated step content based on design
- Implemented PR feedback
- Removed task list for MVP

# Conflicts:
#	plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx
2023-08-10 14:10:08 +02:00
And Finally 56176ab008 If `marketplace` feature is enabled, adds `admin_menu` action to add the `wc-addons` page to the WooCommerce menu without showing it as a submenu item. This is a temporary measure, so we can continue to use the PHP version of the My Subscriptions page. Changes link on My Subscriptions page to point to the extensions tab of the new marketplace. Adds tab for My Subscriptions to marketplace header. 2023-08-09 12:39:55 +01:00
And Finally 55b2bb33ac Integrating search component into in-app marketplace header.
- Changed classNames in `Search` component.
- Moved styles from `header.scss` to `search.scss`.
- Deleted `HeaderSearch` and `HeaderSearchButton` components, no longer needed.
- Removed wrapper element around search form.
- Corrected marketplace API address in `Search` component.
- Using state to remember search term, instead of getting value of search input.
- Added condition to clear search input if Escape is pressed while it's focused.
- Not running search if search term is falsy.
- Changed label of "Extensions" tab to "Browse" – we'll do this for the moment, as we have repetition with the page title `Extensions`.
2023-08-07 12:34:05 +01:00
And Finally b48e52652d Tidying history for https://github.com/woocommerce/woocommerce/pull/39145. Copied changes from `add/wccom-17419-marketplace-top-admin-bar`.
Deleting unused import.

Addressing CSS linter errors.
2023-08-07 12:34:05 +01:00
Kyle Nel bd72b2cd08 Add skeleton and cherry-picked commits
- Reset layout to allow full width
- Added Footer & IconWithText components

Add temporary placeholder components

All components here are temporary and can be removed/replaced when their relevant PR is ready.

Add marketplace footer component

The component is added using a SlotFill to use the existing WC Admin footer and utilise full width correctly.

Setup initial content area layout

Update tab styles

Setup styling to match latest design

Finalise footer, wide layout, and tidy styles

- Applies the wide layout from latest MVP design
- Applies the correct footer links to titles
- Some general style tidying

Organise styles and setup variables

Swap to using CSS Grid for layouts

Update breakpoints

Restructure style naming and update to core styles

Add translation in some places

In-app marketplace search component. Cleaned up the commit history of this branch. Copied changes from these commits:

e9828422706176817e511778980005222aa36cc5
9ca2ae351c97fcd27ecd77a1464c2a9ca16de040
e47815705f3854bf50ff48d7975b7cf2f541614b
976811c458e67ae7fa107c8bf8554fdc3e809d85
46eafdf49fe39c12dee77d6ce0885bdeda527dea

Deleted unused import.
2023-08-07 12:34:05 +01:00
And Finally 05a608399a Changed `Tabs` to use `useQuery` instead of `getQuery`, so the browser back button will work.
Changed submenu item name back to `Extensions`, and keeping it in the current order within the WooCommerce menu.
Changed `path` value to `extensions`.
2023-08-07 12:34:05 +01:00
And Finally b3723f7a7d First commit. This contains the changes from `update/react-marketplace`, reviewed in https://github.com/woocommerce/woocommerce/pull/38885. 2023-08-07 12:34:05 +01:00