diff --git a/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/---bug-report.md b/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/---bug-report.md index 347711f0e15..e79e2477ad5 100644 --- a/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/---bug-report.md +++ b/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/---bug-report.md @@ -1,13 +1,13 @@ --- name: "\U0001F41E Bug report" about: Let us know if something isn't working as you expect it to. - +labels: "type: bug" --- -**Describe the bug** +## Describe the bug A clear and concise description of what the bug is. -**To Reproduce** +## To reproduce Steps to reproduce the behavior: 1. Go to '...' @@ -15,14 +15,14 @@ Steps to reproduce the behavior: 3. Scroll down to '....' 4. See error -**Expected behavior** +## Expected behavior A clear and concise description of what you expected to happen. -**Screenshots** +## Screenshots If applicable, add screenshots to help explain your problem. -**WordPress (please complete the following information):** - +## Enviroment +### WordPress (please complete the following information): * Core version: [e.g. 5.0.3] * Gutenberg version (if installed): [e.g. 4.8.0] * WooCommerce version: [e.g. 3.5.3] @@ -30,18 +30,16 @@ If applicable, add screenshots to help explain your problem. * Site language: * Any other plugins installed: -**Desktop (please complete the following information):** - -* OS: [e.g. iOS] +### Desktop (please complete the following information): +* OS: [e.g. macOS, Windows] * Browser [e.g. chrome, safari] * Version [e.g. 22] -**Smartphone (please complete the following information):** - +### Smartphone (please complete the following information): * Device: [e.g. iPhone6] * OS: [e.g. iOS8.1] * Browser [e.g. stock browser, safari] * Version [e.g. 22] -**Additional context** +## Additional context Add any other context about the problem here. diff --git a/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--cart-checkout-feedback.md b/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--cart-checkout-feedback.md new file mode 100644 index 00000000000..1aa2ed31f7e --- /dev/null +++ b/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--cart-checkout-feedback.md @@ -0,0 +1,15 @@ +--- +name: "\U0001F4AC Feedback – Cart & Checkout Blocks" +about: Submit feedback about the new block-based Cart & Checkout. +labels: "type: feedback", "◼️ block: cart", "◼️ block: checkout" +--- + + + +## What do you like about the Cart & Checkout blocks? + +## What do you think is missing from the Cart & Checkout blocks? diff --git a/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--feature-request.md b/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--feature-request.md index d3510ed3d34..2a7b6232068 100644 --- a/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--feature-request.md +++ b/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--feature-request.md @@ -2,17 +2,17 @@ name: "✨ Feature request" about: If you have an idea to improve an existing WooCommerce + Gutenberg related feature, please let us know or submit a Pull Request! - +labels: "type: enhancement" --- -**Is your feature request related to a problem? Please describe.** +## Is your feature request related to a problem? Please describe. A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -**Describe the solution you'd like** +## Describe the solution you'd like A clear and concise description of what you want to happen. -**Describe alternatives you've considered** +## Describe alternatives you've considered A clear and concise description of any alternative solutions or features you've considered. -**Additional context** +## Additional context Add any other context or screenshots about the feature request here. diff --git a/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--support-question.md b/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--support-question.md index 65e6a1676ae..a83f6b5320b 100644 --- a/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--support-question.md +++ b/plugins/woocommerce-blocks/.github/ISSUE_TEMPLATE/--support-question.md @@ -2,12 +2,12 @@ name: "❓ Support Question" about: If you have a question please see our docs or use our forums, helpdesk, or Slack Community! - +labels: "type: support" --- We don't offer technical support on GitHub so we recommend using the following: -**Reading our documentation** +## Reading our documentation Usage docs can be found here: https://docs.woocommerce.com/ If you have a problem, you may want to start with the self help guide here: https://docs.woocommerce.com/document/woocommerce-self-service-guide/ @@ -16,7 +16,7 @@ If you have a problem, you may want to start with the self help guide here: http from a human being - submit a ticket via the helpdesk https://woocommerce.com/contact-us/ -**General usage and development questions** +## General usage and development questions - WooCommerce Slack Community: https://woocommerce.com/community-slack/ - WordPress.org Forums: https://wordpress.org/support/plugin/woocommerce - The WooCommerce Help and Share Facebook group diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/edit.js b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/edit.js index cb10b85ef93..58e7845a1bf 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/edit.js +++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/edit.js @@ -2,7 +2,7 @@ * External dependencies */ import { __ } from '@wordpress/i18n'; -import FeedbackPrompt from '@woocommerce/block-components/feedback-prompt'; +import { CartCheckoutFeedbackPrompt } from '@woocommerce/block-components/feedback-prompt'; import { InspectorControls } from '@wordpress/block-editor'; import { Disabled, @@ -129,12 +129,7 @@ const BlockSettings = ( { attributes, setAttributes } ) => { } } /> ) } - + ); }; diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/edit.js b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/edit.js index 3ec9337dad3..d692015f40e 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/edit.js +++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/edit.js @@ -2,7 +2,7 @@ * External dependencies */ import { __ } from '@wordpress/i18n'; -import FeedbackPrompt from '@woocommerce/block-components/feedback-prompt'; +import { CartCheckoutFeedbackPrompt } from '@woocommerce/block-components/feedback-prompt'; import { InspectorControls } from '@wordpress/block-editor'; import { PanelBody, @@ -263,12 +263,7 @@ const BlockSettings = ( { attributes, setAttributes } ) => { /> ) } - + ); }; diff --git a/plugins/woocommerce-blocks/assets/js/components/feedback-prompt/index.js b/plugins/woocommerce-blocks/assets/js/components/feedback-prompt/index.js index cece88f4fec..96cef613ea1 100644 --- a/plugins/woocommerce-blocks/assets/js/components/feedback-prompt/index.js +++ b/plugins/woocommerce-blocks/assets/js/components/feedback-prompt/index.js @@ -13,7 +13,10 @@ import './style.scss'; /** * Component to render a Feedback prompt in the sidebar. */ -const FeedbackPrompt = ( { text } ) => { +const FeedbackPrompt = ( { + text, + url = 'https://ideas.woocommerce.com/forums/133476-woocommerce?category_id=384565', +} ) => { return (
@@ -22,7 +25,7 @@ const FeedbackPrompt = ( { text } ) => {

{ text }

{ FeedbackPrompt.propTypes = { text: PropTypes.string, + url: PropTypes.string, }; export default FeedbackPrompt; + +export const CartCheckoutFeedbackPrompt = () => ( + +); diff --git a/plugins/woocommerce-blocks/assets/js/hocs/index.js b/plugins/woocommerce-blocks/assets/js/hocs/index.js index ac61f53337d..1b61ab01e20 100644 --- a/plugins/woocommerce-blocks/assets/js/hocs/index.js +++ b/plugins/woocommerce-blocks/assets/js/hocs/index.js @@ -1,7 +1,6 @@ export { default as withAttributes } from './with-attributes'; export { default as withCategories } from './with-categories'; export { default as withCategory } from './with-category'; -export { default as withFeedbackPrompt } from './with-feedback-prompt'; export { default as withProduct } from './with-product'; export { default as withProductVariations } from './with-product-variations'; export { default as withSearchedProducts } from './with-searched-products'; diff --git a/plugins/woocommerce-blocks/assets/js/hocs/with-feedback-prompt/index.js b/plugins/woocommerce-blocks/assets/js/hocs/with-feedback-prompt/index.js deleted file mode 100644 index 9bfef053ab8..00000000000 --- a/plugins/woocommerce-blocks/assets/js/hocs/with-feedback-prompt/index.js +++ /dev/null @@ -1,35 +0,0 @@ -/** - * External dependencies - */ -import { Fragment } from '@wordpress/element'; -import { InspectorControls } from '@wordpress/block-editor'; -import { createHigherOrderComponent } from '@wordpress/compose'; -import FeedbackPrompt from '@woocommerce/block-components/feedback-prompt'; - -/** - * Adds a feedback prompt with custom text to the editor sidebar. - * - * @param {string} content Text to display in the feedback prompt. - * - * @return {Function} Function that returns the wrapped component. - */ -const withFeedbackPrompt = ( content ) => - /** - * Adds a feedback prompt to the provided component. - * - * @param {WPComponent} BlockEdit Original component. - * - * @return {WPComponent} Wrapped component. - */ - createHigherOrderComponent( ( BlockEdit ) => { - return ( props ) => ( - - - - - - - ); - }, 'withFeedbackPrompt' ); - -export default withFeedbackPrompt;