Adding moj design system (#20)

ministryofjustice · Mar 17, 2021 · 716fdfb · 716fdfb
1 parent db09442
commit 716fdfb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 4 deletions.
diff --git a/assets/sass/application.sass b/assets/sass/application.sass
@@ -2,6 +2,7 @@ $govuk-global-styles: true
 $path: "/assets/images/"
 
 @import 'govuk/all'
+@import 'moj/all'
 
 @import './components/header-bar'
 @import './local'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "postinstall": "husky install",
     "copy-views": "cp -R server/views dist/server/",
-    "compile-sass": "sass --no-source-map --load-path=node_modules/govuk-frontend ./assets/sass/application.sass:./assets/stylesheets/application.css ./assets/sass/application-ie8.sass:./assets/stylesheets/application-ie8.css --style compressed",
+    "compile-sass": "sass --no-source-map --load-path=node_modules/govuk-frontend --load-path=node_modules/@ministryofjustice/frontend ./assets/sass/application.sass:./assets/stylesheets/application.css ./assets/sass/application-ie8.sass:./assets/stylesheets/application-ie8.css --style compressed",
     "watch-ts": "tsc -w",
     "watch-views": "nodemon --watch server/views -e html,njk -x npm run copy-views",
     "watch-node": "DEBUG=gov-starter-server* nodemon --watch dist/ dist/server.js | bunyan -o short",
@@ -84,6 +84,7 @@
     ]
   },
   "dependencies": {
+    "@ministryofjustice/frontend": "^0.2.1",
     "agentkeepalive": "^4.1.4",
     "applicationinsights": "^1.8.10",
     "body-parser": "^1.19.0",

diff --git a/server/app.ts b/server/app.ts
@@ -117,6 +117,8 @@ export default function createApp(userService: UserService): express.Application
     '/assets/js',
     '/node_modules/govuk-frontend/govuk/assets',
     '/node_modules/govuk-frontend',
+    '/node_modules/@ministryofjustice/frontend/moj/assets',
+    '/node_modules/@ministryofjustice/frontend',
     '/node_modules/jquery/dist',
   ].forEach(dir => {
     app.use('/assets', express.static(path.join(process.cwd(), dir), cacheControl))

diff --git a/server/utils/nunjucksSetup.ts b/server/utils/nunjucksSetup.ts
@@ -8,6 +8,8 @@ export default function nunjucksSetup(app: express.Application, path: pathModule
       path.join(__dirname, '../../server/views'),
       'node_modules/govuk-frontend/',
       'node_modules/govuk-frontend/components/',
+      'node_modules/@ministryofjustice/frontend/',
+      'node_modules/@ministryofjustice/frontend/moj/components/',
     ],
     {
       autoescape: true,

diff --git a/server/views/partials/layout.njk b/server/views/partials/layout.njk
@@ -33,4 +33,5 @@
   <body>, to avoid blocking the initial render. #}
   <script src="/assets/govuk/all.js"></script>
   <script src="/assets/govukFrontendInit.js"></script>
+  <script src="/assets/moj/all.js"></script>
 {% endblock %}