Skip to content

Commit

Permalink
Merge pull request #66 from MarleneJiang/issue-61-CMS表设计及接口设计
Browse files Browse the repository at this point in the history
feat: add some api
  • Loading branch information
MarleneJiang committed Jan 23, 2023
2 parents 8a574f1 + 2492a03 commit 338327a
Show file tree
Hide file tree
Showing 46 changed files with 843 additions and 691 deletions.
11 changes: 10 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,14 @@
},
"[jsonc]": {
"editor.defaultFormatter": "vscode.json-language-features"
}
},
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
}
6 changes: 0 additions & 6 deletions backend/.env.example

This file was deleted.

1 change: 0 additions & 1 deletion backend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ coverage
# Strapi
############################

.env
license.txt
exports
*.cache
Expand Down
Binary file modified backend/.tmp/data.db
Binary file not shown.
5 changes: 0 additions & 5 deletions backend/src/api/article/content-types/article/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
"type": "string",
"required": true
},
"slug": {
"type": "uid",
"targetField": "title",
"required": true
},
"viewed": {
"type": "biginteger",
"required": true,
Expand Down
29 changes: 20 additions & 9 deletions backend/src/api/author/content-types/author/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,37 @@
"pluginOptions": {},
"attributes": {
"name": {
"type": "string"
},
"describe": {
"type": "text"
"type": "string",
"required": true,
"unique": true
},
"img": {
"motto": {
"type": "string"
},
"uid": {
"type": "uid",
"targetField": "name"
"avatar": {
"type": "string",
"required": true
},
"rank": {
"type": "integer"
"type": "biginteger",
"default": "1",
"required": true
},
"articles": {
"type": "relation",
"relation": "oneToMany",
"target": "api::article.article",
"mappedBy": "authorId"
},
"liked": {
"type": "biginteger",
"default": "0",
"required": true
},
"viewed": {
"type": "biginteger",
"required": true,
"default": "0"
}
}
}
10 changes: 0 additions & 10 deletions backend/src/api/global/content-types/global/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@
"component": "layouts.gadgets",
"required": true
},
"favicon": {
"type": "text",
"unique": true,
"required": true
},
"siteName": {
"type": "string",
"required": true,
"unique": true
},
"navs": {
"type": "component",
"repeatable": true,
Expand Down
2 changes: 1 addition & 1 deletion backend/src/components/layouts/ads.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"attributes": {
"ad": {
"type": "string",
"unique": true,
"unique": false,
"required": true
},
"img": {
Expand Down
11 changes: 6 additions & 5 deletions backend/src/components/layouts/footers.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"collectionName": "components_layouts_footers",
"info": {
"displayName": "footers"
"displayName": "footers",
"description": ""
},
"options": {},
"attributes": {
"footer": {
"type": "string",
"required": true,
"unique": true
"unique": false
},
"url": {
"type": "string",
"required": true
"required": false
},
"describe": {
"type": "string"
},
"isShow": {
"type": "boolean"
"icon": {
"type": "string"
}
}
}
2 changes: 1 addition & 1 deletion backend/src/components/layouts/gadgets.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"title": {
"type": "string",
"required": true,
"unique": true
"unique": false
},
"subtitle": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion backend/src/components/layouts/links.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"title": {
"type": "string",
"required": true,
"unique": true
"unique": false
},
"icon": {
"type": "string",
Expand Down
5 changes: 3 additions & 2 deletions backend/src/components/layouts/navs.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"collectionName": "components_layouts_navs",
"info": {
"displayName": "navs"
"displayName": "navs",
"description": ""
},
"options": {},
"attributes": {
"nav": {
"type": "string",
"required": true,
"unique": true
"unique": false
},
"url": {
"type": "string",
Expand Down
Loading

1 comment on commit 338327a

@vercel
Copy link

@vercel vercel bot commented on 338327a Jan 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.