Merge pull request #1 from hungmac-sw/fixed-bug-and-add-share-theme

Fixed bug preview theme, Added copy & share button

CHANGELOG_de-DE.md

@@ -1,3 +1,8 @@
+# 1.0.0
+
+* Button Copy Link & Share Theme hinzugefügt
+* Behobener Fehler kann keine Vorschau anderer Seiten außer der Homepage anzeigen
+
 # 0.30.4
 
 * Erste Veröffentlichung mit Feature-Vorschau-Thema im Detail des Vertriebskanals

CHANGELOG_en-GB.md

@@ -1,3 +1,8 @@
+# 1.0.0
+
+* Added button copy link & share theme
+* Fixed bug can't preview other pages except the homepage
+
 # 0.30.4
 
 * First release with feature preview theme in sales channel detail

README.md

@@ -1,4 +1,4 @@
-# Preview theme for Shopware 6
+# Theme preview for Shopware 6
 
 [![Gitter](https://badges.gitter.im/mac/community.svg)](https://gitter.im/mac/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

composer.json

@@ -1,17 +1,14 @@
 {
   "name": "mac/theme-preview",
   "description": "Theme preview plugin for Shopware 6",
-  "version": "0.30.4",
+  "version": "1.0.0",
   "type": "shopware-platform-plugin",
   "license": "MIT",
   "authors": [
     {
       "name": "Hung Mac"
     }
   ],
-  "require": {
-    "shopware/core": "~6.2.0"
-  },
   "autoload": {
     "psr-4": {
       "MacThemePreview\\": "src/"
@@ -20,8 +17,8 @@
   "extra": {
     "shopware-plugin-class": "MacThemePreview\\MacThemePreview",
     "label": {
-      "de-DE": "Theme Preview Plugin for Shopware 6",
-      "en-GB": "Theme Preview Plugin für Shopware 6"
+      "de-DE": "Theme Preview Plugin für Shopware 6",
+      "en-GB": "Theme Preview Plugin for Shopware 6"
     }
   },
   "suggest": {

src/Framework/Cookie/CustomCookieProvider.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+
+namespace MacThemePreview\Framework\Cookie;
+
+use Shopware\Storefront\Framework\Cookie\CookieProviderInterface;
+
+class CustomCookieProvider implements CookieProviderInterface {
+
+    private $originalService;
+
+    function __construct(CookieProviderInterface $service)
+    {
+        $this->originalService = $service;
+    }
+
+    public function getCookieGroups(): array
+    {
+        return array_merge(
+            $this->originalService->getCookieGroups(),
+            [
+                [
+                    'snippet_name' => 'cookie.theme',
+                    'cookie' => 'preview-theme-id',
+                ]
+            ]
+        );
+    }
+}

src/Resources/app/administration/src/modules/sw-theme-manager/component/sw-theme-modal/index.js

@@ -1,11 +1,16 @@
 import template from './sw-theme-modal.html.twig';
 
-const { Component } = Shopware;
+const { Component, Mixin } = Shopware;
 const { Criteria } = Shopware.Data;
+const domUtils = Shopware.Utils.dom;
 
 Component.override('sw-theme-modal', {
     template,
 
+    mixins: [
+        Mixin.getByName('notification')
+    ],
+
     inject: [
         'macThemePreviewService'
     ],
@@ -14,7 +19,8 @@ Component.override('sw-theme-modal', {
         return {
             selected: null,
             themes: [],
-            isLoadingPreview: false
+            isLoadingPreview: false,
+            isLoadingCopy: false
         };
     },
 
@@ -55,16 +61,52 @@ Component.override('sw-theme-modal', {
         },
 
         selectPreview() {
-            const theme = this.themes.find((theme) => theme.id === this.selected);
-            if (!!theme && !!this.salesChannel.domains) {
+            if (this.checkConditions()) {
                 this.isLoadingPreview = true;
-
-                this.macThemePreviewService.themeCompile(this.salesChannel.id, theme.id).then(() => {
+                this.macThemePreviewService.themeCompile(this.salesChannel.id, this.selected).then(() => {
                     this.isLoadingPreview = false;
-                    const previewUrl = this.salesChannel.domains.first().url + '/?preview-theme-id=' + this.selected;
-                    window.open(previewUrl);
+                    window.open(this.renderPreviewUrl());
+                });
+            }
+        },
+
+        copyToClipboard() {
+            if (this.checkConditions()) {
+                this.isLoadingCopy = true;
+                this.macThemePreviewService.themeCompile(this.salesChannel.id, this.selected).then(() => {
+                    this.isLoadingCopy = false;
+                    domUtils.copyToClipboard(this.renderPreviewUrl());
+                    this.createNotificationInfo({
+                        title: this.$tc('global.default.info'),
+                        message: this.$tc('mac-theme-preview.notification.notificationCopyLinkSuccess')
+                    });
                 });
             }
+        },
+
+        renderPreviewUrl() {
+            return this.salesChannel.domains.first().url + '/?preview-theme-id=' + this.selected;
+        },
+
+        checkConditions() {
+            const theme = this.themes.find((theme) => theme.id === this.selected);
+            if (!theme) {
+                this.createNotificationError({
+                    title: this.$tc('global.default.error'),
+                    message: this.$tc('global.notification.unspecifiedSaveErrorMessage')
+                });
+                return false;
+            }
+
+            if (!this.salesChannel.domains.first()) {
+                this.createNotificationError({
+                    title: this.$tc('global.default.error'),
+                    message: this.$tc('mac-theme-preview.notification.notificationEmptyDomain')
+                });
+                return false;
+            }
+
+            return true;
         }
     }
 });

src/Resources/app/administration/src/modules/sw-theme-manager/component/sw-theme-modal/sw-theme-modal.html.twig

@@ -1,5 +1,9 @@
 {% block sw_theme_modal_footer %}
     <template slot="modal-footer">
+        <sw-button v-if="selected" @click="copyToClipboard" :isLoading="isLoadingCopy">
+            {{ $tc('mac-theme-preview.buttonCopyLink') }}
+        </sw-button>
+
         <sw-button v-if="selected" @click="selectPreview" :isLoading="isLoadingPreview">
             {{ $tc('mac-theme-preview.previewButton') }}
         </sw-button>

src/Resources/app/administration/src/modules/sw-theme-manager/snippet/de-DE.json

@@ -1,5 +1,8 @@
 {
   "mac-theme-preview": {
-    "previewButton": "Vorschau"
+    "previewButton": "Vorschau",
+    "buttonCopyLink": "Kopieren & teilen",
+    "notificationCopyLinkSuccess": "URL in Zwischenablage kopiert.",
+    "notificationEmptyDomain": "Dieser Vertriebskanal hat keine Domain."
   }
 }

src/Resources/app/administration/src/modules/sw-theme-manager/snippet/en-GB.json

@@ -1,5 +1,10 @@
 {
   "mac-theme-preview": {
-    "previewButton": "Preview"
+    "previewButton": "Preview",
+    "buttonCopyLink": "Copy & Share",
+    "notification": {
+      "notificationCopyLinkSuccess": "URL has been copied to clipboard.",
+      "notificationEmptyDomain": "This sales channel have no domain."
+    }
   }
 }

src/Resources/app/administration/src/service/mac-theme-preview.api.service.js

@@ -4,7 +4,7 @@ import ApiService
 class MacThemePreviewService extends ApiService {
     constructor(httpClient, loginService, apiEndpoint = 'mac-theme-preview') {
         super(httpClient, loginService, apiEndpoint);
-        this.name = 'macThemePreviewService';
+        this.name = 'MacThemePreviewService';
     }
 
     themeCompile(salesChannelId, themeId) {