Merge branch 'main' into feat/trackflix-user-guide

config/middlewares.ts

@@ -32,15 +32,24 @@ export default ({ env }) => (
     'strapi::poweredBy',
     'strapi::logger',
     'strapi::query',
-    'strapi::body',
-    'strapi::session',
     {
-      name: 'strapi::favicon',
+      name: "strapi::body",
       config: {
-        path: './src/admin/extensions/trackit.png'
+        formLimit: "256mb", // modify form body
+        jsonLimit: "256mb", // modify JSON body
+        textLimit: "256mb", // modify text body
+        formidable: {
+          maxFileSize: 10000 * 1024 * 1024, // multipart data, modify here limit of uploaded file size
+        },
       },
     },
-    'strapi::public',
-    "plugin::opensearch.opensearchMiddleware",
-  ]
-);
+  'strapi::session',
+  'strapi::session',
+  {
+    name: 'strapi::favicon',
+    config: {
+      path: './src/admin/extensions/trackit.png'
+    },
+  },
+  'strapi::public',
+]);

config/plugins.ts

@@ -1,40 +1,72 @@
-export default async ({ env }) => {
-
-  return {
-    upload: {
-      config: {
-        provider: 'aws-s3',
-        providerOptions: {
-          s3Options: {
-            region: env('AWS_REGION'),
-            params: {
-              ACL: 'private', // <== set ACL to private
-              Bucket: env('AWS_BUCKET'),
-            },
+export default async ({env}) => ({
+  'cloudfront-metrics': {
+    enabled: true,
+    resolve: './src/plugins/cloudfront-metrics'
+  },
+  'custom-selects': {
+    enabled: true,
+    resolve: './src/plugins/custom-selects'
+  },
+  'docusaurus': {
+    enabled: true,
+    resolve: './src/plugins/docusaurus'
+  },
+  'upload-video': {
+    enabled: true,
+    resolve: './src/plugins/upload-video'
+  },
+  upload: {
+    config: {
+      sizeLimit: 2000 * 1024 * 1024,
+      provider: 'aws-s3',
+      providerOptions: {
+        s3Options: {
+          region: env('AWS_REGION'),
+          params: {
+            //ACL: 'private', // <== public by default, set ACL to private if needed
+            Bucket: env('AWS_BUCKET'),
           },
         },
-          actionOptions: {
-            upload: {},
-            uploadStream: {},
-            delete: {},   
-          },
+      },
+        actionOptions: {
+          upload: {},
+          uploadStream: {},
+          delete: {},   
         },
       },
-      'cloudfront-metrics': {
-        enabled: true,
-        resolve: './src/plugins/cloudfront-metrics'
+    },
+  documentation: {
+    enabled: true,
+    config: {
+      openapi: '3.0.0',
+      info: {
+        version: '1.0.0',
+        title: 'Trackflix Api Documentation',
+        description: '',
+        termsOfService: 'YOUR_TERMS_OF_SERVICE_URL',
+        contact: {
+          name: 'Trackit team',
+          email: '[email protected]',
+          url: 'https://trackit.io'
+        },
+        license: {
+          name: 'Apache 2.0',
+          url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
+        },
       },
-      'custom-selects': {
-        enabled: true,
-        resolve: './src/plugins/custom-selects'
+      'x-strapi-config': {
+        // Leave empty to ignore plugins during generation
+        plugins: [ 'upload', 'users-permissions'],
+        path: '/documentation',
       },
-      'docusaurus': {
-        enabled: true,
-        resolve: './src/plugins/docusaurus'
+      servers: [
+        { url: 'https://trackflix-cms.trackit.io/api', description: 'Production server' },
+      ],
+      externalDocs: {
+        description: 'Find out more',
+        url: 'https://docs.strapi.io/developer-docs/latest/getting-started/introduction.html'
       },
-      'opensearch' : {
-        enabled : true,
-        resolve: './src/plugins/opensearch'
+      security: [ { bearerAuth: [] } ]
     }
-}
-}
+  }
+})

package.json

@@ -30,6 +30,8 @@
     "@strapi/plugin-users-permissions": "4.12.0",
     "@strapi/provider-upload-aws-s3": "4.15.4",
     "@strapi/strapi": "4.12.0",
+    "@types/uuid": "^9.0.7",
+    "aws-sdk": "^2.1519.0",
     "chart.js": "^4.3.3",
     "classnames": "^2.3.2",
     "codemirror": "^6.0.1",
@@ -38,6 +40,7 @@
     "dotenv": "^16.3.1",
     "eslint": "^8.47.0",
     "eslint-plugin-formatjs": "^4.10.3",
+    "hex-rgb": "^5.0.0",
     "koa-send": "^5.0.1",
     "koa-sendfile": "^3.0.0",
     "os": "^0.1.2",
@@ -53,9 +56,9 @@
     "react-intl": "^6.4.4",
     "react-is": "16.8.0",
     "react-router-dom": "5.3.4",
-    "string-strip-html": "^13.4.3",
+    "strapi-auto-uuid": "^0.0.8",
     "styled-components": "^6.0.7",
-    "typescript": "^5.2.2",
+    "uuid": "^9.0.1",
     "yarn": "^1.22.19"
   },
   "author": {