update version and align with stable develop

CCALI · Jun 29, 2022 · 30d9426 · 30d9426
2 parents 237c780 + 95cc26d
commit 30d9426
Show file tree

Hide file tree

Showing 35 changed files with 1,549 additions and 228 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v12
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "a2jdat",
-  "version": "8.0.0",
+  "version": "9.0.0",
   "description": "Authoring and viewer App GUI.",
   "license": "GNU AGPL v3.0",
   "author": {
@@ -191,6 +191,6 @@
     ]
   },
   "volta": {
-    "node": "16.14.2"
+    "node": "16.14.1"
   }
 }
diff --git a/pdf/assets/checkmark-font-demo/index.html b/pdf/assets/checkmark-font-demo/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html lang="en">
 <head>
     <meta charset="utf-8">
     <title>IcoMoon Demo</title>

diff --git a/server.js b/server.js
@@ -37,7 +37,7 @@ const AppViewModel = CanMap.extend('ServerAppViewModel', {
 
     title: {
       serialize: false,
-      value: 'A2J Test Assemble'
+      value: 'A2J document preview'
     }
   }
 })

diff --git a/server.stache b/server.stache
@@ -1,4 +1,4 @@
-<html>
+<html lang="en">
   <head>
     <meta charset="UTF-8" />
     <title>{{title}}</title>
@@ -11,6 +11,7 @@
     <a2j-template-ssr
       answers:from="request.body.answers"
       guideId:from="request.body.guideId"
+      renderTemplateFootersAndHeaders:from="request.body.renderTemplateFootersAndHeaders"
       templateId:from="request.body.templateId"
       templateIds:from="request.body.templateIds"
       fileDataUrl:from="request.body.fileDataUrl"

diff --git a/src/app.js b/src/app.js
@@ -8,6 +8,7 @@ const rest = require('feathers-rest')
 const bodyParser = require('body-parser')
 const cookieParser = require('cookie-parser')
 const assemble = require('./routes/assemble')
+const preview = require('./routes/preview')
 const templates = require('./routes/templates')
 const topicsResourcesResources = require('./routes/topics-resources-resources')
 const topicsResourcesTopics = require('./routes/topics-resources-topics')
@@ -26,6 +27,7 @@ app.configure(rest())
   .use(cookieParser())
   .use('/', feathers.static(path.join(__dirname, '..')))
   .use('/api/assemble', assemble)
+  .use('/api/preview', preview)
   .use('/api/template', forwardCookies, template)
   .use('/api/templates', forwardCookies, templates)
   .use('/api/topics-resources/resources', topicsResourcesResources)

diff --git a/src/pdf/not-found.js b/src/pdf/not-found.js
@@ -1,5 +1,5 @@
 module.exports = `<!doctype html>
-<html>
+<html lang="en">
   <head>
     <style>
       body {