提交 bdff3902 编写于 作者: V Virginie Ky

Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctm-ui

......@@ -88,16 +88,16 @@ yarn develop
The server (API) is available at http://localhost:1337
**WARNING** ⚠️ If you've followed the recommended setup, you should not be able to reach the administration panel at http://localhost:1337/admin.
The built administration panel is available at http://localhost:1337/admin
**Start the administration panel server**
**Start the administration panel server for development**
```bash
cd strapi/packages/strapi-admin
yarn develop
```
The administration panel is available at http://localhost:4000/admin
The administration panel will be available at http://localhost:4000/admin
**Awesome! You are now able to contribute to Strapi.**
......
......@@ -7,35 +7,45 @@
},
"options": {
"increments": true,
"timestamps": ["created_at", "updated_at"],
"timestamps": [
"created_at",
"updated_at"
],
"comment": ""
},
"attributes": {
"full_name": {
"type": "string"
},
"postal_code": {
"type": "string"
"geolocation": {
"type": "json",
"required": true
},
"city": {
"type": "string"
},
"geolocation": {
"type": "json",
"required": true
"postal_coder": {
"type": "string"
},
"country": {
"model": "country"
"category": {
"model": "category"
},
"cover": {
"model": "file",
"via": "related",
"plugin": "upload"
"plugin": "upload",
"required": false
},
"images": {
"collection": "file",
"via": "related",
"plugin": "upload"
"plugin": "upload",
"required": false
},
"full_name": {
"type": "string"
},
"rrrr": {
"type": "component",
"repeatable": false,
"component": "default.rrr"
}
}
}
......@@ -15,4 +15,4 @@
"type": "string"
}
}
}
\ No newline at end of file
}
......@@ -7,7 +7,10 @@
},
"options": {
"increments": true,
"timestamps": ["created_at", "updated_at"],
"timestamps": [
"created_at",
"updated_at"
],
"comment": ""
},
"attributes": {
......
{
"routes": [
{
"method": "GET",
"path": "/date-ts",
"handler": "date-t.find",
"config": {
"policies": []
}
},
{
"method": "GET",
"path": "/date-ts/count",
"handler": "date-t.count",
"config": {
"policies": []
}
},
{
"method": "GET",
"path": "/date-ts/:id",
"handler": "date-t.findOne",
"config": {
"policies": []
}
},
{
"method": "POST",
"path": "/date-ts",
"handler": "date-t.create",
"config": {
"policies": []
}
},
{
"method": "PUT",
"path": "/date-ts/:id",
"handler": "date-t.update",
"config": {
"policies": []
}
},
{
"method": "DELETE",
"path": "/date-ts/:id",
"handler": "date-t.delete",
"config": {
"policies": []
}
}
]
}
'use strict';
/**
* Read the documentation (https://strapi.io/documentation/3.0.0-beta.x/concepts/controllers.html#core-controllers)
* to customize this controller
*/
module.exports = {};
'use strict';
/**
* Lifecycle callbacks for the `date-t` model.
*/
module.exports = {
// Before saving a value.
// Fired before an `insert` or `update` query.
// beforeSave: async (model, attrs, options) => {},
// After saving a value.
// Fired after an `insert` or `update` query.
// afterSave: async (model, response, options) => {},
// Before fetching a value.
// Fired before a `fetch` operation.
// beforeFetch: async (model, columns, options) => {},
// After fetching a value.
// Fired after a `fetch` operation.
// afterFetch: async (model, response, options) => {},
// Before fetching all values.
// Fired before a `fetchAll` operation.
// beforeFetchAll: async (model, columns, options) => {},
// After fetching all values.
// Fired after a `fetchAll` operation.
// afterFetchAll: async (model, response, options) => {},
// Before creating a value.
// Fired before an `insert` query.
// beforeCreate: async (model, attrs, options) => {},
// After creating a value.
// Fired after an `insert` query.
// afterCreate: async (model, attrs, options) => {},
// Before updating a value.
// Fired before an `update` query.
// beforeUpdate: async (model, attrs, options) => {},
// After updating a value.
// Fired after an `update` query.
// afterUpdate: async (model, attrs, options) => {},
// Before destroying a value.
// Fired before a `delete` query.
// beforeDestroy: async (model, attrs, options) => {},
// After destroying a value.
// Fired after a `delete` query.
// afterDestroy: async (model, attrs, options) => {}
};
{
"connection": "default",
"collectionName": "date_ts",
"info": {
"name": "date t"
},
"options": {
"increments": true,
"timestamps": true
},
"attributes": {
"date": {
"type": "date"
},
"datetime": {
"type": "datetime"
},
"time": {
"type": "time"
},
"rrr": {
"type": "string"
}
}
}
'use strict';
/**
* Read the documentation (https://strapi.io/documentation/3.0.0-beta.x/concepts/services.html#core-services)
* to customize this service
*/
module.exports = {};
{
"routes": [
{
"method": "GET",
"path": "/dzs",
"handler": "dz.find",
"config": {
"policies": []
}
},
{
"method": "GET",
"path": "/dzs/count",
"handler": "dz.count",
"config": {
"policies": []
}
},
{
"method": "GET",
"path": "/dzs/:id",
"handler": "dz.findOne",
"config": {
"policies": []
}
},
{
"method": "POST",
"path": "/dzs",
"handler": "dz.create",
"config": {
"policies": []
}
},
{
"method": "PUT",
"path": "/dzs/:id",
"handler": "dz.update",
"config": {
"policies": []
}
},
{
"method": "DELETE",
"path": "/dzs/:id",
"handler": "dz.delete",
"config": {
"policies": []
}
}
]
}
'use strict';
/**
* Read the documentation (https://strapi.io/documentation/3.0.0-beta.x/concepts/controllers.html#core-controllers)
* to customize this controller
*/
module.exports = {};
'use strict';
/**
* Lifecycle callbacks for the `dz` model.
*/
module.exports = {
// Before saving a value.
// Fired before an `insert` or `update` query.
// beforeSave: async (model, attrs, options) => {},
// After saving a value.
// Fired after an `insert` or `update` query.
// afterSave: async (model, response, options) => {},
// Before fetching a value.
// Fired before a `fetch` operation.
// beforeFetch: async (model, columns, options) => {},
// After fetching a value.
// Fired after a `fetch` operation.
// afterFetch: async (model, response, options) => {},
// Before fetching all values.
// Fired before a `fetchAll` operation.
// beforeFetchAll: async (model, columns, options) => {},
// After fetching all values.
// Fired after a `fetchAll` operation.
// afterFetchAll: async (model, response, options) => {},
// Before creating a value.
// Fired before an `insert` query.
// beforeCreate: async (model, attrs, options) => {},
// After creating a value.
// Fired after an `insert` query.
// afterCreate: async (model, attrs, options) => {},
// Before updating a value.
// Fired before an `update` query.
// beforeUpdate: async (model, attrs, options) => {},
// After updating a value.
// Fired after an `update` query.
// afterUpdate: async (model, attrs, options) => {},
// Before destroying a value.
// Fired before a `delete` query.
// beforeDestroy: async (model, attrs, options) => {},
// After destroying a value.
// Fired after a `delete` query.
// afterDestroy: async (model, attrs, options) => {}
};
{
"connection": "default",
"collectionName": "dzs",
"info": {
"name": "dz"
},
"attributes": {
"name": {
"type": "string"
},
"dz": {
"type": "dynamiczone",
"components": [
"nested.nested-compo",
"blog.toto"
],
"required": true,
"max": 2
},
"dz2": {
"type": "dynamiczone",
"components": [
"nested.compo-with-nested"
]
}
}
}
'use strict';
/**
* Read the documentation (https://strapi.io/documentation/3.0.0-beta.x/concepts/services.html#core-services)
* to customize this service
*/
module.exports = {};
......@@ -19,8 +19,8 @@
"via": "menu"
},
"restaurant": {
"model": "restaurant",
"via": "menu"
"via": "menu",
"model": "restaurant"
}
}
}
\ No newline at end of file
}
{
"routes": [
{
"method": "GET",
"path": "/my-super-content-types",
"handler": "my-super-content-type.find",
"config": {
"policies": []
}
},
{
"method": "GET",
"path": "/my-super-content-types/count",
"handler": "my-super-content-type.count",
"config": {
"policies": []
}
},
{
"method": "GET",
"path": "/my-super-content-types/:id",
"handler": "my-super-content-type.findOne",
"config": {
"policies": []
}
},
{
"method": "POST",
"path": "/my-super-content-types",
"handler": "my-super-content-type.create",
"config": {
"policies": []
}
},
{
"method": "PUT",
"path": "/my-super-content-types/:id",
"handler": "my-super-content-type.update",
"config": {
"policies": []
}
},
{
"method": "DELETE",
"path": "/my-super-content-types/:id",
"handler": "my-super-content-type.delete",
"config": {
"policies": []
}
}
]
}
'use strict';
/**
* Read the documentation (https://strapi.io/documentation/3.0.0-beta.x/concepts/controllers.html#core-controllers)
* to customize this controller
*/
module.exports = {};
'use strict';
/**
* Lifecycle callbacks for the `my-super-content-type` model.
*/
module.exports = {
// Before saving a value.
// Fired before an `insert` or `update` query.
// beforeSave: async (model, attrs, options) => {},
// After saving a value.
// Fired after an `insert` or `update` query.
// afterSave: async (model, response, options) => {},
// Before fetching a value.
// Fired before a `fetch` operation.
// beforeFetch: async (model, columns, options) => {},
// After fetching a value.
// Fired after a `fetch` operation.
// afterFetch: async (model, response, options) => {},
// Before fetching all values.
// Fired before a `fetchAll` operation.
// beforeFetchAll: async (model, columns, options) => {},
// After fetching all values.
// Fired after a `fetchAll` operation.
// afterFetchAll: async (model, response, options) => {},
// Before creating a value.
// Fired before an `insert` query.
// beforeCreate: async (model, attrs, options) => {},
// After creating a value.
// Fired after an `insert` query.
// afterCreate: async (model, attrs, options) => {},
// Before updating a value.
// Fired before an `update` query.
// beforeUpdate: async (model, attrs, options) => {},
// After updating a value.
// Fired after an `update` query.
// afterUpdate: async (model, attrs, options) => {},
// Before destroying a value.
// Fired before a `delete` query.
// beforeDestroy: async (model, attrs, options) => {},
// After destroying a value.
// Fired after a `delete` query.
// afterDestroy: async (model, attrs, options) => {}
};
{
"connection": "default",
"collectionName": "my_super_content_type",
"info": {
"name": "My super content type"
},
"attributes": {
"name": {
"type": "string"
},
"rrrr": {
"type": "date",
"default": "2019-12-20T11:00:00.000Z"
}
}
}
'use strict';
/**
* Read the documentation (https://strapi.io/documentation/3.0.0-beta.x/concepts/services.html#core-services)
* to customize this service
*/
module.exports = {};
......@@ -7,12 +7,26 @@
},
"options": {
"increments": true,
"timestamps": ["created_at", "updated_at"],