Fix - tags, added logs to cloudwatch, upgrade dependencies

canopas · Apr 16, 2024 · c9b3094 · c9b3094
1 parent 3867956
commit c9b3094
Show file tree

Hide file tree

Showing 75 changed files with 1,006 additions and 10,571 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,18 +22,3 @@ jobs:
           yarn install
           cd ../../..
           yarn build
-
-      - name: Set up Node for website
-        uses: actions/setup-node@v1
-        with:
-          node-version: "20.x"
-
-      - name: Build frontend
-        env:
-          NEXT_PUBLIC_WEBSITE_URL: https://dev-stack.canopas.com
-          NEXT_PUBLIC_STRAPI_DOMAIN: ${{secrets.ADMIN_PANEL_URL}}
-        run: |
-          cd website
-          yarn add prettier
-          yarn lint
-          yarn build
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
diff --git a/admin/docker-compose.yaml b/admin/docker-compose.yaml
@@ -5,8 +5,6 @@ services:
     image: ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/blog-admin:${GITHUB_SHA}-${GITHUB_RUN_ATTEMPT}-blog-admin
     deploy:
       replicas: 1
-    volumes:
-      - uploads:/srv/app/public/uploads
     ports:
       - "1337:1337"
     environment:
@@ -26,6 +24,11 @@ services:
       AWS_BUCKET: ${AWS_BUCKET}
       AWS_BUCKET_URL: ${AWS_BUCKET_URL}
       HR_FROM_MAIL: ${HR_FROM_MAIL}
+    logging:
+      driver: awslogs
+      options:
+        awslogs-region: ${AWS_REGION}
+        awslogs-group: canopas-blog-admin-logs
 
   nginx:
     image: nginx:latest
@@ -42,7 +45,3 @@ networks:
   outside:
     external:
       name: "host"
-
-volumes:
-  blog-data:
-  uploads:
diff --git a/admin/package.json b/admin/package.json
@@ -14,24 +14,24 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@_sh/strapi-plugin-ckeditor": "^1.1.3",
-    "@strapi/plugin-i18n": "^4.11.5",
-    "@strapi/plugin-users-permissions": "^4.11.5",
-    "@strapi/provider-email-amazon-ses": "^4.11.5",
-    "@strapi/provider-upload-aws-s3": "^4.11.5",
-    "@strapi/strapi": "^4.14.3",
+    "@_sh/strapi-plugin-ckeditor": "^2.1.1",
+    "@strapi/plugin-i18n": "^4.23.0",
+    "@strapi/plugin-users-permissions": "^4.23.0",
+    "@strapi/provider-email-amazon-ses": "^4.23.0",
+    "@strapi/provider-upload-aws-s3": "^4.23.0",
+    "@strapi/strapi": "^4.23.0",
     "@webbio/strapi-plugin-scheduler": "^1.0.6",
     "html-loader": "^5.0.0",
-    "jsdom": "^22.1.0",
+    "jsdom": "^24.0.0",
     "markdown-loader": "^8.0.0",
-    "pg": "^8.11.1",
-    "puppeteer": "^22.0.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "pg": "^8.11.5",
+    "puppeteer": "^22.6.5",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-router-dom": "^5.2.0",
     "react-tagsinput": "^3.20.3",
     "strapi-plugin-tagsinput": "^1.0.4",
-    "styled-components": "^5.2.1"
+    "styled-components": "^6.1.8"
   },
   "engines": {
     "npm": ">=6.0.0"

diff --git a/admin/public/emailTemplates/subscribe.html b/admin/public/emailTemplates/subscribe.html
@@ -64,8 +64,7 @@ <h1 style="font-size: x-large">
 
                   {{else}}
                   <img
-                    src="
-                                    https://canopas-blogs.s3.ap-south-1.amazonaws.com/canopas_icon_ebedc25de3.png?updated_at=2023-05-18T10:11:39.483Z"
+                    src="https://canopas-blogs.s3.ap-south-1.amazonaws.com/canopas_icon_ebedc25de3.png?updated_at=2023-05-18T10:11:39.483Z"
                     style="width: 45%; margin-bottom: 20px; margin-top: 10px"
                   />
                   {{/if}}

diff --git a/admin/src/api/post/content-types/post/lifecycles.js b/admin/src/api/post/content-types/post/lifecycles.js
@@ -128,10 +128,7 @@ async function TagsInput(tags) {
       where: { slug },
     });
 
-    const insert = existingTag && existingTag.name != tags[i].name;
-    slug = insert ? slug + "-" + i : slug;
-
-    if (existingTag == null || insert) {
+    if (existingTag == null) {
       existingTag = await strapi.db.query("api::tag.tag").create({
         data: {
           slug,