Merge branch 'main' into 30_blog-article

.vscode/settings.json

@@ -15,5 +15,8 @@
   "explorer.fileNesting.expand": false,
   "explorer.fileNesting.patterns": {
     "package.json": "*"
+  },
+  "[astro]": {
+    "editor.defaultFormatter": "astro-build.astro-vscode"
   }
 }

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package.json

@@ -14,5 +14,9 @@
     "concurrently": "^8.2.2",
     "prettier": "3.3.2",
     "prettier-plugin-astro": "^0.14.0"
+  },
+  "volta": {
+    "node": "20.15.1",
+    "yarn": "4.3.1"
   }
 }

strapi/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

strapi/config/plugins.ts

@@ -1,28 +1,16 @@
 module.exports = ({ env }) => ({
-  // ...
-  // upload: {
-  //   config: {
-  //     provider: "aws-s3",
-  //     providerOptions: {
-  //       s3Options: {
-  //         credentials: {
-  //           accessKeyId: env("AWS_ACCESS_KEY_ID"),
-  //           secretAccessKey: env("AWS_SECRET_ACCESS_KEY"),
-  //         },
-  //         region: env("AWS_REGION"),
-  //         endpoint: env("AWS_ENDPOINT_URL_S3"),
-  //         params: {
-  //           Bucket: env("BUCKET_NAME"),
-  //         },
-  //       },
-  //     },
-  //     actionOptions: {
-  //       upload: {},
-  //       uploadStream: {},
-  //       delete: {},
-  //     },
-  //   },
-  // },
+  upload: {
+    config: {
+      breakpoints: {
+        // Image sizes
+        xlarge: 1920,
+        large: 1000,
+        medium: 750,
+        small: 500,
+        thumbnail: 64,
+      },
+    },
+  },
   "strapi-plugin-populate-deep": {
     config: {
       defaultDepth: 10, // Default is 5

strapi/package.json

@@ -38,5 +38,9 @@
     "node": ">=18.0.0 <=20.x.x",
     "npm": ">=6.0.0"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "volta": {
+    "node": "20.15.1",
+    "yarn": "4.3.1"
+  }
 }

strapi/src/api/project-description/content-types/project-description/schema.json

@@ -0,0 +1,18 @@
+{
+  "kind": "singleType",
+  "collectionName": "project_descriptions",
+  "info": {
+    "singularName": "project-description",
+    "pluralName": "project-descriptions",
+    "displayName": "Project Description"
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "Text": {
+      "type": "blocks"
+    }
+  }
+}

strapi/src/api/project-description/controllers/project-description.ts

@@ -0,0 +1,9 @@
+/**
+ * project-description controller
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreController(
+  "api::project-description.project-description",
+);

strapi/src/api/project-description/routes/project-description.ts

@@ -0,0 +1,9 @@
+/**
+ * project-description router
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreRouter(
+  "api::project-description.project-description",
+);

strapi/src/api/project-description/services/project-description.ts

@@ -0,0 +1,9 @@
+/**
+ * project-description service
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreService(
+  "api::project-description.project-description",
+);

strapi/src/api/project/content-types/project/schema.json

@@ -0,0 +1,46 @@
+{
+  "kind": "collectionType",
+  "collectionName": "projects",
+  "info": {
+    "singularName": "project",
+    "pluralName": "projects",
+    "displayName": "Project"
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "Name": {
+      "type": "string",
+      "required": true
+    },
+    "Description": {
+      "type": "blocks",
+      "required": true
+    },
+    "Images": {
+      "allowedTypes": ["images"],
+      "type": "media",
+      "multiple": true,
+      "required": true
+    },
+    "technologies": {
+      "type": "relation",
+      "relation": "manyToMany",
+      "target": "api::technology.technology",
+      "inversedBy": "projects"
+    },
+    "Demo": {
+      "type": "component",
+      "repeatable": true,
+      "component": "link.link"
+    },
+    "Acronym": {
+      "type": "string",
+      "required": true,
+      "unique": true,
+      "maxLength": 8
+    }
+  }
+}

strapi/src/api/project/controllers/project.ts

@@ -0,0 +1,7 @@
+/**
+ * project controller
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreController("api::project.project");

strapi/src/api/project/routes/project.ts

@@ -0,0 +1,7 @@
+/**
+ * project router
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreRouter("api::project.project");

strapi/src/api/project/services/project.ts

@@ -0,0 +1,7 @@
+/**
+ * project service
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreService("api::project.project");

strapi/src/api/technology/content-types/technology/schema.json

@@ -0,0 +1,26 @@
+{
+  "kind": "collectionType",
+  "collectionName": "technologies",
+  "info": {
+    "singularName": "technology",
+    "pluralName": "technologies",
+    "displayName": "Technology"
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "Name": {
+      "type": "string",
+      "required": true,
+      "unique": true
+    },
+    "projects": {
+      "type": "relation",
+      "relation": "manyToMany",
+      "target": "api::project.project",
+      "mappedBy": "technologies"
+    }
+  }
+}

strapi/src/api/technology/controllers/technology.ts

@@ -0,0 +1,7 @@
+/**
+ * technology controller
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreController("api::technology.technology");

strapi/src/api/technology/routes/technology.ts

@@ -0,0 +1,7 @@
+/**
+ * technology router
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreRouter("api::technology.technology");

strapi/src/api/technology/services/technology.ts

@@ -0,0 +1,7 @@
+/**
+ * technology service
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreService("api::technology.technology");

strapi/src/api/test-collection/content-types/test-collection/schema.json

@@ -0,0 +1,18 @@
+{
+  "kind": "collectionType",
+  "collectionName": "test_collections",
+  "info": {
+    "singularName": "test-collection",
+    "pluralName": "test-collections",
+    "displayName": "test-collection"
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "yuh": {
+      "type": "string"
+    }
+  }
+}

strapi/src/api/test-collection/controllers/test-collection.ts

@@ -0,0 +1,9 @@
+/**
+ * test-collection controller
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreController(
+  "api::test-collection.test-collection",
+);

strapi/src/api/test-collection/routes/test-collection.ts

@@ -0,0 +1,9 @@
+/**
+ * test-collection router
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreRouter(
+  "api::test-collection.test-collection",
+);

strapi/src/api/test-collection/services/test-collection.ts

@@ -0,0 +1,9 @@
+/**
+ * test-collection service
+ */
+
+import { factories } from "@strapi/strapi";
+
+export default factories.createCoreService(
+  "api::test-collection.test-collection",
+);