Skip to content

Commit 7c24405

Browse files
abhishek97abhishek97
authored
Merge pull request #16 from Manit1/ft-1
using codingblocks express jsonapi controller
2 parents 6f5e0ff + a8657ba commit 7c24405

File tree

8 files changed

+54
-220
lines changed

8 files changed

+54
-220
lines changed

‎framework/Controller.class.js

-213
This file was deleted.

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"sq": "./node_modules/.bin/sequelize"
88
},
99
"dependencies": {
10+
"@coding-blocks/express-jsonapi-controller": "^1.0.0",
1011
"body-parser": "^1.18.3",
1112
"connect-ensure-login": "^0.1.1",
1213
"cookie-parser": "^1.4.3",

‎routes/api/choices/index.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
const BaseController = require('../../../framework/Controller.class')
1+
const { Controller: BaseController } = require('@coding-blocks/express-jsonapi-controller')
22
const Router = require('express').Router()
33
const DB = require('../../../models')
44
const passport = require('../../../passport/index')
55

66
const { adminOnly } = require('../../../passport/middlewares')
7+
const serializer = require('../../../framework/serializers/choices')
78

8-
const controller = new BaseController(DB.choices)
9+
const controller = new BaseController(DB.choices, DB, serializer)
910

1011
Router.use(passport.authenticate('bearer', {session: false}), adminOnly)
1112
Router.get('/', controller.handleQuery)

‎routes/api/questions/controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const BaseController = require('../../../framework/Controller.class')
1+
const { Controller: BaseController } = require('@coding-blocks/express-jsonapi-controller')
22
const DB = require('../../../models')
33
const U = require('../../../utils')
44

‎routes/api/questions/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ const DB = require('../../../models')
44
const passport = require('../../../passport/index')
55

66
const { adminOnly } = require('../../../passport/middlewares')
7+
const serializer = require('../../../framework/serializers/questions')
78

8-
const controller = new BaseController(DB.questions)
9+
const controller = new BaseController(DB.questions, DB, serializer)
910

1011
Router.use(passport.authenticate('bearer', {session: false}), adminOnly)
1112

‎routes/api/quiz/controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const BaseController = require('../../../framework/Controller.class')
1+
const { Controller: BaseController } = require('@coding-blocks/express-jsonapi-controller')
22
const DB = require('../../../models')
33
const U = require('../../../utils')
44
const R = require('ramda')

‎routes/api/quiz/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ const DB = require('../../../models')
44

55
const passport = require('../../../passport/index')
66
const { adminOnly } = require('../../../passport/middlewares')
7+
const serializer = require('../../../framework/serializers/quizzes')
78

8-
const controller = new BaseController(DB.quizzes)
9+
const controller = new BaseController(DB.quizzes, DB, serializer)
910

1011
routes.use(passport.authenticate('bearer', {session: false}), adminOnly)
1112

‎yarn.lock

+44-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
# yarn lockfile v1
33

44

5+
"@coding-blocks/express-jsonapi-controller@^1.0.0":
6+
version "1.0.0"
7+
resolved "https://registry.yarnpkg.com/@coding-blocks/express-jsonapi-controller/-/express-jsonapi-controller-1.0.0.tgz#fabf234a753a9af82f98c1525d0a806a00fe1b7d"
8+
integrity sha512-cT0qxCABWutdqsyo9Uc8xsPtFeZe9VSJLLb7XMI54qc2Pu8I5ryNab5+epDxtydYP2kC2dS1UkA33vqdSoOjHA==
9+
dependencies:
10+
assert "^1.4.1"
11+
i "^0.3.6"
12+
jsonapi-serializer "^3.6.4"
13+
ramda "^0.26.1"
14+
515
"@newrelic/koa@^1.0.0":
616
version "1.0.5"
717
resolved "https://registry.yarnpkg.com/@newrelic/koa/-/koa-1.0.5.tgz#76ca506c956b6f6599d866a7a725b573fde2fe1a"
@@ -59,6 +69,14 @@ [email protected]:
5969
version "1.1.1"
6070
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
6171

72+
assert@^1.4.1:
73+
version "1.5.0"
74+
resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
75+
integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
76+
dependencies:
77+
object-assign "^4.1.1"
78+
util "0.10.3"
79+
6280
async@^2.1.4:
6381
version "2.6.1"
6482
resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
@@ -564,6 +582,11 @@ [email protected]:
564582
version "1.12.0"
565583
resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
566584

585+
[email protected]:
586+
version "2.0.1"
587+
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
588+
integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
589+
567590
[email protected], inherits@^2.0.3, inherits@~2.0.3:
568591
version "2.0.3"
569592
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
@@ -648,6 +671,14 @@ jsonapi-serializer@^3.5.6:
648671
inflected "^1.1.6"
649672
lodash "^4.16.3"
650673

674+
jsonapi-serializer@^3.6.4:
675+
version "3.6.4"
676+
resolved "https://registry.yarnpkg.com/jsonapi-serializer/-/jsonapi-serializer-3.6.4.tgz#70b61c2eb6e9366e1b49cf18a01fd4a04473791e"
677+
integrity sha512-n0FVi4Cs7Gzk6dH9kn+8to7yGYhVpdsFRtMHi3SaC80EWap2wjCcXPioSlq0hnqzdEFXtay0hRR4yRqXkLTJSA==
678+
dependencies:
679+
inflected "^1.1.6"
680+
lodash "^4.16.3"
681+
651682
jsonfile@^4.0.0:
652683
version "4.0.0"
653684
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -850,7 +881,7 @@ [email protected]:
850881
version "0.9.15"
851882
resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
852883

853-
object-assign@^4:
884+
object-assign@^4, object-assign@^4.1.1:
854885
version "4.1.1"
855886
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
856887

@@ -1054,6 +1085,11 @@ ramda@^0.25.0:
10541085
version "0.25.0"
10551086
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.25.0.tgz#8fdf68231cffa90bc2f9460390a0cb74a29b29a9"
10561087

1088+
ramda@^0.26.1:
1089+
version "0.26.1"
1090+
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
1091+
integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
1092+
10571093
random-bytes@~1.0.0:
10581094
version "1.0.0"
10591095
resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
@@ -1417,6 +1453,13 @@ util-deprecate@~1.0.1:
14171453
version "1.0.2"
14181454
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
14191455

1456+
[email protected]:
1457+
version "0.10.3"
1458+
resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
1459+
integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
1460+
dependencies:
1461+
inherits "2.0.1"
1462+
14201463
util@^0.10.3:
14211464
version "0.10.4"
14221465
resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"

0 commit comments

Comments
 (0)