Fix - duplicate tags, forward logs to cloud watch

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

Hide file tree

Showing 69 changed files with 6 additions and 9,949 deletions.
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/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,

diff --git a/website/.env.example b/website/.env.example
diff --git a/website/.eslintignore b/website/.eslintignore
diff --git a/website/.eslintrc.json b/website/.eslintrc.json
diff --git a/website/Dockerfile b/website/Dockerfile
diff --git a/website/assets/css/global.css b/website/assets/css/global.css
diff --git a/website/assets/fonts/Comme-Light.woff2 b/website/assets/fonts/Comme-Light.woff2
diff --git a/website/assets/fonts/Comme-Medium.woff2 b/website/assets/fonts/Comme-Medium.woff2
diff --git a/website/assets/fonts/Comme-Regular.woff2 b/website/assets/fonts/Comme-Regular.woff2
diff --git a/website/assets/fonts/Comme-SemiBold.woff2 b/website/assets/fonts/Comme-SemiBold.woff2
diff --git a/website/assets/fonts/Inter-Bold.woff2 b/website/assets/fonts/Inter-Bold.woff2
diff --git a/website/assets/fonts/Inter-ExtraLight.woff2 b/website/assets/fonts/Inter-ExtraLight.woff2
diff --git a/website/assets/fonts/Inter-Medium.woff2 b/website/assets/fonts/Inter-Medium.woff2
diff --git a/website/assets/fonts/Inter-Regular.woff2 b/website/assets/fonts/Inter-Regular.woff2
diff --git a/website/assets/fonts/Inter-SemiBold.woff2 b/website/assets/fonts/Inter-SemiBold.woff2
diff --git a/website/assets/fonts/Poppins-Medium.woff2 b/website/assets/fonts/Poppins-Medium.woff2
diff --git a/website/assets/fonts/Poppins-Regular.woff2 b/website/assets/fonts/Poppins-Regular.woff2
diff --git a/website/assets/fonts/Source-codePro.woff2 b/website/assets/fonts/Source-codePro.woff2
diff --git a/website/assets/images/404page_4_1.svg b/website/assets/images/404page_4_1.svg