Merge branch 'main' of github.com:MarleneJiang/ByteDream-JueJin into …

…code
IdeaLeap · Feb 12, 2023 · a1567e0 · a1567e0
2 parents 09d05e3 + fbcc092
commit a1567e0
Show file tree

Hide file tree

Showing 13 changed files with 295 additions and 14 deletions.
diff --git a/backend/src/api/colum/content-types/colum/schema.json b/backend/src/api/colum/content-types/colum/schema.json
@@ -4,7 +4,8 @@
   "info": {
     "singularName": "colum",
     "pluralName": "colums",
-    "displayName": "colum"
+    "displayName": "colum",
+    "description": ""
   },
   "options": {
     "draftAndPublish": true
@@ -21,6 +22,14 @@
       "relation": "oneToMany",
       "target": "api::article.article",
       "mappedBy": "columId"
+    },
+    "cover": {
+      "type": "string",
+      "required": true
+    },
+    "describe": {
+      "type": "string",
+      "required": true
     }
   }
 }
diff --git a/backend/src/api/global/content-types/global/schema.json b/backend/src/api/global/content-types/global/schema.json
@@ -45,6 +45,11 @@
       "type": "component",
       "repeatable": false,
       "component": "articles.ads"
+    },
+    "contentAds": {
+      "type": "component",
+      "repeatable": false,
+      "component": "articles.content-ad"
     }
   }
 }
diff --git a/backend/src/components/articles/content-ad.json b/backend/src/components/articles/content-ad.json
@@ -0,0 +1,22 @@
+{
+  "collectionName": "components_articles_content_ads",
+  "info": {
+    "displayName": "ContentAd",
+    "description": ""
+  },
+  "options": {},
+  "attributes": {
+    "img": {
+      "type": "string",
+      "required": true
+    },
+    "url": {
+      "type": "string",
+      "required": true
+    },
+    "ad": {
+      "type": "string",
+      "required": true
+    }
+  }
+}
diff --git a/backend/src/components/layouts/ads.json b/backend/src/components/layouts/ads.json
@@ -15,6 +15,10 @@
       "type": "string",
       "required": true,
       "unique": false
+    },
+    "url": {
+      "type": "string",
+      "required": true
     }
   }
 }