Skip to content

Commit 114924a

Browse files
author
Marcin Kwiatkowski
committed
Merge branch 'develop' into chore/main-dev-1.0.0-rc.8
2 parents b56508b + 0573a3a commit 114924a

File tree

214 files changed

+3093
-2271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+3093
-2271
lines changed

‎.all-contributorsrc‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,14 @@
177177
"avatar_url": "https://avatars.githubusercontent.com/u/5359825?v=4",
178178
"profile": "https://github.com/sethidden",
179179
"contributions": [
180-
"code"
180+
"code",
181+
"question",
182+
"ideas",
183+
"infra",
184+
"maintenance",
185+
"review",
186+
"test",
187+
"tool"
181188
]
182189
},
183190
{
@@ -206,6 +213,33 @@
206213
"contributions": [
207214
"doc"
208215
]
216+
},
217+
{
218+
"login": "AlexanderDevitsky",
219+
"name": "Alexander Devitsky",
220+
"avatar_url": "https://avatars.githubusercontent.com/u/14941520?v=4",
221+
"profile": "https://github.com/AlexanderDevitsky",
222+
"contributions": [
223+
"code"
224+
]
225+
},
226+
{
227+
"login": "Diegoalbag",
228+
"name": "Diego Alba",
229+
"avatar_url": "https://avatars.githubusercontent.com/u/72459310?v=4",
230+
"profile": "https://github.com/Diegoalbag",
231+
"contributions": [
232+
"code"
233+
]
234+
},
235+
{
236+
"login": "aelmizeb",
237+
"name": "Abdellatif EL MIZEB",
238+
"avatar_url": "https://avatars.githubusercontent.com/u/19288561?v=4",
239+
"profile": "https://github.com/aelmizeb",
240+
"contributions": [
241+
"code"
242+
]
209243
}
210244
],
211245
"contributorsPerLine": 5

‎.github/workflows/deploy-vue-storefront-cloud.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
NPM_PASS: ${{ secrets.CLOUD_PASSWORD }}
3535
NPM_REGISTRY: https://registrynpm.storefrontcloud.io
3636

37-
VSF_STORE_URL: '' # TODO
37+
VSF_STORE_URL: ''
3838

3939
VSF_MAGENTO_BASE_URL: https://magento2-instance.vuestorefront.io/
4040
VSF_MAGENTO_GRAPHQL_URL: https://magento2-instance.vuestorefront.io/graphql

‎README.md‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This project is a Magento 2 integration for Vue Storefront 2.
1818
<hr />
1919

2020
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
21-
[![All Contributors](https://img.shields.io/badge/all_contributors-15-orange.svg?style=flat-square)](#contributors-)
21+
[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-)
2222
<!-- ALL-CONTRIBUTORS-BADGE:END -->
2323

2424
## How to start if you want to try out the integration
@@ -110,6 +110,7 @@ If you have any questions about this integration we will be happy to answer them
110110
## Contributors ✨
111111

112112
### Honorable Mentions
113+
- [Caravel x](https://www.caravelx.com/)
113114
- [Cyberfuze](https://cyberfuze.com/)
114115
- [Leonex](https://www.leonex.de/)
115116

@@ -128,18 +129,29 @@ Thanks go to these wonderful people 🙌:
128129
</tr>
129130
<tr>
130131
<td align="center"><a href="https://github.com/patrickmonteiro"><img src="https://avatars.githubusercontent.com/u/13258255?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Patrick Monteiro</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=patrickmonteiro" title="Code">💻</a></td>
131-
<td align="center"><a href="https://github.com/KevinGorjan"><img src="https://avatars.githubusercontent.com/u/789614?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Kevin Gorjan</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=kevingorjan" title="Code">💻</a></td>
132-
<td align="center"><a href="https://github.com/bartoszherba"><img src="https://avatars.githubusercontent.com/u/16045377?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Bartosz Herba</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=bartoszherba" title="Code">💻</a></td>
133-
<td align="center"><a href="https://github.com/Frodigo"><img src="https://avatars.githubusercontent.com/u/11998249?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Marcin Kwiatkowski</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=Frodigo" title="Code">💻</a> <a href="#projectManagement-Frodigo" title="Project Management">📆</a></td>
132+
<td align="center"><a href="https://github.com/KevinGorjan"><img src="https://avatars.githubusercontent.com/u/789614?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Kevin Gorjan</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=kevingorjan" title="Code">💻</a> <a href="https://github.com/vuestorefront/magento2/commits?author=kevingorjan" title="Documentation">📖</a></td>
133+
<td align="center"><a href="https://github.com/bartoszherba"><img src="https://avatars.githubusercontent.com/u/16045377?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Bartosz Herba</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=bartoszherba" title="Code">💻</a> <a href="https://github.com/vuestorefront/magento2/commits?author=bartoszherba" title="Documentation">📖</a> <a href="#maintenance-bartoszherba" title="Maintenance">🚧</a> <a href="#mentoring-bartoszherba" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/vuestorefront/magento2/pulls?q=is%3Apr+reviewed-by%3Abartoszherba" title="Reviewed Pull Requests">👀</a></td>
134+
<td align="center"><a href="https://github.com/Frodigo"><img src="https://avatars.githubusercontent.com/u/11998249?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Marcin Kwiatkowski</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=Frodigo" title="Code">💻</a> <a href="#projectManagement-Frodigo" title="Project Management">📆</a> <a href="#business-Frodigo" title="Business development">💼</a> <a href="https://github.com/vuestorefront/magento2/commits?author=Frodigo" title="Documentation">📖</a> <a href="#ideas-Frodigo" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-Frodigo" title="Maintenance">🚧</a> <a href="#mentoring-Frodigo" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/vuestorefront/magento2/pulls?q=is%3Apr+reviewed-by%3AFrodigo" title="Reviewed Pull Requests">👀</a></td>
134135
<td align="center"><a href="https://github.com/filrak"><img src="https://avatars.githubusercontent.com/u/15185752?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Filip Rakowski</b></sub></a><br /><a href="#question-filrak" title="Answering Questions">💬</a> <a href="#mentoring-filrak" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/vuestorefront/magento2/pulls?q=is%3Apr+reviewed-by%3Afilrak" title="Reviewed Pull Requests">👀</a></td>
135136
</tr>
136137
<tr>
137-
<td align="center"><a href="https://github.com/filipsobol"><img src="https://avatars.githubusercontent.com/u/4145208?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Filip Sobol</b></sub></a><br /><a href="#question-filipsobol" title="Answering Questions">💬</a> <a href="#mentoring-filipsobol" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/vuestorefront/magento2/pulls?q=is%3Apr+reviewed-by%3Afilipsobol" title="Reviewed Pull Requests">👀</a></td>
138+
<td align="center"><a href="https://github.com/filipsobol"><img src="https://avatars.githubusercontent.com/u/4145208?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Filip Sobol</b></sub></a><br /><a href="#question-filipsobol" title="Answering Questions">💬</a> <a href="#mentoring-filipsobol" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/vuestorefront/magento2/pulls?q=is%3Apr+reviewed-by%3Afilipsobol" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/vuestorefront/magento2/commits?author=filipsobol" title="Documentation">📖</a></td>
138139
<td align="center"><a href="https://github.com/andrzejewsky"><img src="https://avatars.githubusercontent.com/u/7943292?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Patryk Andrzejewski</b></sub></a><br /><a href="#question-andrzejewsky" title="Answering Questions">💬</a> <a href="#mentoring-andrzejewsky" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/vuestorefront/magento2/pulls?q=is%3Apr+reviewed-by%3Aandrzejewsky" title="Reviewed Pull Requests">👀</a></td>
139140
<td align="center"><a href="https://github.com/renanoliveira0"><img src="https://avatars.githubusercontent.com/u/1081576?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Renan Oliveira</b></sub></a><br /><a href="#tool-renanoliveira0" title="Tools">🔧</a> <a href="#plugin-renanoliveira0" title="Plugin/utility libraries">🔌</a></td>
140141
<td align="center"><a href="https://github.com/domideimel"><img src="https://avatars.githubusercontent.com/u/32941053?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Dominik Deimel</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=domideimel" title="Code">💻</a> <a href="https://github.com/vuestorefront/magento2/commits?author=domideimel" title="Documentation">📖</a></td>
141142
<td align="center"><a href="https://github.com/LiorLindvor"><img src="https://avatars.githubusercontent.com/u/6757942?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Lior Lindvor</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=LiorLindvor" title="Code">💻</a></td>
142143
</tr>
144+
<tr>
145+
<td align="center"><a href="https://github.com/sethidden"><img src="https://avatars.githubusercontent.com/u/5359825?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Artur Tagisow</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=sethidden" title="Code">💻</a> <a href="#question-sethidden" title="Answering Questions">💬</a> <a href="#ideas-sethidden" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-sethidden" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-sethidden" title="Maintenance">🚧</a> <a href="https://github.com/vuestorefront/magento2/pulls?q=is%3Apr+reviewed-by%3Asethidden" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/vuestorefront/magento2/commits?author=sethidden" title="Tests">⚠️</a> <a href="#tool-sethidden" title="Tools">🔧</a></td>
146+
<td align="center"><a href="https://github.com/jonathanribas"><img src="https://avatars.githubusercontent.com/u/3003782?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Jonathan Ribas</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=jonathanribas" title="Code">💻</a></td>
147+
<td align="center"><a href="https://github.com/Aliaaaam"><img src="https://avatars.githubusercontent.com/u/88658555?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Ali Ghanei</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=Aliaaaam" title="Code">💻</a></td>
148+
<td align="center"><a href="https://github.com/mayashavin"><img src="https://avatars.githubusercontent.com/u/6650139?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Maya Shavin</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=mayashavin" title="Documentation">📖</a></td>
149+
<td align="center"><a href="https://github.com/AlexanderDevitsky"><img src="https://avatars.githubusercontent.com/u/14941520?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Alexander Devitsky</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=AlexanderDevitsky" title="Code">💻</a></td>
150+
</tr>
151+
<tr>
152+
<td align="center"><a href="https://github.com/Diegoalbag"><img src="https://avatars.githubusercontent.com/u/72459310?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Diego Alba</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=Diegoalbag" title="Code">💻</a></td>
153+
<td align="center"><a href="https://github.com/aelmizeb"><img src="https://avatars.githubusercontent.com/u/19288561?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Abdellatif EL MIZEB</b></sub></a><br /><a href="https://github.com/vuestorefront/magento2/commits?author=aelmizeb" title="Code">💻</a></td>
154+
</tr>
143155
</table>
144156

145157
<!-- markdownlint-restore -->

‎docs/.vuepress/config.js‎

Lines changed: 12 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
const GTM_TAG = 'GTM-WMDC3CP';
2-
31
module.exports = {
42
title: 'Vue Storefront 2 for Magento',
53
base: '/',
64
description: 'Documentation for the Magento connector for Vue Storefront 2',
7-
head: [
8-
['link', { rel: 'icon', href: '/favicon.png' }],
9-
10-
// Google Tag Manager
11-
['script', {}, [`
12-
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
13-
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
14-
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
15-
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
16-
})(window,document,'script','dataLayer','${GTM_TAG}');
17-
`]],
18-
],
5+
head: [['link', { rel: 'icon', href: '/favicon.png' }]],
196
configureWebpack: (config) => {
207
config.module.rules = config.module.rules.map((rule) => ({
218
...rule,
@@ -50,7 +37,6 @@ module.exports = {
5037
'@vuepress/search',
5138
],
5239
themeConfig: {
53-
GTM_TAG,
5440
sidebarDepth: 0,
5541
repo: 'https://github.com/vuestorefront/magento2/',
5642
editLinks: true,
@@ -61,13 +47,10 @@ module.exports = {
6147
nav: [
6248
{ text: 'Vue Storefront', link: 'https://vuestorefront.io/' },
6349
{ text: 'Core Documentation', link: 'https://docs.vuestorefront.io/v2/' },
64-
{ text: 'Demo', link: 'https://demo-magento2.europe-west1.gcp.storefrontcloud.io/' },
65-
{ text: 'GitHub', link: 'https://github.com/vuestorefront/magento2' },
66-
{ text: 'Environments', link: 'https://docs.vuestorefront.io/magento/guide/environments.html' },
6750
],
6851
sidebar: [
6952
{
70-
title: 'Essentials',
53+
title: '',
7154
collapsable: false,
7255
children: [
7356
['/', 'Introduction'],
@@ -84,12 +67,22 @@ module.exports = {
8467
['/getting-started/configure-integration', 'Configuring Vue Storefront'],
8568
],
8669
},
70+
{
71+
title: 'Composition',
72+
collapsable: false,
73+
children: [
74+
['/composition/composables', 'Composables'],
75+
['/composition/list-of-composables', 'List of composables'],
76+
],
77+
},
8778
{
8879
title: 'Guides',
8980
collapsable: false,
9081
children: [
82+
['/guide/global-state-management', 'Global state management'],
9183
['/guide/image-optimization', 'Image optimization'],
9284
['/guide/override-queries', 'Override queries'],
85+
['/guide/filters', 'Filters'],
9386
['/guide/testing', 'Testing'],
9487
['/guide/recaptcha', 'ReCaptcha'],
9588
],
@@ -102,52 +95,11 @@ module.exports = {
10295
['/guide/ssr', 'Server Side Rendering Cache'],
10396
],
10497
},
105-
{
106-
title: 'Composables',
107-
children: [
108-
['/api-reference/magento-theme.useaddresses', 'useAddresses()'],
109-
['/api-reference/magento-theme.useapi', 'useApi()'],
110-
['/api-reference/magento-theme.usebilling', 'useBilling()'],
111-
['/api-reference/magento-theme.usecart', 'useCart()'],
112-
['/api-reference/magento-theme.usecategory', 'useCategory()'],
113-
['/api-reference/magento-theme.usecategorysearch', 'useCategorySearch()'],
114-
['/api-reference/magento-theme.useconfig', 'useConfig()'],
115-
['/api-reference/magento-theme.usecontent', 'useContent()'],
116-
['/api-reference/magento-theme.usecountrysearch', 'useCountrySearch()'],
117-
['/api-reference/magento-theme.usecurrency', 'useCurrency()'],
118-
['/api-reference/magento-theme.useexternalcheckout', 'useExternalCheckout()'],
119-
['/api-reference/magento-theme.usefacet', 'useFacet()'],
120-
['/api-reference/magento-theme.useforgotpassword', 'useForgotPassword()'],
121-
['/api-reference/magento-theme.usegetshippingmethods', 'useGetShippingMethods()'],
122-
['/api-reference/magento-theme.useguestuser', 'useGuestUser()'],
123-
['/api-reference/magento-theme.useimage', 'useImage()'],
124-
['/api-reference/magento-theme.usemagentoconfiguration', 'useMagentoConfiguration()'],
125-
['/api-reference/magento-theme.usemakeorder', 'useMakeOrder()'],
126-
['/api-reference/magento-theme.usenewsletter', 'useNewsletter()'],
127-
['/api-reference/magento-theme.usepaymentprovider', 'usePaymentProvider()'],
128-
['/api-reference/magento-theme.useproduct', 'useProduct()'],
129-
['/api-reference/magento-theme.userelatedproducts', 'useRelatedProducts()'],
130-
['/api-reference/magento-theme.usereview', 'useReview()'],
131-
['/api-reference/magento-theme.useshipping', 'useShipping()'],
132-
['/api-reference/magento-theme.useshippingprovider', 'useShippingProvider()'],
133-
['/api-reference/magento-theme.usestore', 'useStore()'],
134-
['/api-reference/magento-theme.useuihelpers', 'useUiHelpers()'],
135-
['/api-reference/magento-theme.useuinotification', 'useUiNotification()'],
136-
['/api-reference/magento-theme.useuistate', 'useUiState()'],
137-
['/api-reference/magento-theme.useupsellproducts', 'useUpsellProducts()'],
138-
['/api-reference/magento-theme.useurlresolver', 'useUrlResolver()'],
139-
['/api-reference/magento-theme.useuser', 'useUser()'],
140-
['/api-reference/magento-theme.useuseraddress', 'useUserAddress()'],
141-
['/api-reference/magento-theme.useuserorder', 'useUserOrder()'],
142-
['/api-reference/magento-theme.usewishlist', 'useWishlist()'],
143-
],
144-
},
14598
{
14699
title: 'Reference',
147100
children: [
148101
['/plugins/', 'Plugins'],
149102
['/api-reference/', 'API Reference'],
150-
['/migration-guides/', 'Migration guides'],
151103
],
152104
},
153105
{

‎docs/assets/images/useUser-composable-anatomy.png‎

27.9 KB
Loading

‎docs/assets/images/useUser-load-flow.png‎

33.1 KB
Loading

0 commit comments

Comments
 (0)