Working on new version of website

Signed-off-by: Arthur DANJOU <arthurdanjou@outlook.fr>

app/Validators/AuthValidator.ts

@@ -1,8 +1,9 @@
-import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
 import {rules, schema} from '@ioc:Adonis/Core/Validator'
 
 export default class AuthValidator {
-  constructor (private ctx: HttpContextContract) {
+  public messages = {
+    required: 'The field {{field}} is required'
   }
 
   public schema = schema.create({
@@ -16,11 +17,6 @@ export default class AuthValidator {
     remember_me: schema.boolean()
   })
 
-  public cacheKey = this.ctx.routeKey
-
-  public messages = {
-    'email.email': 'L\'adresse mail n\'est pas valide !',
-    'email.required': 'Veuillez renseigner une adresse mail !',
-    'password.required': 'Veuillez renseigner un mot de passe !',
+  constructor (protected ctx: HttpContextContract) {
   }
 }

app/Validators/FormValidator.ts

@@ -1,16 +0,0 @@
-import { schema } from '@ioc:Adonis/Core/Validator'
-import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
-
-export default class FormValidator {
-  constructor (protected ctx: HttpContextContract) {
-  }
-
-  public schema = schema.create({
-    name: schema.string(),
-    email: schema.string(),
-    subject: schema.string(),
-    content: schema.string()
-  })
-
-  public messages = {}
-}

app/Validators/announce/AnnounceStoreValidator.ts

@@ -0,0 +1,15 @@
+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) {
+  }
+}

app/Validators/announce/AnnounceUpdateValidator.ts

@@ -0,0 +1,15 @@
+import {schema} from '@ioc:Adonis/Core/Validator'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+
+export default class AnnounceUpdateValidator {
+  public schema = schema.create({
+    code: schema.string.optional(),
+    cover: schema.string.optional()
+  })
+  public messages = {
+    required: 'The field {{field}} is required'
+  }
+
+  constructor (protected ctx: HttpContextContract) {
+  }
+}

app/Validators/form/FormStoreValidator.ts

@@ -0,0 +1,18 @@
+import {schema} from '@ioc:Adonis/Core/Validator'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+
+export default class FormStoreValidator {
+  constructor (protected ctx: HttpContextContract) {
+  }
+
+  public schema = schema.create({
+    name: schema.string(),
+    email: schema.string(),
+    subject: schema.string(),
+    content: schema.string()
+  })
+
+  public messages = {
+    required: 'The field {{field}} is required'
+  }
+}

app/Validators/guestbook/GuestValidator.ts

@@ -2,7 +2,9 @@ import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
 import {rules, schema} from '@ioc:Adonis/Core/Validator'
 
 export default class GuestValidator {
-  constructor (private ctx: HttpContextContract) {
+  public messages = {
+    required: 'The field {{field}} is required',
+    'email.email': 'The email is not correct'
   }
 
   public schema = schema.create({
@@ -14,9 +16,6 @@ export default class GuestValidator {
     ])
   })
 
-  public cacheKey = this.ctx.routeKey
-
-  public messages = {
-    required: 'Le champ {{field}} doit être valide !',
+  constructor (protected ctx: HttpContextContract) {
   }
 }

app/Validators/location/LocationValidator.ts

@@ -1,4 +1,4 @@
-import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
 import {schema} from '@ioc:Adonis/Core/Validator'
 
 export default class LocationValidator {
@@ -14,6 +14,6 @@ export default class LocationValidator {
   public cacheKey = this.ctx.routeKey
 
   public messages = {
-    required: 'Le champ {{field}} doit être valide !',
+    required: 'The field {{field}} is required'
   }
 }

app/Validators/profile/ProfileUpdateValidator.ts

@@ -0,0 +1,16 @@
+import {schema} from '@ioc:Adonis/Core/Validator'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+
+export default class ProfileUpdateValidator {
+  public schema = schema.create({
+    age: schema.number.optional(),
+    hiring_status: schema.string.optional(),
+    hiring_color: schema.string.optional()
+  })
+  public messages = {
+    required: 'The field {{field}} is required'
+  }
+
+  constructor (protected ctx: HttpContextContract) {
+  }
+}

app/Validators/project/ProjectStoreValidator.ts

@@ -0,0 +1,19 @@
+import {schema} from '@ioc:Adonis/Core/Validator'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+
+export default class ProjectStoreValidator {
+  constructor (protected ctx: HttpContextContract) {
+  }
+
+  public schema = schema.create({
+    name: schema.string(),
+    description: schema.string(),
+    progress: schema.number(),
+    url: schema.string(),
+    cover: schema.string()
+  })
+
+  public messages = {
+    required: 'The field {{field}} is required'
+  }
+}

app/Validators/project/ProjectUpdateValidator.ts

@@ -0,0 +1,18 @@
+import {schema} from '@ioc:Adonis/Core/Validator'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+
+export default class ProjectUpdateValidator {
+  public schema = schema.create({
+    name: schema.string.optional(),
+    description: schema.string.optional(),
+    progress: schema.number.optional(),
+    url: schema.string.optional(),
+    cover: schema.string.optional()
+  })
+  public messages = {
+    required: 'The field {{field}} is required'
+  }
+
+  constructor (protected ctx: HttpContextContract) {
+  }
+}

app/Validators/project/ProjectValidator.ts

@@ -1,19 +0,0 @@
-import { schema } from '@ioc:Adonis/Core/Validator'
-import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
-
-export default class ProjectValidator {
-  constructor (protected ctx: HttpContextContract) {
-  }
-
-  public schema = schema.create({
-    name: schema.string(),
-    description: schema.string(),
-    progress: schema.number(),
-    url: schema.string()
-  })
-
-
-  public messages = {
-    required: 'Le champ {{field}} doit être valide !',
-  }
-}

app/Validators/subscriber/SubscriberStoreValidator.ts

@@ -0,0 +1,20 @@
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+import {rules, schema} from '@ioc:Adonis/Core/Validator'
+
+export default class SubscriberStoreValidator {
+  public schema = schema.create({
+    email: schema.string({ trim: true }, [
+      rules.email(),
+      rules.unique({
+        table: 'subscribers',
+        column: 'email'
+      })
+    ])
+  })
+  public messages = {
+    required: 'The field {{field}} is required'
+  }
+
+  constructor (protected ctx: HttpContextContract) {
+  }
+}

app/Validators/subscriber/SubscriberValidator.ts

@@ -1,19 +0,0 @@
-import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
-import {rules, schema} from '@ioc:Adonis/Core/Validator'
-
-export default class SubscriberValidator {
-  constructor (private ctx: HttpContextContract) {
-  }
-
-  public schema = schema.create({
-    email: schema.string({ trim: true }, [
-      rules.email()
-    ])
-  })
-
-  public cacheKey = this.ctx.routeKey
-
-  public messages = {
-    required: 'Le champ {{field}} doit être valide !',
-  }
-}

app/Validators/translation/TranslationStoreValidator.ts

@@ -0,0 +1,22 @@
+import {rules, schema} from '@ioc:Adonis/Core/Validator'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+
+export default class TranslationStoreValidator {
+  public schema = schema.create({
+    code: schema.string({}, [
+      rules.unique({
+        table: 'translations',
+        column: 'code'
+      })
+    ]),
+    english: schema.string.optional(),
+    french: schema.string.optional()
+  })
+  public messages = {
+    required: 'The field {{field}} is required',
+    'code.unique': 'The translation code is not unique !'
+  }
+
+  constructor (protected ctx: HttpContextContract) {
+  }
+}

app/Validators/translation/TranslationUpdateValidator.ts

@@ -0,0 +1,22 @@
+import {rules, schema} from '@ioc:Adonis/Core/Validator'
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+
+export default class TranslationUpdateValidator {
+  public schema = schema.create({
+    code: schema.string({}, [
+      rules.unique({
+        table: 'translations',
+        column: 'code'
+      })
+    ]),
+    english: schema.string.optional(),
+    french: schema.string.optional()
+  })
+  public messages = {
+    required: 'The field {{field}} is required',
+    'code.unique': 'The translation code is not unique !'
+  }
+
+  constructor (protected ctx: HttpContextContract) {
+  }
+}

app/Validators/user/UserStoreValidator.ts

@@ -0,0 +1,23 @@
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+import {rules, schema} from '@ioc:Adonis/Core/Validator'
+
+export default class UserStoreValidator {
+  public schema = schema.create({
+    email: schema.string({ trim: true, escape: true }, [
+      rules.email(),
+      rules.required(),
+      rules.unique({
+        table: 'users',
+        column: 'email'
+      })
+    ])
+  })
+  public messages = {
+    required: 'The field {{field}} is required',
+    'email.email': 'The email must be valid',
+    'email.unique': 'The email is not unique'
+  }
+
+  constructor (protected ctx: HttpContextContract) {
+  }
+}

app/Validators/user/UserUpdateValidator.ts

@@ -0,0 +1,33 @@
+import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
+import {rules, schema} from '@ioc:Adonis/Core/Validator'
+
+export default class UserUpdateValidator {
+  public schema = schema.create({
+    email: schema.string.optional({ trim: true, escape: true },
+      [
+        rules.email(),
+        rules.unique(
+          {
+            table: 'users',
+            column: 'email'
+          })
+      ]
+    ),
+    password: schema.string.optional({ trim: true, escape: true },
+      [
+        rules.confirmed()
+      ]
+    ),
+    is_confirmed: schema.boolean.optional(),
+    confirmation_token: schema.string.optional({ trim: true, escape: true }),
+    remember_me: schema.string.optional({ trim: true, escape: true }),
+  })
+  public messages = {
+    required: 'The field {{field}} is required',
+    'email.email': 'The email must be valid',
+    'password.confirmation': 'Passwords are not the same'
+  }
+
+  constructor (protected ctx: HttpContextContract) {
+  }
+}

app/Validators/users/UserStoreValidator.ts

@@ -1,22 +0,0 @@
-import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
-import {rules, schema} from '@ioc:Adonis/Core/Validator'
-
-export default class UserStoreValidator {
-  constructor (private ctx: HttpContextContract) {
-  }
-
-  public schema = schema.create({
-    email: schema.string({ trim: true, escape: true }, [
-      rules.email(),
-      rules.required(),
-      rules.unique({table: 'users', column: 'email'})
-    ])
-  })
-
-  public cacheKey = this.ctx.routeKey
-
-  public messages = {
-    required: 'Le champ {{field}} doit être valide !',
-    'email.email': 'L\'adresse mail doit être valide !',
-  }
-}

app/Validators/users/UserUpdateValidator.ts

@@ -1,25 +0,0 @@
-import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
-import {rules, schema} from '@ioc:Adonis/Core/Validator'
-
-export default class UserUpdateValidator {
-  constructor (private ctx: HttpContextContract) {
-  }
-
-  public schema = schema.create({
-    email: schema.string.optional({trim: true, escape: true}, [rules.email(), rules.unique({
-      table: 'users', column: 'email'
-    })]),
-    password: schema.string.optional({trim: true, escape: true}, [rules.confirmed()]),
-    is_confirmed: schema.boolean.optional(),
-    confirmation_token: schema.string.optional({trim: true, escape: true}),
-    remember_me: schema.string.optional({trim: true, escape: true}),
-  })
-
-  public cacheKey = this.ctx.routeKey
-
-  public messages = {
-    required: 'Le champ {{field}} doit être valide !',
-    'email.email': 'L\'adresse mail doit être valide !',
-    'password.confirmation': 'Les mots de passe ne correspondent pas !'
-  }
-}