updated node npm installation

build/build.js

@@ -9,7 +9,6 @@ var path = require('path')
 var chalk = require('chalk')
 var webpack = require('webpack')
 var config = require('../config')
-const workboxBuild = require('workbox-build');
 var webpackConfig = require('./webpack.prod.conf')
 
 var spinner = ora('building for production...')
@@ -38,18 +37,7 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
       '  Tip: built files are meant to be served over an HTTP server.\n' +
       '  Opening index.html over file:// won\'t work.\n'
     ))
-	
+
   })
 })
 
-    // NOTE: This should be run *AFTER* all your assets are built
-    const buildSW = () => {
-  // This will return a Promise
-    return workboxBuild.generateSW({
-    globDirectory: '../dist',
-    globPatterns: [
-      '**\/*.{html,json,js,css}',
-    ],
-    swDest: '../dist/sw.js',
-  });
-}

build/webpack.base.conf.js

@@ -36,7 +36,7 @@ module.exports = {
           formatter: require('eslint-friendly-formatter')
         }
       },
-      
+
       {
         test: /\.vue$/,
         loader: 'vue-loader',
@@ -45,6 +45,7 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
+        exclude: /node_modules/,
         include: [resolve('src'), resolve('test')]
       },
       {

build/webpack.prod.conf.js

@@ -8,7 +8,6 @@ var CopyWebpackPlugin = require('copy-webpack-plugin')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
-const {GenerateSW} = require('workbox-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
 
 var env = process.env.NODE_ENV === 'testing'
@@ -116,13 +115,13 @@ var webpackConfig = merge(baseWebpackConfig, {
     ]),
 
 //service worker
-    new GenerateSW({
-        clientsClaim: true,
-        skipWaiting: true,
-      })
+//    new GenerateSW({
+//        clientsClaim: true,
+//        skipWaiting: true,
+//      })
   ] //plugins end
 })
-    
+
 
 
 

config/dev.env.js

@@ -3,5 +3,6 @@ var prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
+  CLIENT_ENV: '"development"',
   CERTIFY_NODE_URL: '"http://localhost:8550"'
 })

config/prod.env.js

@@ -1,3 +1,4 @@
 module.exports = {
+  CLIENT_ENV: '"production"',
   NODE_ENV: '"production"'
 }

controllers/certifyController.js

@@ -11,9 +11,9 @@ const fileContents = fs.readFileSync(
 module.exports = {
   certifyData: {
     post: async (req, res, next) => {
-      const checksum = req.body.certifyVariables.checksum
-      const authorName = req.body.certifyVariables.authorName
-      const timestampString = req.body.certifyVariables.timestampString
+      const checksum = req.body.metadataVariables.checksum
+      const authorName = req.body.metadataVariables.authorName
+      const timestampString = req.body.metadataVariables.timestampString
 
       console.log(checksum)
       console.log(authorName)

deploymentDev.sh

@@ -10,7 +10,7 @@ set -u
 
 # The remote server we are copying the files using ssh + public key authentication.
 # Specify this in .ssh/config
-REMOTE=ethereum
+REMOTE=bloxberg
 
 # Build dist folder using webpack
 #npm run build

deploymentQA.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# To deploy:  'bash deploymentScript.sh'
+
+# A simple static HTML + JS deployment script that handles Nginx www-data user correclty.
+# Works e.g. Ubuntu Linux Azure and Amazon EC2 Ubuntu server out of the box.
+#
+set -e
+set -u
+
+# The remote server we are copying the files using ssh + public key authentication.
+# Specify this in .ssh/config
+REMOTE=bloxberg-qa
+
+# Build dist folder using webpack
+#npm run build
+
+# Copy local dist folder to the remote server Nginx folder over sudoed
+# Assum the default user specified in .ssh/config has passwordless sudo
+# https://crashingdaily.wordpress.com/2007/06/29/rsync-and-sudo-over-ssh/
+rsync -r --rsync-path="sudo rsync" dist/* $REMOTE:/srv/bloxbergcertifyapp/dist

dist/index.html

@@ -1,17 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,minimal-ui"><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link rel=stylesheet href=https://use.fontawesome.com/releases/v5.2.0/css/all.css integrity=sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ crossorigin=anonymous><link href=https://unpkg.com/aos@next/dist/aos.css rel=stylesheet><link rel=stylesheet href=https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css><link rel=apple-touch-icon sizes=57x57 href=/apple-icon-57x57.png><link rel=apple-touch-icon sizes=60x60 href=/apple-icon-60x60.png><link rel=apple-touch-icon sizes=72x72 href=/apple-icon-72x72.png><link rel=apple-touch-icon sizes=76x76 href=/apple-icon-76x76.png><link rel=apple-touch-icon sizes=114x114 href=/apple-icon-114x114.png><link rel=apple-touch-icon sizes=120x120 href=/apple-icon-120x120.png><link rel=apple-touch-icon sizes=144x144 href=/apple-icon-144x144.png><link rel=apple-touch-icon sizes=152x152 href=/apple-icon-152x152.png><link rel=apple-touch-icon sizes=180x180 href=/apple-icon-180x180.png><link rel=icon type=image/png sizes=192x192 href=/android-icon-192x192.png><link rel=icon type=image/png sizes=32x32 href=/favicon-32x32.png><link rel=icon type=image/png sizes=96x96 href=/favicon-96x96.png><link rel=icon type=image/png sizes=16x16 href=/favicon-16x16.png><link rel=manifest href=/manifest.json><meta name=msapplication-TileColor content=#ffffff><meta name=msapplication-TileImage content=/ms-icon-144x144.png><meta name=theme-color content=#ffffff><meta name=title content=Bloxberg><meta name=Description content="The bloxberg infrastructure is a secure global blockchain established by a consortium of leading research organizations to provide scientists with decentralized services worldwide. The bloxberg Consortium aims to fosters collaboration among the global scientific community, empowering researchers with robust, autonomous services that transcend institutional boundaries."><meta name=Keywords content="bloxberg, blockchain, science, research, consortium,"><title>Bloxberg</title><link href=/static/css/app.fb07a4749db90ef42ab28a22ab8e8a8a.css rel=stylesheet></head><body><div id=app></div><script type=module>import { Workbox } from 'https://storage.googleapis.com/workbox-cdn/releases/4.1.0/workbox-window.prod.mjs';
-
-            if ('serviceWorker' in navigator) {
-              const wb = new Workbox('/service-worker.js')
-              wb.addEventListener('installed', event => {
-                if (event.isUpdate) {
-                   if (confirm(`New content is available!. Click OK to refresh`)) {
-                     window.location.reload();
-                   }			
-                }
-              });
-
-              wb.register();
-            }
-            //if (confirm(`New content is available!. Click OK to refresh`)) {
-            //  window.location.reload();
-            //}</script><script src=https://unpkg.com/aos@next/dist/aos.js></script><script>AOS.init()</script><script type=text/javascript src=/static/js/manifest.1e70c98b2cbab461ef80.js></script><script type=text/javascript src=/static/js/vendor.436df0d8526e60f4c7c2.js></script><script type=text/javascript src=/static/js/app.dcf056ad66296643c4e8.js></script></body></html>
+<!DOCTYPE html><html><blockcertsverifier display-mode=card></blockcertsverifier><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,minimal-ui"><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel=stylesheet><link rel=stylesheet href=https://use.fontawesome.com/releases/v5.2.0/css/all.css integrity=sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ crossorigin=anonymous><link rel=apple-touch-icon sizes=57x57 href=/apple-icon-57x57.png><link rel=apple-touch-icon sizes=60x60 href=/apple-icon-60x60.png><link rel=apple-touch-icon sizes=72x72 href=/apple-icon-72x72.png><link rel=apple-touch-icon sizes=76x76 href=/apple-icon-76x76.png><link rel=apple-touch-icon sizes=114x114 href=/apple-icon-114x114.png><link rel=apple-touch-icon sizes=120x120 href=/apple-icon-120x120.png><link rel=apple-touch-icon sizes=144x144 href=/apple-icon-144x144.png><link rel=apple-touch-icon sizes=152x152 href=/apple-icon-152x152.png><link rel=apple-touch-icon sizes=180x180 href=/apple-icon-180x180.png><link rel=icon type=image/png sizes=192x192 href=/android-icon-192x192.png><link rel=icon type=image/png sizes=32x32 href=/favicon-32x32.png><link rel=icon type=image/png sizes=96x96 href=/favicon-96x96.png><link rel=icon type=image/png sizes=16x16 href=/favicon-16x16.png><link rel=manifest href=/manifest.json><meta name=msapplication-TileColor content=#ffffff><meta name=msapplication-TileImage content=/ms-icon-144x144.png><meta name=theme-color content=#ffffff><meta name=title content=Bloxberg><meta name=Description content="The bloxberg infrastructure is a secure global blockchain established by a consortium of leading research organizations to provide scientists with decentralized services worldwide. The bloxberg Consortium aims to fosters collaboration among the global scientific community, empowering researchers with robust, autonomous services that transcend institutional boundaries."><meta name=Keywords content="bloxberg, blockchain, science, research, consortium,"><title>Bloxberg</title><link href=/static/css/app.bf71827c9dcdc6d96ad90b2a240c8eb2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.c6324d1571fd5d0d4e88.js></script><script type=text/javascript src=/static/js/vendor.6a50cad3d93b17a0dddf.js></script><script type=text/javascript src=/static/js/app.0d81e35bf7800c13b9f8.js></script></body></html>