Merge branch 'chore/dep-update' into develop

Author: J4Numbers

.eslintignore

@@ -1,3 +1,6 @@
+bin/
+config/local*
+data/
 public/
 src/gql
 src/js/

.eslintrc.js

@@ -1,5 +1,7 @@
+const baseConfig = require('@j4numbers/eslint-base-config');
+
 module.exports = {
-  ...require('@j4numbers/eslint-base-config'),
+  ...baseConfig,
 
   env: {
     'es6': true,

.npmignore

@@ -0,0 +1,11 @@
+.idea
+.nyc_output
+coverage
+data
+test
+
+*eslint*
+.dockerignore
+docker-compose.yml
+*Dockerfile
+nyc*

.nycrc

@@ -13,7 +13,6 @@ RUN npm i --only=production
 # Stage 3 - package files
 FROM node:12-alpine AS package
 WORKDIR /opt/web/app
-COPY --from=compile         /opt/web/app/bin                                        ./bin
 COPY --from=compile         /opt/web/app/config/default.js                          ./config/
 COPY --from=compile         /opt/web/app/config/custom-environment-variables.json   ./config/
 COPY --from=compile         /opt/web/app/src                                        ./src

Dockerfile

@@ -28,8 +28,8 @@ module.exports = {
     port:     '8080',
   },
   jwt: {
-    public_cert: 'test/spec/helpers/certs/localhost-cert.pem',
-    private_key: 'test/spec/helpers/certs/localhost-privkey.pem',
+    public_cert: 'certs/localhost-cert.pem',
+    private_key: 'certs/localhost-privkey.pem',
   },
   nunjucks: {
     options: {

bin/mongo_runner.js

@@ -1,7 +1,7 @@
 version: '3'
 services:
   mongodb:
-    image: mongo
+    image: mongo:5.0
     command: mongod
     ports:
       - "27017:27017"
@@ -17,7 +17,7 @@ services:
       dockerfile: Dockerfile
       context: ./
     volumes:
-      - "./test/spec/helpers/certs:/etc/ssl/"
+      - "./certs:/etc/ssl/"
     environment:
       APP_NAME: "j4numbers"
       APP_HOSTNAME: "localhost"

test/spec/helpers/certs/.gitignore renamed to certs/.gitignore

@@ -1,6 +1,7 @@
 const gulp = require('gulp');
 const npath = require('path');
-const sass = require('gulp-sass');
+const sassCompiler = require('sass');
+const sass = require('gulp-sass')(sassCompiler);
 const babel = require('gulp-babel');
 const clean = require('gulp-clean');
 
@@ -17,7 +18,7 @@ gulp.task('clean', () => gulp.src(
   {
     read:       false,
     allowEmpty: true,
-  }
+  },
 ).pipe(clean()));
 
 /* --------------------------------------------------------------------- INFO */
@@ -42,7 +43,6 @@ gulp.task('sass', () => gulp
     indentedSyntax:  false,
     includePaths:    [
       'node_modules/bootstrap/scss/*.scss',
-      'node_modules/font-awesome/scss/*.scss',
     ],
   }).on('error', sass.logError))
   .pipe(gulp.dest('./public/stylesheets')));
@@ -68,14 +68,14 @@ gulp.task('copy-scripts', () => gulp
 gulp.task('copy-images', () => gulp
   .src([
     './src/images/**/*.{png,ico,gif,jpg,svg}',
+    './node_modules/bootstrap-icons/*.svg',
   ])
   .pipe(gulp.dest('./public/images')));
 
 // Copies fonts to public folder
 gulp.task('copy-fonts', () => gulp
   .src([
     './src/fonts/*.{woff,woff2}',
-    './node_modules/font-awesome/fonts/*.{otf,eot,svg,ttf,woff,woff2}',
   ])
   .pipe(gulp.dest('./public/fonts')));