diff options
author | vantezzen <properly@protonmail.com> | 2019-09-05 11:22:49 +0200 |
---|---|---|
committer | vantezzen <properly@protonmail.com> | 2019-09-05 11:22:49 +0200 |
commit | 29b8334b060dc0c05a509d523ead4b3a30229fef (patch) | |
tree | 4dbfcfb90a3eff31acd219b27557bbdc594f589f /app/Models | |
parent | Add cookie notice to login page (diff) | |
download | ferdium-server-29b8334b060dc0c05a509d523ead4b3a30229fef.tar.gz ferdium-server-29b8334b060dc0c05a509d523ead4b3a30229fef.tar.zst ferdium-server-29b8334b060dc0c05a509d523ead4b3a30229fef.zip |
Add eslint
Diffstat (limited to 'app/Models')
-rw-r--r-- | app/Models/Recipe.js | 5 | ||||
-rw-r--r-- | app/Models/Service.js | 11 | ||||
-rw-r--r-- | app/Models/Token.js | 5 | ||||
-rw-r--r-- | app/Models/Traits/NoTimestamp.js | 9 | ||||
-rw-r--r-- | app/Models/User.js | 28 | ||||
-rw-r--r-- | app/Models/Workspace.js | 11 |
6 files changed, 32 insertions, 37 deletions
diff --git a/app/Models/Recipe.js b/app/Models/Recipe.js index 9e3619c..da3618b 100644 --- a/app/Models/Recipe.js +++ b/app/Models/Recipe.js | |||
@@ -1,9 +1,8 @@ | |||
1 | 'use strict' | ||
2 | 1 | ||
3 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ | 2 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ |
4 | const Model = use('Model') | 3 | const Model = use('Model'); |
5 | 4 | ||
6 | class Recipe extends Model { | 5 | class Recipe extends Model { |
7 | } | 6 | } |
8 | 7 | ||
9 | module.exports = Recipe | 8 | module.exports = Recipe; |
diff --git a/app/Models/Service.js b/app/Models/Service.js index 0ca72fd..0a13ec1 100644 --- a/app/Models/Service.js +++ b/app/Models/Service.js | |||
@@ -1,12 +1,11 @@ | |||
1 | 'use strict' | ||
2 | 1 | ||
3 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ | 2 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ |
4 | const Model = use('Model') | 3 | const Model = use('Model'); |
5 | 4 | ||
6 | class Service extends Model { | 5 | class Service extends Model { |
7 | user() { | 6 | user() { |
8 | return this.belongsTo('App/Models/User', 'userId', 'id') | 7 | return this.belongsTo('App/Models/User', 'userId', 'id'); |
9 | } | 8 | } |
10 | } | 9 | } |
11 | 10 | ||
12 | module.exports = Service | 11 | module.exports = Service; |
diff --git a/app/Models/Token.js b/app/Models/Token.js index e089e87..f6bec08 100644 --- a/app/Models/Token.js +++ b/app/Models/Token.js | |||
@@ -1,9 +1,8 @@ | |||
1 | 'use strict' | ||
2 | 1 | ||
3 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ | 2 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ |
4 | const Model = use('Model') | 3 | const Model = use('Model'); |
5 | 4 | ||
6 | class Token extends Model { | 5 | class Token extends Model { |
7 | } | 6 | } |
8 | 7 | ||
9 | module.exports = Token | 8 | module.exports = Token; |
diff --git a/app/Models/Traits/NoTimestamp.js b/app/Models/Traits/NoTimestamp.js index edd07f0..c647428 100644 --- a/app/Models/Traits/NoTimestamp.js +++ b/app/Models/Traits/NoTimestamp.js | |||
@@ -1,16 +1,15 @@ | |||
1 | 'use strict' | ||
2 | 1 | ||
3 | class NoTimestamp { | 2 | class NoTimestamp { |
4 | register (Model) { | 3 | register(Model) { |
5 | Object.defineProperties(Model, { | 4 | Object.defineProperties(Model, { |
6 | createdAtColumn: { | 5 | createdAtColumn: { |
7 | get: () => null, | 6 | get: () => null, |
8 | }, | 7 | }, |
9 | updatedAtColumn: { | 8 | updatedAtColumn: { |
10 | get: () => null, | 9 | get: () => null, |
11 | } | 10 | }, |
12 | }) | 11 | }); |
13 | } | 12 | } |
14 | } | 13 | } |
15 | 14 | ||
16 | module.exports = NoTimestamp | 15 | module.exports = NoTimestamp; |
diff --git a/app/Models/User.js b/app/Models/User.js index c9a680a..3a40347 100644 --- a/app/Models/User.js +++ b/app/Models/User.js | |||
@@ -1,14 +1,13 @@ | |||
1 | 'use strict' | ||
2 | 1 | ||
3 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ | 2 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ |
4 | const Model = use('Model') | 3 | const Model = use('Model'); |
5 | 4 | ||
6 | /** @type {import('@adonisjs/framework/src/Hash')} */ | 5 | /** @type {import('@adonisjs/framework/src/Hash')} */ |
7 | const Hash = use('Hash') | 6 | const Hash = use('Hash'); |
8 | 7 | ||
9 | class User extends Model { | 8 | class User extends Model { |
10 | static boot () { | 9 | static boot() { |
11 | super.boot() | 10 | super.boot(); |
12 | 11 | ||
13 | /** | 12 | /** |
14 | * A hook to hash the user password before saving | 13 | * A hook to hash the user password before saving |
@@ -16,9 +15,10 @@ class User extends Model { | |||
16 | */ | 15 | */ |
17 | this.addHook('beforeSave', async (userInstance) => { | 16 | this.addHook('beforeSave', async (userInstance) => { |
18 | if (userInstance.dirty.password) { | 17 | if (userInstance.dirty.password) { |
19 | userInstance.password = await Hash.make(userInstance.password) | 18 | // eslint-disable-next-line no-param-reassign |
19 | userInstance.password = await Hash.make(userInstance.password); | ||
20 | } | 20 | } |
21 | }) | 21 | }); |
22 | } | 22 | } |
23 | 23 | ||
24 | /** | 24 | /** |
@@ -31,17 +31,17 @@ class User extends Model { | |||
31 | * | 31 | * |
32 | * @return {Object} | 32 | * @return {Object} |
33 | */ | 33 | */ |
34 | tokens () { | 34 | tokens() { |
35 | return this.hasMany('App/Models/Token') | 35 | return this.hasMany('App/Models/Token'); |
36 | } | 36 | } |
37 | 37 | ||
38 | services () { | 38 | services() { |
39 | return this.hasMany('App/Models/Service', 'id', 'userId') | 39 | return this.hasMany('App/Models/Service', 'id', 'userId'); |
40 | } | 40 | } |
41 | 41 | ||
42 | workspaces () { | 42 | workspaces() { |
43 | return this.hasMany('App/Models/Workspace', 'id', 'userId') | 43 | return this.hasMany('App/Models/Workspace', 'id', 'userId'); |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | module.exports = User | 47 | module.exports = User; |
diff --git a/app/Models/Workspace.js b/app/Models/Workspace.js index f78a3f9..b155e09 100644 --- a/app/Models/Workspace.js +++ b/app/Models/Workspace.js | |||
@@ -1,12 +1,11 @@ | |||
1 | 'use strict' | ||
2 | 1 | ||
3 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ | 2 | /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */ |
4 | const Model = use('Model') | 3 | const Model = use('Model'); |
5 | 4 | ||
6 | class Workspace extends Model { | 5 | class Workspace extends Model { |
7 | user() { | 6 | user() { |
8 | return this.belongsTo('App/Models/User', 'userId', 'id') | 7 | return this.belongsTo('App/Models/User', 'userId', 'id'); |
9 | } | 8 | } |
10 | } | 9 | } |
11 | 10 | ||
12 | module.exports = Workspace | 11 | module.exports = Workspace; |