Merge remote-tracking branch 'origin/JS-854-co-branding' into develop-2

tangem · Mar 26, 2024 · 81b1e07 · 81b1e07
2 parents ecf937a + e3070a0
commit 81b1e07
Show file tree

Hide file tree

Showing 7 changed files with 548 additions and 10 deletions.
diff --git a/config/plugins.js b/config/plugins.js
@@ -4,18 +4,22 @@ module.exports = ({ env }) => {
       config: {
         provider: "aws-s3",
         providerOptions: {
-          accessKeyId: env("AWS_ACCESS_KEY_ID"),
-          secretAccessKey: env("AWS_ACCESS_SECRET"),
-          region: env("AWS_REGION"),
-          params: {
-            Bucket: env("AWS_BUCKET"),
+          s3Options: {
+            accessKeyId: env('AWS_ACCESS_KEY_ID'),
+            secretAccessKey: env('AWS_ACCESS_SECRET'),
+            region: env('AWS_REGION'),
+            params: {
+              // ACL: env('AWS_ACL', 'public-read'),
+              // signedUrlExpires: env('AWS_SIGNED_URL_EXPIRES', 15 * 60),
+              Bucket: env('AWS_BUCKET'),
+            },
+            actionOptions: {
+              upload: {},
+              uploadStream: {},
+              delete: {},
+            },
           },
         },
-        actionOptions: {
-          upload: {},
-          uploadStream: {},
-          delete: {},
-        },
       },
     },
   };

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@_sh/strapi-plugin-ckeditor": "^2.1.1",
+    "@strapi/plugin-color-picker": "^4.21.0",
     "@strapi/plugin-i18n": "^4.20.4",
     "@strapi/plugin-users-permissions": "^4.20.4",
     "@strapi/provider-upload-aws-s3": "^4.20.4",