diff --git a/app/Controllers/Http/AnnouncesController.ts b/app/Controllers/Http/AnnouncesController.ts index 2fd8d59..e36515c 100644 --- a/app/Controllers/Http/AnnouncesController.ts +++ b/app/Controllers/Http/AnnouncesController.ts @@ -16,7 +16,7 @@ export default class AnnouncesController { public async store ({ request, response }: HttpContextContract) { const data = await request.validate(AnnounceStoreValidator) - const announce = new Announce() + const announce = await Announce.create(data) const translation = await getTranslation(data.code) await announce.related('message').associate(translation) @@ -25,7 +25,7 @@ export default class AnnouncesController { if (cover) await announce.related('cover').save(cover) return response.status(200).send({ - announce: announce.save() + announce: announce }) } diff --git a/app/Models/Announce.ts b/app/Models/Announce.ts index 62abe8f..fbcc8a2 100644 --- a/app/Models/Announce.ts +++ b/app/Models/Announce.ts @@ -7,6 +7,12 @@ export default class Announce extends BaseModel { @column({ isPrimary: true }) public id: number + @column() + public color: string + + @column() + public hoverColor: string + @belongsTo(() => Translation) public message: BelongsTo diff --git a/app/Validators/announce/AnnounceStoreValidator.ts b/app/Validators/announce/AnnounceStoreValidator.ts index ec2bb56..3a70835 100644 --- a/app/Validators/announce/AnnounceStoreValidator.ts +++ b/app/Validators/announce/AnnounceStoreValidator.ts @@ -1,15 +1,17 @@ -import {schema} from '@ioc:Adonis/Core/Validator' -import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext' +import { schema } from '@ioc:Adonis/Core/Validator' +import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext' export default class AnnounceStoreValidator { - public schema = schema.create({ - code: schema.string(), - cover: schema.string.optional() - }) - public messages = { - required: 'The field {{ field }} is required' - } - constructor (protected ctx: HttpContextContract) { } + + public schema = schema.create({ + code: schema.string(), + cover: schema.string.optional(), + color: schema.string(), + hoverColor: schema.string() + }) + public messages = { + required: 'The field {{field}} is required' + } } diff --git a/app/Validators/announce/AnnounceUpdateValidator.ts b/app/Validators/announce/AnnounceUpdateValidator.ts index 8ffd4b2..3b5c9b9 100644 --- a/app/Validators/announce/AnnounceUpdateValidator.ts +++ b/app/Validators/announce/AnnounceUpdateValidator.ts @@ -1,15 +1,18 @@ -import {schema} from '@ioc:Adonis/Core/Validator' -import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext' +import { schema } from '@ioc:Adonis/Core/Validator' +import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext' export default class AnnounceUpdateValidator { + constructor (protected ctx: HttpContextContract) { + } + public schema = schema.create({ - code: schema.string.optional(), - cover: schema.string.optional() + code: schema.string(), + cover: schema.string.optional(), + color: schema.string.optional(), + hoverColor: schema.string.optional() }) + public messages = { required: 'The field {{field}} is required' } - - constructor (protected ctx: HttpContextContract) { - } }