Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit b683260

Browse files
authored
Merge branch 'master' into patch-4
2 parents f3eac47 + 87e6f42 commit b683260

File tree

3 files changed

+94
-41
lines changed

3 files changed

+94
-41
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ If you can handle fixing this bug by yourself and later propose a Pull Request w
2929
- Browser: <!-- Your browser, version -->
3030
- OS: <!-- Your operating system, version -->
3131
- Node: <!-- Version of Node.js used to run the project -->
32+
- Code Version: <!-- Tag, branch or commit determining which version of code is used -->
3233

3334
## Additional information
3435
<!-- If you think that any additional information would be useful, please provide them here. -->

README.md

Lines changed: 90 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The project is in the **production ready** phase.
1515

1616
**Important note to developers:** From 1.0RC we started using [develop](https://github.com/DivanteLtd/vue-storefront/tree/develop) branch for nightly builds (contains all new features) and [master](https://github.com/DivanteLtd/vue-storefront/tree/master) branch for stable. Please make sure you're working on right branch. Please take a look at [Contributing guidelines](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md).
1717

18-
If you're new and need some guidance feel free to reach anyone from the core team on our slack:
18+
If you're new and need some guidance feel free to visit out [forum](https://forum.vuestorefront.io/) or reach anyone from the core team on our slack:
1919
- `@Filip Rakowski` (frontend, architecture and best practices related stuff)
2020
- `@pkarw` (integrations and backend related stuff)
2121
- `@ptomczyk` (frontend related stuff)
@@ -30,6 +30,8 @@ See the ideas behind Vue Storefront [here](https://www.slideshare.net/FilipRakow
3030

3131
**Read [contribution rules](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md) before making any pull request. Pull request that doesn't meet these requirements will not be merged**
3232

33+
34+
3335
## See it in action
3436

3537
<table>
@@ -268,28 +270,28 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
268270
</a>
269271
</td>
270272
<td align="center" valign="middle">
271-
<a href="https://www.wagento.com">
273+
<a href="https://vendic.nl/">
272274
<img
273-
src="https://www.wagento.com/media/wysiwyg/logo-color-tagline_4x.png"
274-
alt="Wagento"
275+
src="https://divante.co/partners/Vue-Storefront/vendic-rood.png"
276+
alt="Vendic"
275277
width="150"
276278
>
277279
</a>
278280
</td>
279281
<td align="center" valign="middle">
280-
<a href="http://www.summasolutions.net">
282+
<a href="https://www.getnoticed.nl/">
281283
<img
282-
src="https://divante.co/partners/Vue-Storefront/summa_logo_horizontal_rgb.jpg"
283-
alt="Summa Solutions"
284+
src="https://user-images.githubusercontent.com/18116406/38860463-87a9fff4-4230-11e8-8017-e5ffb73e77f9.png"
285+
alt="Get.Noticed"
284286
width="150"
285287
>
286288
</a>
287289
</td>
288290
<td align="center" valign="middle">
289-
<a href="http://www.acidgreen.com.au/">
291+
<a href="https://www.bitbull.it/">
290292
<img
291-
src="https://cdn.dribbble.com/users/469310/screenshots/3865916/acidgreen_logo.jpg"
292-
alt="Acid Green"
293+
src="https://user-images.githubusercontent.com/18116406/38270766-b0bc4fc0-3784-11e8-9463-99d88950ca9a.png"
294+
alt="Bitbull"
293295
width="150"
294296
>
295297
</a>
@@ -315,57 +317,57 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
315317
</a>
316318
</td>
317319
<td align="center" valign="middle">
318-
<a href="https://magenest.com/">
320+
<a href="https://www.phoenix-media.eu/">
319321
<img
320-
src="https://user-images.githubusercontent.com/18116406/37145068-3326bdf8-22c0-11e8-9bc1-0b9b2377129f.png"
321-
alt="Magenest"
322+
src="https://divante.co/partners/Vue-Storefront/PHOENIX_MEDIA_Logo_transparent.png"
323+
alt="Phoenix Media"
322324
width="150"
323325
>
324-
</a>
326+
</a>
325327
</td>
326328
<td align="center" valign="middle">
327-
<a href="https://www.ecommbits.com/en/">
329+
<a href="https://www.absolutewebservices.com">
328330
<img
329-
src="https://user-images.githubusercontent.com/18116406/37145348-ea9c8ba2-22c0-11e8-9a91-d1a1da9af782.png"
330-
alt="ECOMMBITS"
331-
width="150"
331+
src="https://divante.co/partners/Vue-Storefront/absolute-logo.png"
332+
alt="Absolute Web Services"
333+
height="50"
332334
>
333-
</a>
335+
</a>
334336
</td>
335337
<td align="center" valign="middle">
336-
<a href="https://www.optiweb.com/">
338+
<a href="https://www.dnd.fr/">
337339
<img
338-
src="https://user-images.githubusercontent.com/18116406/37145626-9d48077c-22c1-11e8-82fd-dda1268d05e9.png"
339-
alt="Optiweb"
340-
width="150"
340+
src="https://divante.co/partners/Vue-Storefront/dnd-logo.png"
341+
alt="Agency DnD"
342+
height="40"
341343
>
342344
</a>
343345
</td>
344346
</tr>
345347
<tr>
346348
<td align="center" valign="middle">
347-
<a href="https://www.bitbull.it/">
349+
<a href="http://www.acidgreen.com.au/">
348350
<img
349-
src="https://user-images.githubusercontent.com/18116406/38270766-b0bc4fc0-3784-11e8-9463-99d88950ca9a.png"
350-
alt="Bitbull"
351+
src="https://cdn.dribbble.com/users/469310/screenshots/3865916/acidgreen_logo.jpg"
352+
alt="Acid Green"
351353
width="150"
352354
>
353355
</a>
354356
</td>
355357
<td align="center" valign="middle">
356-
<a href="https://vendic.nl/">
358+
<a href="https://www.wagento.com">
357359
<img
358-
src="https://divante.co/partners/Vue-Storefront/vendic-rood.png"
359-
alt="Vendic"
360+
src="https://www.wagento.com/media/wysiwyg/logo-color-tagline_4x.png"
361+
alt="Wagento"
360362
width="150"
361363
>
362364
</a>
363365
</td>
364366
<td align="center" valign="middle">
365-
<a href="https://www.getnoticed.nl/">
367+
<a href="http://www.summasolutions.net">
366368
<img
367-
src="https://user-images.githubusercontent.com/18116406/38860463-87a9fff4-4230-11e8-8017-e5ffb73e77f9.png"
368-
alt="Get.Noticed"
369+
src="https://divante.co/partners/Vue-Storefront/summa_logo_horizontal_rgb.jpg"
370+
alt="Summa Solutions"
369371
width="150"
370372
>
371373
</a>
@@ -456,10 +458,10 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
456458
</a>
457459
</td>
458460
<td align="center" valign="middle">
459-
<a href="https://www.phoenix-media.eu/">
461+
<a href="https://magenest.com/">
460462
<img
461-
src="https://divante.co/partners/Vue-Storefront/PHOENIX_MEDIA_Logo_transparent.png"
462-
alt="Phoenix Media"
463+
src="https://user-images.githubusercontent.com/18116406/37145068-3326bdf8-22c0-11e8-9bc1-0b9b2377129f.png"
464+
alt="Magenest"
463465
width="150"
464466
>
465467
</a>
@@ -521,11 +523,11 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
521523
</a>
522524
</td>
523525
<td align="center" valign="middle">
524-
<a href="https://www.absolutewebservices.com">
526+
<a href="https://www.ecommbits.com/en/">
525527
<img
526-
src="https://divante.co/partners/Vue-Storefront/absolute-logo.png"
527-
alt="Absolute Web Services"
528-
height="50"
528+
src="https://user-images.githubusercontent.com/18116406/37145348-ea9c8ba2-22c0-11e8-9a91-d1a1da9af782.png"
529+
alt="ECOMMBITS"
530+
width="150"
529531
>
530532
</a>
531533
</td>
@@ -596,6 +598,44 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
596598
</a>
597599
</td>
598600
<td align="center" valign="middle">
601+
<a href="https://www.optiweb.com/">
602+
<img
603+
src="https://user-images.githubusercontent.com/18116406/37145626-9d48077c-22c1-11e8-82fd-dda1268d05e9.png"
604+
alt="Optiweb"
605+
width="150"
606+
>
607+
</a>
608+
</td>
609+
<td align="center" valign="middle">
610+
<a href="https://www.vaimo.com/">
611+
<img
612+
src="https://divante.co/partners/Vue-Storefront/vaimo-logo.png"
613+
alt="Vaimo"
614+
height="40"
615+
>
616+
</a>
617+
</td>
618+
<td align="center" valign="middle">
619+
<a href="https://www.makingwaves.com/">
620+
<img
621+
src="https://divante.co/partners/Vue-Storefront/making-waves.png"
622+
alt="Making Waves"
623+
height="40"
624+
>
625+
</a>
626+
</td>
627+
</tr>
628+
<tr>
629+
<td align="center" valign="middle">
630+
<a href="https://www.bluebirdday.nl/">
631+
<img
632+
src="https://divante.co/partners/Vue-Storefront/Blue-Bird.png"
633+
alt="BlueBird Day"
634+
height="30"
635+
>
636+
</a>
637+
</td>
638+
<td align="center" valign="middle">
599639
<a href="">
600640
<img
601641
src=""
@@ -604,7 +644,7 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
604644
>
605645
</a>
606646
</td>
607-
<td align="center" valign="middle">
647+
<td align="center" valign="middle">
608648
<a href="">
609649
<img
610650
src=""
@@ -613,7 +653,16 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
613653
>
614654
</a>
615655
</td>
616-
<td align="center" valign="middle">
656+
<td align="center" valign="middle">
657+
<a href="">
658+
<img
659+
src=""
660+
alt=""
661+
height="40"
662+
>
663+
</a>
664+
</td>
665+
<td align="center" valign="middle">
617666
<a href="">
618667
<img
619668
src=""

docs/guide/basics/recipes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,3 +274,6 @@ Once the network connection is established, the correct folder needs to be point
274274
"assetPath": "/../var/magento2-sample-data/pub/media",
275275
```
276276
It is necessary for the correct product image creation by the vue-storefront-api. If this is not set corectly, images will just be placeholders regardless the fact the rest of the setup works and you can see products and categories correctly synced.
277+
278+
## Syncing magento and vue-storefront-api servers / Fix for "An error occurred validating the nonce"
279+
There might be an issue with JWT token validation if one of the servers is more than 600 seconds behind the other. The 600 seconds limit is defined on Magento side by its `\Magento\Integration\Model\Oauth\Nonce\Generator::TIME_DEVIATION`. To fix this issue you need to make sure both severs `date` command show the same datetime (or both at least below 10 minute difference). This can be done by utilizing `tzdata` package (sudo dpkg-reconfigure tzdata) or setting it directly with `date` package (e.g: `sudo date --set "23 Mar 2019 12:00:00"`, but providing the current datetime)

0 commit comments

Comments
 (0)