Skip to content

Commit

Permalink
Merge pull request #37 from UKHomeOffice/chore/use-new-service
Browse files Browse the repository at this point in the history
updated service and pages, use exported routers
  • Loading branch information
lennym authored Dec 6, 2018
2 parents cf01987 + 16b6d82 commit 219c900
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions lib/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ui = require('@asl/service/ui');
const { router } = require('@asl/service/ui');
const { NotAuthorisedError } = require('./errors');
const { pages, content, views } = require('@asl/pages');
const {
Expand All @@ -16,7 +16,7 @@ const establishmentList = require('../pages/establishment-list');
const urls = require('./urls');

module.exports = settings => {
const app = ui({ ...settings, views, urls });
const app = router({ ...settings, views, urls });

app.use((req, res, next) => {
if (!req.user || !req.user.profile || !req.user.profile.asruUser) {
Expand Down
38 changes: 19 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"homepage": "https://github.com/UKHomeOffice/asl-inspector-ui#readme",
"dependencies": {
"@asl/components": "^2.3.1",
"@asl/pages": "^14.9.0",
"@asl/service": "^6.13.0",
"@asl/pages": "^14.10.0",
"@asl/service": "^6.14.2",
"lodash": "^4.17.10"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion pages/dashboard/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { page } = require('@asl/pages');
const { page } = require('@asl/service/ui');
const taskList = require('@asl/pages/pages/task/list/router');

module.exports = settings => {
Expand Down
2 changes: 1 addition & 1 deletion pages/establishment-list/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const page = require('@asl/pages/lib/page');
const { page } = require('@asl/service/ui');
const datatable = require('@asl/pages/pages/common/routers/datatable');

const schema = require('./schema');
Expand Down

0 comments on commit 219c900

Please sign in to comment.