From 16b6d82df33c0fe73f640c913e9046835c042676 Mon Sep 17 00:00:00 2001 From: Joe Fitter Date: Thu, 6 Dec 2018 09:39:58 +0000 Subject: [PATCH] updated service and pages, use exported routers --- lib/app.js | 4 ++-- package-lock.json | 38 +++++++++++++++---------------- package.json | 4 ++-- pages/dashboard/index.js | 2 +- pages/establishment-list/index.js | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/app.js b/lib/app.js index d5a3cd1c..d8b5b206 100644 --- a/lib/app.js +++ b/lib/app.js @@ -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 { @@ -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) { diff --git a/package-lock.json b/package-lock.json index 498284eb..86420b65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,14 +31,14 @@ "integrity": "sha1-oaK4axlNOaArI0+RblmPPwsMeG0=" }, "@asl/pages": { - "version": "14.9.0", - "resolved": "https://artifactory.digital.homeoffice.gov.uk/artifactory/api/npm/npm-virtual/@asl/pages/-/@asl/pages-14.9.0.tgz", - "integrity": "sha1-Eop8vmuqaSySrnfiBQRP+weVahU=", + "version": "14.10.0", + "resolved": "https://artifactory.digital.homeoffice.gov.uk/artifactory/api/npm/npm-virtual/@asl/pages/-/@asl/pages-14.10.0.tgz", + "integrity": "sha1-uCWkGvmtOpU2N1ePvnCc+vBfXVY=", "requires": { - "@asl/components": "^2.3.1", + "@asl/components": "^2.3.2", "@asl/constants": "^0.3.1", "@asl/dictionary": "^1.1.1", - "@asl/service": "^6.12.0", + "@asl/service": "^6.14.2", "@ukhomeoffice/frontend-toolkit": "^2.3.0", "@ukhomeoffice/react-components": "^0.5.1", "babel-plugin-transform-object-rest-spread": "^6.26.0", @@ -69,9 +69,9 @@ }, "dependencies": { "@asl/components": { - "version": "2.3.1", - "resolved": "https://artifactory.digital.homeoffice.gov.uk/artifactory/api/npm/npm-virtual/@asl/components/-/@asl/components-2.3.1.tgz", - "integrity": "sha1-H/HVv6eGsHkQu7ABkCg5JCI5ZrY=", + "version": "2.3.2", + "resolved": "https://artifactory.digital.homeoffice.gov.uk/artifactory/api/npm/npm-virtual/@asl/components/-/@asl/components-2.3.2.tgz", + "integrity": "sha1-rYNZPnx0irL1n3DCqQd9SOPiyeY=", "requires": { "@asl/dictionary": "^1.1.1", "@ukhomeoffice/react-components": "^0.4.0", @@ -152,11 +152,11 @@ } }, "@asl/service": { - "version": "6.13.0", - "resolved": "https://artifactory.digital.homeoffice.gov.uk/artifactory/api/npm/npm-virtual/@asl/service/-/@asl/service-6.13.0.tgz", - "integrity": "sha1-xFyAKldWIgYf/MlvjMppE/XmJt4=", + "version": "6.14.2", + "resolved": "https://artifactory.digital.homeoffice.gov.uk/artifactory/api/npm/npm-virtual/@asl/service/-/@asl/service-6.14.2.tgz", + "integrity": "sha1-lOvHeiOTeLu8vdPkqrctIc3KnbY=", "requires": { - "@asl/components": "^1.3.0", + "@asl/components": "^2.3.2", "@lennym/redis-session": "^1.0.4", "@ukhomeoffice/frontend-toolkit": "^2.1.2", "babel-plugin-transform-object-rest-spread": "^6.26.0", @@ -167,6 +167,7 @@ "express": "^4.16.2", "express-react-views": "^0.10.5", "express-session": "^1.15.6", + "find-root": "^1.1.0", "glob": "^7.1.2", "helmet": "^3.12.1", "helmet-csp": "^2.7.0", @@ -189,16 +190,15 @@ }, "dependencies": { "@asl/components": { - "version": "1.6.0", - "resolved": "https://artifactory.digital.homeoffice.gov.uk/artifactory/api/npm/npm-virtual/@asl/components/-/@asl/components-1.6.0.tgz", - "integrity": "sha1-FEtaX+iN7kuAFgGTeuZgexHgM2g=", + "version": "2.3.2", + "resolved": "https://artifactory.digital.homeoffice.gov.uk/artifactory/api/npm/npm-virtual/@asl/components/-/@asl/components-2.3.2.tgz", + "integrity": "sha1-rYNZPnx0irL1n3DCqQd9SOPiyeY=", "requires": { "@asl/dictionary": "^1.1.1", "@ukhomeoffice/react-components": "^0.4.0", "classnames": "^2.2.6", "date-fns": "^1.29.0", "mustache": "^3.0.0", - "r2": "^2.0.1", "react-addons-css-transition-group": "^15.6.2", "react-markdown": "^4.0.3", "react-redux": "^5.1.0", @@ -6322,9 +6322,9 @@ "dev": true }, "keycloak-connect": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/keycloak-connect/-/keycloak-connect-4.6.0.tgz", - "integrity": "sha512-3Q6cEct0u/Rjt86TuXvcmuaFNT6STzoPhZ4FWqWqRw7NJqrPOPTWhXyCVrx75nQwUtmX4wST6/Yw1QtfMeeHew==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/keycloak-connect/-/keycloak-connect-4.7.0.tgz", + "integrity": "sha512-cZ9uuOLQgfJxZZVhWT8vNmatcVNUc1hcLQzXV3iFwR5SoT0ekFvcJV4TFkGtbooCta6amVATuHDdPvNFuk9Lzg==", "requires": { "jwk-to-pem": "^2.0.0" } diff --git a/package.json b/package.json index df34cc4c..7ceb10c0 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/pages/dashboard/index.js b/pages/dashboard/index.js index ad5b6e57..5857e731 100644 --- a/pages/dashboard/index.js +++ b/pages/dashboard/index.js @@ -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 => { diff --git a/pages/establishment-list/index.js b/pages/establishment-list/index.js index b6d2f0cc..deb80205 100644 --- a/pages/establishment-list/index.js +++ b/pages/establishment-list/index.js @@ -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');