Merge branch 'development' of github.com:Webiny/webiny-js into develo…

…pment
webiny · Mar 17, 2019 · aa83d5c · aa83d5c
2 parents 4f9d520 + 9d98e44
commit aa83d5c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 deletions.
diff --git a/independent/webiny-integration-google-tag-manager/src/plugins/api/index.js b/independent/webiny-integration-google-tag-manager/src/plugins/api/index.js
@@ -19,9 +19,6 @@ export default [
         resolvers: {},
         security: {
             shield: {
-                SettingsQuery: {
-                    googleTagManager: hasScope("cms:settings")
-                },
                 SettingsMutation: {
                     googleTagManager: hasScope("cms:settings")
                 }

diff --git a/independent/webiny-integration-mailchimp/src/plugins/api/index.js b/independent/webiny-integration-mailchimp/src/plugins/api/index.js
@@ -102,9 +102,6 @@ export default [
                 },
                 MailchimpQuery: {
                     listLists: hasScope("cms:editor")
-                },
-                MailchimpMutation: {
-                    addToList: hasScope("cms:editor")
                 }
             }
         },

diff --git a/packages/demo-api/src/configs/development.js b/packages/demo-api/src/configs/development.js
@@ -39,7 +39,7 @@ export default async () => {
             }
         },
         security: {
-            enabled: false,
+            enabled: true,
             token: {
                 secret: process.env.WEBINY_JWT_SECRET,
                 expiresOn: () => addDays(new Date(), 30)

diff --git a/packages/demo-api/src/configs/production.js b/packages/demo-api/src/configs/production.js
@@ -21,7 +21,7 @@ export default async (context: Object) => {
             }
         },
         security: {
-            enabled: false,
+            enabled: true,
             token: {
                 secret: context.jwtSecret,
                 expiresOn: () => addDays(new Date(), 30)

diff --git a/packages/webiny-api-cms/src/plugins/graphql.js b/packages/webiny-api-cms/src/plugins/graphql.js
@@ -79,9 +79,6 @@ export default {
                 updateElement: hasScope("cms:element:crud"),
                 deleteElement: hasScope("cms:element:crud")
             },
-            SettingsQuery: {
-                cms: hasScope("cms:settings")
-            },
             SettingsMutation: {
                 cms: hasScope("cms:settings")
             }

diff --git a/packages/webiny-app-cms/src/editor/components/Element.js b/packages/webiny-app-cms/src/editor/components/Element.js
@@ -75,6 +75,10 @@ const Element = pure(
                             </Draggable>
                             {plugin.render({ element })}
                         </div>
+                        {/*
+                        <div className="add-element add-element--above">+</div>
+                        <div className="add-element add-element--below">+</div>
+                        */}
                     </ElementContainer>
                 )}
             </Transition>

diff --git a/packages/webiny-ui/src/ImageEditor/ImageEditor.js b/packages/webiny-ui/src/ImageEditor/ImageEditor.js
@@ -36,7 +36,7 @@ const Toolbar = styled("div")({
     justifyContent: "center",
     alignItems: "center",
     backgroundColor: "var(--mdc-theme-secondary)",
-    margin: "-20px -24px 0px -24px",
+    margin: "-24px -24px 0px -24px",
     padding: 2,
     position: "absolute",
     width: "100%",