Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unified routing #302

Merged
merged 3 commits into from
Aug 31, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/Resources/config/routing.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
shop_api_cart:
sylius_shop_api_cart:
resource: "@ShopApiPlugin/Resources/config/routing/cart.yml"
prefix: /shop-api

shop_api_product_by_slug:
sylius_shop_api_product_by_slug:
resource: "@ShopApiPlugin/Resources/config/routing/productBySlug.yml"
prefix: /shop-api

shop_api_product_by_code:
sylius_shop_api_product_by_code:
resource: "@ShopApiPlugin/Resources/config/routing/productByCode.yml"
prefix: /shop-api

shop_api_taxon:
sylius_shop_api_taxon:
resource: "@ShopApiPlugin/Resources/config/routing/taxon.yml"
prefix: /shop-api

shop_api_register:
sylius_shop_api_register:
resource: "@ShopApiPlugin/Resources/config/routing/register.yml"
prefix: /shop-api

shop_api_checkout:
sylius_shop_api_checkout:
resource: "@ShopApiPlugin/Resources/config/routing/checkout.yml"
prefix: /shop-api/checkout

shop_api_customer:
sylius_shop_api_customer:
resource: "@ShopApiPlugin/Resources/config/routing/customer.yml"
prefix: /shop-api

shop_api_product_list:
sylius_shop_api_product_list:
resource: "@ShopApiPlugin/Resources/config/routing/productList.yml"
prefix: /shop-api

shop_api_address_book:
sylius_shop_api_address_book:
resource: "@ShopApiPlugin/Resources/config/routing/address_book.yml"
prefix: /shop-api
20 changes: 10 additions & 10 deletions src/Resources/config/routing/cart.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
shop_api_pickup_cart:
sylius_shop_api_pickup_cart:
path: /carts/{token}
methods: [POST]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.pickup_action

shop_api_cart_summary:
sylius_shop_api_cart_summary:
path: /carts/{token}
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.summarize_action

shop_api_add_to_cart:
sylius_shop_api_add_to_cart:
path: /carts/{token}/items
methods: [POST]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.put_item_to_cart_action

shop_api_add_multiple_items_to_cart:
sylius_shop_api_add_multiple_items_to_cart:
path: /carts/{token}/multiple-items
methods: [POST]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.put_items_to_cart_action

shop_api_drop_cart:
sylius_shop_api_drop_cart:
path: /carts/{token}
methods: [DELETE]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.drop_cart_action

shop_api_change_item_quantity:
sylius_shop_api_change_item_quantity:
path: /carts/{token}/items/{id}
methods: [PUT]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.change_item_quantity_action

shop_api_remove_item_from_cart:
sylius_shop_api_remove_item_from_cart:
path: /carts/{token}/items/{id}
methods: [DELETE]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.remove_item_from_cart_action

shop_api_estimated_shipping_cost:
sylius_shop_api_estimated_shipping_cost:
path: /carts/{token}/estimated-shipping-cost
methods: [GET]
defaults:
_controller: ShopApiPlugin:Cart:estimateShippingCost

shop_api_add_coupon_to_cart:
sylius_shop_api_add_coupon_to_cart:
path: /carts/{token}/coupon
methods: [PUT]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.add_coupon_action

shop_api_remove_coupon_to_cart:
sylius_shop_api_remove_coupon_to_cart:
path: /carts/{token}/coupon
methods: [DELETE]
defaults:
Expand Down
14 changes: 7 additions & 7 deletions src/Resources/config/routing/checkout.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
shop_api_address_checkout:
sylius_shop_api_address_checkout:
path: /{token}/address
methods: [PUT]
defaults:
_controller: sylius.shop_api_plugin.controller.checkout.address_action

shop_api_summarize_checkout:
sylius_shop_api_summarize_checkout:
path: /{token}
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.cart.summarize_action

shop_api_available_shipping_checkout:
sylius_shop_api_available_shipping_checkout:
path: /{token}/shipping
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.checkout.show_available_shipping_methods_action

shop_api_choose_shipping_method:
sylius_shop_api_choose_shipping_method:
path: /{token}/shipping/{shippingId}
methods: [PUT]
defaults:
_controller: sylius.shop_api_plugin.controller.checkout.choose_shipping_method_action

shop_api_available_payment_methods_checkout:
sylius_shop_api_available_payment_methods_checkout:
path: /{token}/payment
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.checkout.show_available_payment_methods_action

shop_api_choose_payment_method_checkout:
sylius_shop_api_choose_payment_method_checkout:
path: /{token}/payment/{paymentId}
methods: [PUT]
defaults:
_controller: sylius.shop_api_plugin.controller.checkout.choose_payment_method_action

shop_api_complete_checkout:
sylius_shop_api_complete_checkout:
path: /{token}/complete
methods: [PUT]
defaults:
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/routing/customer.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
shop_api_me:
sylius_shop_api_me:
path: /me
methods: [GET]
defaults:
Expand Down
8 changes: 4 additions & 4 deletions src/Resources/config/routing/productByCode.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
shop_api_product_show_details_by_code:
sylius_shop_api_product_show_details_by_code:
path: /products/{code}
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.product.show_product_details_by_code_action

shop_api_product_show_catalog_by_code:
sylius_shop_api_product_show_catalog_by_code:
path: /taxon-products/{code}
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.product.show_product_catalog_by_taxon_code_action

shop_api_product_show_reviews_by_code:
sylius_shop_api_product_show_reviews_by_code:
path: /products/{code}/reviews
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.product.show_product_reviews_by_code_action

shop_api_add_product_review_by_code:
sylius_shop_api_add_product_review_by_code:
path: /products/{code}/reviews
methods: [POST]
defaults:
Expand Down
8 changes: 4 additions & 4 deletions src/Resources/config/routing/productBySlug.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
shop_api_product_show_details_by_slug:
sylius_shop_api_product_show_details_by_slug:
path: /products-by-slug/{slug}
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.product.show_product_details_by_slug_action
requirements:
slug: .+

shop_api_add_product_review_by_slug:
sylius_shop_api_add_product_review_by_slug:
path: /product-reviews-by-slug/{slug}
methods: [POST]
defaults:
_controller: sylius.shop_api_plugin.controller.product.add_review_by_slug_action
requirements:
slug: .+

shop_api_product_show_catalog_by_slug:
sylius_shop_api_product_show_catalog_by_slug:
path: /taxon-products-by-slug/{taxonSlug}
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.product.show_product_catalog_by_taxon_slug_action
requirements:
taxonSlug: .+

shop_api_product_show_reviews_by_slug:
sylius_shop_api_product_show_reviews_by_slug:
path: /product-reviews-by-slug/{slug}
methods: [GET]
defaults:
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/routing/productList.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
shop_api_product_show_latest:
sylius_shop_api_product_show_latest:
path: /product-latest/
methods: [GET]
defaults:
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/routing/register.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sylius_shop_api_reset_password:
defaults:
_controller: sylius.shop_api_plugin.controller.customer.request_password_resetting_action

sylius_shop_password_reset:
sylius_shop_api_password_reset:
path: /password-reset/{token}
methods: [PUT]
defaults:
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/config/routing/taxon.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
shop_api_taxon_show_details:
sylius_shop_api_taxon_show_details:
path: /taxons/{code}
methods: [GET]
defaults:
_controller: sylius.shop_api_plugin.controller.taxon.show_taxon_details_action

shop_api_taxon_show_tree:
sylius_shop_api_taxon_show_tree:
path: /taxons/
methods: [GET]
defaults:
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Email/passwordReset.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% endblock %}

{% block body %}
{% set url = url('sylius_shop_password_reset', { 'token': user.passwordResetToken}) %}
{% set url = url('sylius_shop_api_password_reset', { 'token': user.passwordResetToken}) %}
{% autoescape %}
<h3>Hello {{ user.username }}</h3>

Expand Down
2 changes: 1 addition & 1 deletion tests/Application/app/config/routing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ sylius:
sylius_shop_api:
resource: "@ShopApiPlugin/Resources/config/routing.yml"

shop_api_login_check:
sylius_shop_api_login_check:
methods: [POST]
path: /shop-api/login_check
2 changes: 1 addition & 1 deletion tests/Application/app/config/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ security:
stateless: true
anonymous: true

shop_api_login:
sylius_shop_api_login:
pattern: "%shop_api.security.regex%/login"
stateless: true
anonymous: true
Expand Down