From 37cc1a5bcc7e15a6c7611b6714fb46153b68e0e0 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 12:56:48 +0100
Subject: [PATCH 001/196] updated composer to make plugin installable via
 composer. Set namespace to CreativeCommons_TOT with src folder as the source
 folder to the plugin codebase susing autoload psr-4.

---
 composer.json | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 646346c..98f9e51 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,11 @@
 {
     "name": "creativecommons/termination-of-transfer",
-    "require": {
-        "mpdf/mpdf": "^6.0",
-        "smarty/smarty": "^3.1"
+    "type": "wordpress-plugin",
+    "description": "Termination of Transfer tool",
+    "keywords": ["WordPress", "plugins", "termination", "contract", "creativecommons", "php"],
+    "support": {
+        "issues": "https://github.com/creativecommons/termination-of-transfer/issues?state=open",
+        "source": "https://github.com/creativecommons/termination-of-transfer"
     },
     "license": "GNU AGPL v3+",
     "authors": [
@@ -10,5 +13,27 @@
             "name": "Rob Myers",
             "email": "rob@robmyers.org"
         }
+    ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "require": {
+        "php": ">=5.4",
+        "mpdf/mpdf": "^6.0",
+        "smarty/smarty": "^3.1"
+    },
+    "config": {
+        "process-timeout": 1800,
+        "fxp-asset": {
+            "enabled": false
+        }
+    },
+    "autoload": {
+        "psr-4": {"CreativeCommons_TOT\\": "src"}
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
     ]
 }

From 618c9335fd9899e63a611b266677429aab7844e1 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 13:08:26 +0100
Subject: [PATCH 002/196] created the plugin entry script as per WordPress
 plugin standard

---
 termination-of-contract.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 termination-of-contract.php

diff --git a/termination-of-contract.php b/termination-of-contract.php
new file mode 100644
index 0000000..e69de29

From 61fbe74e05b1b32f2e7b220046ee2dd972b368b1 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 13:16:09 +0100
Subject: [PATCH 003/196] added license and header comments requirements to
 entry script as per WordPress plugin requirement

---
 composer.json               |  2 +-
 termination-of-contract.php | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 98f9e51..4f42970 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=5.4",
+        "php": ">=7.4",
         "mpdf/mpdf": "^6.0",
         "smarty/smarty": "^3.1"
     },
diff --git a/termination-of-contract.php b/termination-of-contract.php
index e69de29..4bf2421 100644
--- a/termination-of-contract.php
+++ b/termination-of-contract.php
@@ -0,0 +1,29 @@
+<?php
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016, 2017  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+/*
+Plugin Name: Termination of Tranfer Tool
+Plugin URI: https://github.com/creativecommons/termination-of-transfer
+Version: 1.0.0
+Author: Creative Commons Corporation
+Author URI: https://github.com/creativecommons/
+Requires PHP: 7.4.0
+*/
+?>

From 5e9314288faa137a02b537317b4368f7e0359635 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 13:17:50 +0100
Subject: [PATCH 004/196] changed minimum PHP Version to 5.4 in composer and
 header requirements

---
 composer.json               | 2 +-
 termination-of-contract.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 4f42970..98f9e51 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.4",
+        "php": ">=5.4",
         "mpdf/mpdf": "^6.0",
         "smarty/smarty": "^3.1"
     },
diff --git a/termination-of-contract.php b/termination-of-contract.php
index 4bf2421..2037fef 100644
--- a/termination-of-contract.php
+++ b/termination-of-contract.php
@@ -24,6 +24,6 @@
 Version: 1.0.0
 Author: Creative Commons Corporation
 Author URI: https://github.com/creativecommons/
-Requires PHP: 7.4.0
+Requires PHP: 5.4.0
 */
 ?>

From 0a5bdecd1b70cb6073dee7c68ce815d6b03122ea Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 13:24:12 +0100
Subject: [PATCH 005/196] created Tool.php class that will handle html
 generating and shortcode logics

---
 src/Tool.php | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/Tool.php

diff --git a/src/Tool.php b/src/Tool.php
new file mode 100644
index 0000000..d70466e
--- /dev/null
+++ b/src/Tool.php
@@ -0,0 +1,7 @@
+<?php
+namespace CreativeCommons_TOT;
+
+class Tool
+{
+    
+}

From d2d1b218355bfbd7c940c033111cebb9b412b27c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 13:41:28 +0100
Subject: [PATCH 006/196] added generateHtml method to Tool class

---
 src/Tool.php | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/Tool.php b/src/Tool.php
index d70466e..074cd73 100644
--- a/src/Tool.php
+++ b/src/Tool.php
@@ -1,7 +1,56 @@
 <?php
 namespace CreativeCommons_TOT;
 
+/**
+ * Handles HTML generating nd shortcode logics
+ */
 class Tool
 {
-    
+    /**
+     * This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ... 
+     */
+    public function generateHtml()
+    {
+        $tot_tool_html = <<<'EOD'
+            <div class="panel panel-info hidden" id="answers-table">
+            <div class="panel-heading">
+                <h3 class="panel-title">Your answers</h3>
+            </div>
+            <div class="panel-body">
+                <table class="table table-striped">
+                <tbody id="answers-table-rows">
+                </tbody>
+                </table>
+            </div>
+            </div>
+
+            <div class="panel panel-primary hidden" id="questionnaire-section">
+            <div class="panel-heading">
+            <h3 class="panel-title" id="section-title"></h3>
+            </div>
+            <div class="panel-body" id="question-rendering-area">
+            </div>
+            </div>
+
+            <div id="alert-area">
+            </div>
+
+            <div class="panel hidden" id="result-area">
+            <div class="panel-heading">
+            <h3 class="panel-title" id="result-area-title"></h3>
+            </div>
+            <div class="panel-body" id="result-area-message">
+            </div>
+            </div>
+
+            <div class="hidden" id="question-progress-buttons">
+            <button class="btn btn-default" id="button-question-back">Back</button>
+            <button class="btn btn-default" id="button-question-next">Next</button>
+            <a href="."
+                class="btn btn-default hidden"
+                id="button-restart">Restart</a>
+            </div>
+        EOD;
+        return $tot_tool_html;
+    }
 }

From ca1103b8634e2ffe47ad3b4d42d5e1aaaf311f20 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 13:48:23 +0100
Subject: [PATCH 007/196] added handleShortcode method to Tool class

---
 src/Tool.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/Tool.php b/src/Tool.php
index 074cd73..afe6fc1 100644
--- a/src/Tool.php
+++ b/src/Tool.php
@@ -9,7 +9,7 @@ class Tool
     /**
      * This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ... 
      */
-    public function generateHtml()
+    protected function generateHtml()
     {
         $tot_tool_html = <<<'EOD'
             <div class="panel panel-info hidden" id="answers-table">
@@ -53,4 +53,27 @@ class="btn btn-default hidden"
         EOD;
         return $tot_tool_html;
     }
+
+    /**
+     * 
+     * @param $atts
+     */
+    public function handleShortcode( $atts ){
+        wp_enqueue_script("jquery");
+        wp_enqueue_script( 'tot-values',
+                           plugins_url( 'js/values.js', __FILE__ ) );
+        wp_enqueue_script( 'tot-rules',
+                           plugins_url( 'js/rules.js', __FILE__ ) );
+        wp_enqueue_script( 'tot-validation',
+                           plugins_url( 'js/validation.js', __FILE__ ) );
+        wp_enqueue_script( 'tot-widgets',
+                           plugins_url( 'js/widgets.js', __FILE__ ) );
+        wp_enqueue_script( 'tot-rendering',
+                           plugins_url( 'js/rendering.js', __FILE__ ) );
+        wp_enqueue_script( 'tot-pdf',
+                           plugins_url( 'js/pdf.js', __FILE__ ) );
+        wp_enqueue_script( 'tot-questions',
+                           plugins_url( 'js/questions.js', __FILE__ ) );
+        return $this->generateHtml();
+    }
 }

From 4a6406b321f7a2131113d304228397130af1c0ee Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 13:52:34 +0100
Subject: [PATCH 008/196] add run method to Tool class. this will be called
 from the entry script

---
 src/Tool.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Tool.php b/src/Tool.php
index afe6fc1..d3eb0d5 100644
--- a/src/Tool.php
+++ b/src/Tool.php
@@ -6,6 +6,10 @@
  */
 class Tool
 {
+    public function run()
+    {
+        
+    }
     /**
      * This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ... 
      */

From c75bfc76ca3fc8902b05c0b70b7babb957591754 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 13:54:24 +0100
Subject: [PATCH 009/196] created a docker-compose.yml file to enable docker
 builds

---
 docker-compose.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e69de29

From f0ff8cb935881abc9637b36365e7dbfbc9928537 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 14:06:22 +0100
Subject: [PATCH 010/196] created a Dockerfile file to enable docker builds

---
 Dockerfile         |  0
 docker-compose.yml | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..e69de29
diff --git a/docker-compose.yml b/docker-compose.yml
index e69de29..dd34087 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '3.3'
+
+services:
+ tot:
+  build:
+  restart: always
+  ports:
+   - 3003:3003
+  environment:
+   - PORT=3003
+   - NODE_ENV=production
+  extra_hosts:
+   - 'host.docker.internal:108.61.222.241'
+ php:
+  image: php:5.4
+  restart: always
+  volumes:
+   - server:/data/php
+volumes:
+ server:
\ No newline at end of file

From 7eb24028c32f2a73bdd065dc0e35db6f6fdc16d4 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 14:18:51 +0100
Subject: [PATCH 011/196] created a Dockerfile file to enable docker builds

---
 Dockerfile | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index e69de29..44b16ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+# syntax=docker/dockerfile:experimental
+
+FROM nginx:alpine
+
+ENV NODE_ENV=production
+ENV PORT=3003
+
+WORKDIR /app
+
+COPY ["composer.json", "composer.lock", "./"]
+
+RUN composer install
+
+COPY . .

From 94e8af903485649463e14632f1c07358409508d8 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 15:01:10 +0100
Subject: [PATCH 012/196] refactored Tool.php class to tot/Plugin.php

---
 src/{Tool.php => tot/Plugin.php} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/{Tool.php => tot/Plugin.php} (98%)

diff --git a/src/Tool.php b/src/tot/Plugin.php
similarity index 98%
rename from src/Tool.php
rename to src/tot/Plugin.php
index d3eb0d5..1c90400 100644
--- a/src/Tool.php
+++ b/src/tot/Plugin.php
@@ -1,10 +1,10 @@
 <?php
-namespace CreativeCommons_TOT;
+namespace CreativeCommons_TOT\tot;
 
 /**
  * Handles HTML generating nd shortcode logics
  */
-class Tool
+class Plugin
 {
     public function run()
     {

From 128984a4888436fb8688462481d171acaf38a565 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 15:02:51 +0100
Subject: [PATCH 013/196] removed docker-compose.yml file

---
 docker-compose.yml | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index dd34087..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '3.3'
-
-services:
- tot:
-  build:
-  restart: always
-  ports:
-   - 3003:3003
-  environment:
-   - PORT=3003
-   - NODE_ENV=production
-  extra_hosts:
-   - 'host.docker.internal:108.61.222.241'
- php:
-  image: php:5.4
-  restart: always
-  volumes:
-   - server:/data/php
-volumes:
- server:
\ No newline at end of file

From f6b1c6d1fcc6125d5e01b27761993f478c43d61c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 15:06:01 +0100
Subject: [PATCH 014/196] refactored spellings

---
 composer.json                                              | 2 +-
 src/{tot => toc}/Plugin.php                                | 2 +-
 termination-of-contract.php => termination_of_contract.php | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{tot => toc}/Plugin.php (98%)
 rename termination-of-contract.php => termination_of_contract.php (100%)

diff --git a/composer.json b/composer.json
index 98f9e51..a0bc56d 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     },
     "autoload": {
-        "psr-4": {"CreativeCommons_TOT\\": "src"}
+        "psr-4": {"CreativeCommons_TOC\\": "src"}
     },
     "repositories": [
         {
diff --git a/src/tot/Plugin.php b/src/toc/Plugin.php
similarity index 98%
rename from src/tot/Plugin.php
rename to src/toc/Plugin.php
index 1c90400..51e4f86 100644
--- a/src/tot/Plugin.php
+++ b/src/toc/Plugin.php
@@ -1,5 +1,5 @@
 <?php
-namespace CreativeCommons_TOT\tot;
+namespace CreativeCommons_TOC\tot;
 
 /**
  * Handles HTML generating nd shortcode logics
diff --git a/termination-of-contract.php b/termination_of_contract.php
similarity index 100%
rename from termination-of-contract.php
rename to termination_of_contract.php

From 6a49e96f007259fa7885a150fd77d71e49c4bcdd Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 15:36:12 +0100
Subject: [PATCH 015/196] make plugin containrizable

---
 Dockerfile | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 44b16ca..5de9a88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,9 @@
 # syntax=docker/dockerfile:experimental
 
-FROM nginx:alpine
+FROM wordpress:php7.4-fpm-alpine
 
-ENV NODE_ENV=production
-ENV PORT=3003
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-WORKDIR /app
-
-COPY ["composer.json", "composer.lock", "./"]
+COPY . /var/www/html/wp-content/plugins/termination-of-contract
 
 RUN composer install
-
-COPY . .

From dbcc7ab86dc0acca0a4e58c901325581104177d7 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 15:45:30 +0100
Subject: [PATCH 016/196] refactored spellings

---
 Dockerfile                                                 | 2 +-
 composer.json                                              | 2 +-
 src/{toc => tot}/Plugin.php                                | 2 +-
 termination_of_contract.php => termination-of-transfer.php | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename src/{toc => tot}/Plugin.php (98%)
 rename termination_of_contract.php => termination-of-transfer.php (99%)

diff --git a/Dockerfile b/Dockerfile
index 5de9a88..3d1e432 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,6 @@ FROM wordpress:php7.4-fpm-alpine
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY . /var/www/html/wp-content/plugins/termination-of-contract
+COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 
 RUN composer install
diff --git a/composer.json b/composer.json
index a0bc56d..98f9e51 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     },
     "autoload": {
-        "psr-4": {"CreativeCommons_TOC\\": "src"}
+        "psr-4": {"CreativeCommons_TOT\\": "src"}
     },
     "repositories": [
         {
diff --git a/src/toc/Plugin.php b/src/tot/Plugin.php
similarity index 98%
rename from src/toc/Plugin.php
rename to src/tot/Plugin.php
index 51e4f86..1c90400 100644
--- a/src/toc/Plugin.php
+++ b/src/tot/Plugin.php
@@ -1,5 +1,5 @@
 <?php
-namespace CreativeCommons_TOC\tot;
+namespace CreativeCommons_TOT\tot;
 
 /**
  * Handles HTML generating nd shortcode logics
diff --git a/termination_of_contract.php b/termination-of-transfer.php
similarity index 99%
rename from termination_of_contract.php
rename to termination-of-transfer.php
index 2037fef..1973d43 100644
--- a/termination_of_contract.php
+++ b/termination-of-transfer.php
@@ -26,4 +26,5 @@
 Author URI: https://github.com/creativecommons/
 Requires PHP: 5.4.0
 */
+
 ?>

From 811ba85202dab50940724a940471bd73aa394833 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 16:03:22 +0100
Subject: [PATCH 017/196] registered shortcode

---
 src/tot/Plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tot/Plugin.php b/src/tot/Plugin.php
index 1c90400..9ab7e92 100644
--- a/src/tot/Plugin.php
+++ b/src/tot/Plugin.php
@@ -8,7 +8,7 @@ class Plugin
 {
     public function run()
     {
-        
+        add_shortcode( 'termination-of-transfer-tool', [$this, 'handleShortcode'] );
     }
     /**
      * This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ... 

From 856178c9d9e225567489360388da597ec0f2320e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 16:18:39 +0100
Subject: [PATCH 018/196] refactor code to separate plugin logics

---
 src/tot/TerminationOfTransfer.php | 0
 src/tot/WpPlugin.php              | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/tot/TerminationOfTransfer.php
 create mode 100644 src/tot/WpPlugin.php

diff --git a/src/tot/TerminationOfTransfer.php b/src/tot/TerminationOfTransfer.php
new file mode 100644
index 0000000..e69de29
diff --git a/src/tot/WpPlugin.php b/src/tot/WpPlugin.php
new file mode 100644
index 0000000..e69de29

From 7f06d85ac8e46992273a68d4f04d9c90ac6726fe Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 16:25:09 +0100
Subject: [PATCH 019/196] added abstarct class

---
 src/tot/WpPlugin.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/tot/WpPlugin.php b/src/tot/WpPlugin.php
index e69de29..1ca78af 100644
--- a/src/tot/WpPlugin.php
+++ b/src/tot/WpPlugin.php
@@ -0,0 +1,16 @@
+<?php
+namespace CreativeCommons_TOT\tot;
+
+abstract class WpPlugin
+{
+    protected $data;
+
+    public function __construct()
+    {
+        // ensure this script was not called directly
+        if ( ! defined( 'ABSPATH' ) ) {
+            exit;
+        }
+        $this->data = [];
+    }
+}

From 19554101cd5d6712427c47ee812d3a259535c9d6 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 16:27:57 +0100
Subject: [PATCH 020/196] added comment on data property

---
 src/tot/WpPlugin.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tot/WpPlugin.php b/src/tot/WpPlugin.php
index 1ca78af..075ad1e 100644
--- a/src/tot/WpPlugin.php
+++ b/src/tot/WpPlugin.php
@@ -3,6 +3,9 @@
 
 abstract class WpPlugin
 {
+    /**
+     * @var Array holds the plugin data/options
+     */
     protected $data;
 
     public function __construct()

From 0a0a00599819e2b56077c370695732fcbf93191b Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 16:36:00 +0100
Subject: [PATCH 021/196] implemented ArrayAccess methods on Plugin class

---
 src/tot/Plugin.php | 94 +++++++++++++---------------------------------
 1 file changed, 27 insertions(+), 67 deletions(-)

diff --git a/src/tot/Plugin.php b/src/tot/Plugin.php
index 9ab7e92..4bfdb3f 100644
--- a/src/tot/Plugin.php
+++ b/src/tot/Plugin.php
@@ -2,82 +2,42 @@
 namespace CreativeCommons_TOT\tot;
 
 /**
- * Handles HTML generating nd shortcode logics
+ * Serves as a container for the plugin
  */
-class Plugin
+class Plugin extends WpPlugin implements \ArrayAccess
 {
     public function run()
     {
-        add_shortcode( 'termination-of-transfer-tool', [$this, 'handleShortcode'] );
+        // Loop on data
+        foreach( $this->data as $key => $option ){ 
+            if( \is_callable($option) ){
+              $option = $this[$key];
+            }
+            if( \is_object( $option ) ){
+              $reflection = new \ReflectionClass( $option );
+              if( $reflection->hasMethod( 'run' ) ){
+                $option->run(); // Call run method on object
+              }
+            }
+          }
     }
-    /**
-     * This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ... 
-     */
-    protected function generateHtml()
-    {
-        $tot_tool_html = <<<'EOD'
-            <div class="panel panel-info hidden" id="answers-table">
-            <div class="panel-heading">
-                <h3 class="panel-title">Your answers</h3>
-            </div>
-            <div class="panel-body">
-                <table class="table table-striped">
-                <tbody id="answers-table-rows">
-                </tbody>
-                </table>
-            </div>
-            </div>
-
-            <div class="panel panel-primary hidden" id="questionnaire-section">
-            <div class="panel-heading">
-            <h3 class="panel-title" id="section-title"></h3>
-            </div>
-            <div class="panel-body" id="question-rendering-area">
-            </div>
-            </div>
 
-            <div id="alert-area">
-            </div>
+    public function offsetSet( $offset, $value ) {
+        $this->data[$offset] = $value;
+    }
 
-            <div class="panel hidden" id="result-area">
-            <div class="panel-heading">
-            <h3 class="panel-title" id="result-area-title"></h3>
-            </div>
-            <div class="panel-body" id="result-area-message">
-            </div>
-            </div>
+    public function offsetExists($offset) {
+        return isset( $this->data[$offset] );
+    }
 
-            <div class="hidden" id="question-progress-buttons">
-            <button class="btn btn-default" id="button-question-back">Back</button>
-            <button class="btn btn-default" id="button-question-next">Next</button>
-            <a href="."
-                class="btn btn-default hidden"
-                id="button-restart">Restart</a>
-            </div>
-        EOD;
-        return $tot_tool_html;
+    public function offsetUnset($offset) {
+        unset( $this->data[$offset] );
     }
 
-    /**
-     * 
-     * @param $atts
-     */
-    public function handleShortcode( $atts ){
-        wp_enqueue_script("jquery");
-        wp_enqueue_script( 'tot-values',
-                           plugins_url( 'js/values.js', __FILE__ ) );
-        wp_enqueue_script( 'tot-rules',
-                           plugins_url( 'js/rules.js', __FILE__ ) );
-        wp_enqueue_script( 'tot-validation',
-                           plugins_url( 'js/validation.js', __FILE__ ) );
-        wp_enqueue_script( 'tot-widgets',
-                           plugins_url( 'js/widgets.js', __FILE__ ) );
-        wp_enqueue_script( 'tot-rendering',
-                           plugins_url( 'js/rendering.js', __FILE__ ) );
-        wp_enqueue_script( 'tot-pdf',
-                           plugins_url( 'js/pdf.js', __FILE__ ) );
-        wp_enqueue_script( 'tot-questions',
-                           plugins_url( 'js/questions.js', __FILE__ ) );
-        return $this->generateHtml();
+    public function offsetGet($offset) {
+        if( \is_callable($this->data[$offset]) ){
+        return \call_user_func( $this->data[$offset], $this );
+        }
+        return isset( $this->data[$offset] ) ? $this->data[$offset] : null;
     }
 }

From 30db36ac78d48601287cdfe7bb440afa79ce9797 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 16:57:37 +0100
Subject: [PATCH 022/196] added action hook for plugin initialization

---
 termination-of-transfer.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index 1973d43..d7f5ae7 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -1,4 +1,5 @@
 <?php
+use CreativeCommons_TOT\tot\Plugin;
 /*
     Termination of Transfer - tool to help in returning authors rights.
     Copyright (C) 2016, 2017  Creative Commons Corporation.
@@ -27,4 +28,14 @@
 Requires PHP: 5.4.0
 */
 
+add_action('plugins_loaded', 'termination_of_contract_tool_init');
+
+function termination_of_contract_tool_init()
+{
+    $toc = new Plugin();
+    $toc['path'] = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR;
+    $toc['url'] = plugin_dir_url( __FILE__ );
+    $toc['version'] = '2.0.0';
+    $toc->run();
+}
 ?>

From 0d523abcc8f11a48a5018bd7a7f3932a43fd033e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 17:00:04 +0100
Subject: [PATCH 023/196] refactored spellings

---
 termination-of-transfer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index d7f5ae7..682d7dc 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -28,9 +28,9 @@
 Requires PHP: 5.4.0
 */
 
-add_action('plugins_loaded', 'termination_of_contract_tool_init');
+add_action('plugins_loaded', 'termination_of_transfer_tool_init');
 
-function termination_of_contract_tool_init()
+function termination_of_transfer_tool_init()
 {
     $toc = new Plugin();
     $toc['path'] = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR;

From dc4cf32a40703d34b22af1580876f5d722e359ef Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 17:26:54 +0100
Subject: [PATCH 024/196] updated hook init function

---
 termination-of-transfer.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index 682d7dc..0ad6f64 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -1,5 +1,7 @@
 <?php
 use CreativeCommons_TOT\tot\Plugin;
+use CreativeCommons_TOT\tot\TerminationOfTransfer;
+
 /*
     Termination of Transfer - tool to help in returning authors rights.
     Copyright (C) 2016, 2017  Creative Commons Corporation.
@@ -33,9 +35,29 @@
 function termination_of_transfer_tool_init()
 {
     $toc = new Plugin();
+    // the instaled directory path
     $toc['path'] = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR;
+    // the instaled directory url
     $toc['url'] = plugin_dir_url( __FILE__ );
+    // the current plugin version
     $toc['version'] = '2.0.0';
+    // the plugin name
+    $toc['name'] = 'Termination of Tranfer Tool';
+    // the scripts to load, if prefixed with js/ then it's located in the plugin scripts folder
+    $toc['scripts'] = [
+        'jquery',
+        'js/values',
+        'js/rules',
+        'js/validation',
+        'js/widgets',
+        'js/rendering',
+        'js/pdf',
+        'js/questions'
+    ];
+    // the styles to load, if prefixed with css/ then it's located in the plugin styles folder
+    $toc['styles'] = [];
+    // termination of transfer main logics
+    $toc['tool'] = new TerminationOfTransfer($toc);
     $toc->run();
 }
 ?>

From a99e39066ba289f3aaeb702809fc5d08a759d2e3 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 17:28:17 +0100
Subject: [PATCH 025/196] spellings

---
 termination-of-transfer.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index 0ad6f64..8d17bcf 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -34,17 +34,17 @@
 
 function termination_of_transfer_tool_init()
 {
-    $toc = new Plugin();
+    $tot_plugin = new Plugin();
     // the instaled directory path
-    $toc['path'] = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR;
+    $tot_plugin['path'] = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR;
     // the instaled directory url
-    $toc['url'] = plugin_dir_url( __FILE__ );
+    $tot_plugin['url'] = plugin_dir_url( __FILE__ );
     // the current plugin version
-    $toc['version'] = '2.0.0';
+    $tot_plugin['version'] = '2.0.0';
     // the plugin name
-    $toc['name'] = 'Termination of Tranfer Tool';
+    $tot_plugin['name'] = 'Termination of Tranfer Tool';
     // the scripts to load, if prefixed with js/ then it's located in the plugin scripts folder
-    $toc['scripts'] = [
+    $tot_plugin['scripts'] = [
         'jquery',
         'js/values',
         'js/rules',
@@ -55,9 +55,9 @@ function termination_of_transfer_tool_init()
         'js/questions'
     ];
     // the styles to load, if prefixed with css/ then it's located in the plugin styles folder
-    $toc['styles'] = [];
+    $tot_plugin['styles'] = [];
     // termination of transfer main logics
-    $toc['tool'] = new TerminationOfTransfer($toc);
-    $toc->run();
+    $tot_plugin['tool'] = new TerminationOfTransfer($tot_plugin);
+    $tot_plugin->run();
 }
 ?>

From c32bb84bd2dfc2cceb8db95bc6a03b54a409a641 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 18:18:31 +0100
Subject: [PATCH 026/196] updated termination of transfer logic

---
 src/tot/TerminationOfTransfer.php | 107 ++++++++++++++++++++++++++++++
 src/tot/WpPlugin.php              |  48 ++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/src/tot/TerminationOfTransfer.php b/src/tot/TerminationOfTransfer.php
index e69de29..65cd172 100644
--- a/src/tot/TerminationOfTransfer.php
+++ b/src/tot/TerminationOfTransfer.php
@@ -0,0 +1,107 @@
+<?php
+namespace CreativeCommons_TOT\tot;
+
+/**
+ * Handles HTML generating nd shortcode logics
+ */
+class TerminationOfTransfer
+{
+    protected $data;
+
+    protected $scripts;
+
+    protected $styles;
+
+    public function __construct(Plugin $params)
+    {
+        $data = [
+            'name' => $params['name'],
+            'version' => $params['version'],
+            'html' => $params->generateHtml()
+        ];
+        $this->scripts = $params['scripts'];
+        $this->styles = $params['styles'];
+        $this->data = $data;
+    }
+
+    protected function registerScripts()
+    {
+        foreach ($this->scripts as $value) {
+            $script = \explode('/', $value);
+            if (isset($script[1])) {
+                $n = $script[1];
+                wp_enqueue_script( "tot-$n", plugins_url( "$value.js", __FILE__ ) );
+            } else {
+                wp_enqueue_script($value);
+            }
+        }
+    }
+
+    protected function registerStyles()
+    {
+        foreach ($this->styles as $value) {
+            $style = \explode('/', $value);
+            if (isset($style[1])) {
+                $n = $style[1];
+                wp_enqueue_style( "tot-style-$n", plugins_url( "$value.css", __FILE__ ) );
+            } else {
+                wp_enqueue_style($value);
+            }
+        }
+    }
+
+    public function run()
+    {
+        if ( ! version_compare( PHP_VERSION, '5.4', '>=' ) ) {
+            add_action( 'admin_notices', 'fail_php_version' );
+        } elseif ( ! version_compare( get_bloginfo( 'version' ), '4.0', '>=' ) ) {
+            add_action( 'admin_notices', 'fail_wp_version' );
+        } else {
+            add_shortcode( 'termination-of-transfer-tool', [$this, 'handleShortcode'] );
+        }
+    }
+    
+
+    /**
+     * 
+     * @param $atts Array
+     */
+    public function handleShortcode( $atts = [] )
+    {
+        $this->registerScripts();
+        $this->registerStyles();
+        return $this->data['html'];
+    }
+
+    /**
+     * Notice for minimum PHP version.
+     *
+     * Warning when the site does not meet the minimum required PHP version.
+     *
+     * @return void
+     */
+    public function fail_php_version() {
+        /* translators: %s: PHP version */
+        $v = $this->data['version'];
+        $n = $this->data['name'];
+        $message = sprintf( "Version $v of $n requires PHP version %s+, plugin is currently NOT RUNNING", '5.4' );
+        $html_message = sprintf( '<div class="error">%s</div>', wpautop( $message ) );
+        echo wp_kses_post( $html_message );
+    }
+
+    /**
+     * Notice for minimum WordPress version.
+     *
+     * Warning when the site does not meet the minimum required WordPress version.
+     *
+     * @return void
+     */
+    public function fail_wp_version() {
+        /* translators: %s: WordPress version */
+        $v = $this->data['version'];
+        $n = $this->data['name'];
+        $message      = sprintf( "Version $v of $n requires WordPress version %s+. Because you are using an earlier version, the plugin is currently NOT RUNNING", '4.0' );
+        $html_message = sprintf( '<div class="error">%s</div>', wpautop( $message ) );
+        echo wp_kses_post( $html_message );
+    }
+}
diff --git a/src/tot/WpPlugin.php b/src/tot/WpPlugin.php
index 075ad1e..4bf0c27 100644
--- a/src/tot/WpPlugin.php
+++ b/src/tot/WpPlugin.php
@@ -16,4 +16,52 @@ public function __construct()
         }
         $this->data = [];
     }
+
+    /**
+     * This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ... 
+     */
+    protected function generateHtml()
+    {
+        $tot_tool_html = <<<'EOD'
+            <div class="panel panel-info hidden" id="answers-table">
+            <div class="panel-heading">
+                <h3 class="panel-title">Your answers</h3>
+            </div>
+            <div class="panel-body">
+                <table class="table table-striped">
+                <tbody id="answers-table-rows">
+                </tbody>
+                </table>
+            </div>
+            </div>
+
+            <div class="panel panel-primary hidden" id="questionnaire-section">
+            <div class="panel-heading">
+            <h3 class="panel-title" id="section-title"></h3>
+            </div>
+            <div class="panel-body" id="question-rendering-area">
+            </div>
+            </div>
+
+            <div id="alert-area">
+            </div>
+
+            <div class="panel hidden" id="result-area">
+            <div class="panel-heading">
+            <h3 class="panel-title" id="result-area-title"></h3>
+            </div>
+            <div class="panel-body" id="result-area-message">
+            </div>
+            </div>
+
+            <div class="hidden" id="question-progress-buttons">
+            <button class="btn btn-default" id="button-question-back">Back</button>
+            <button class="btn btn-default" id="button-question-next">Next</button>
+            <a href="."
+                class="btn btn-default hidden"
+                id="button-restart">Restart</a>
+            </div>
+        EOD;
+        return $tot_tool_html;
+    }
 }

From c67df38d37ebe9ca52e58517ac0f4e1e19466439 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 18:29:38 +0100
Subject: [PATCH 027/196] updated assets path and created result file

---
 src/js/pdf.js                     | 117 +++++++
 src/js/questions.js               | 480 ++++++++++++++++++++++++++++
 src/js/rendering.js               | 196 ++++++++++++
 src/js/results.json               |  68 ++++
 src/js/rules.js                   | 505 ++++++++++++++++++++++++++++++
 src/js/validation.js              |  68 ++++
 src/js/values.js                  |  74 +++++
 src/js/widgets.js                 | 160 ++++++++++
 src/tot/Result.php                |   0
 src/tot/TerminationOfTransfer.php |   4 +-
 10 files changed, 1670 insertions(+), 2 deletions(-)
 create mode 100644 src/js/pdf.js
 create mode 100644 src/js/questions.js
 create mode 100644 src/js/rendering.js
 create mode 100644 src/js/results.json
 create mode 100644 src/js/rules.js
 create mode 100644 src/js/validation.js
 create mode 100644 src/js/values.js
 create mode 100644 src/js/widgets.js
 create mode 100644 src/tot/Result.php

diff --git a/src/js/pdf.js b/src/js/pdf.js
new file mode 100644
index 0000000..5748eee
--- /dev/null
+++ b/src/js/pdf.js
@@ -0,0 +1,117 @@
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// PDF Generation
+// (browser-side data preparation and call to server)
+////////////////////////////////////////////////////////////////////////////////
+
+var PDF = {};
+
+PDF.url = jQuery("script[src*='/termination-of-transfer/js/pdf.js']")
+	       .attr('src').replace(/js\/pdf\.js.*$/, '')
+	       + 'result-pdf.php';
+
+PDF.appendProperty = function (details, key, value) {
+  var mapping = {key: key,
+                 value: value};
+  details.push(mapping);
+};
+
+PDF.append203Windows = function (details) {
+  var notice = '';
+  var termination = '';
+
+  if (Values.notice_begin != undefined) {
+    notice += Values.notice_begin + '-' + Values.notice_end;
+    termination += Values.term_begin + '-' + Values.term_end
+  }
+
+  if (Values.p_term_begin != undefined) {
+    if (notice != '') {
+      notice += ' or ';
+      termination += ' or ';
+    }
+    notice += Values.p_notice_begin + '-' + Values.p_notice_end;
+    termination += Values.p_term_begin + '-' + Values.p_term_end;
+  }
+
+  PDF.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>', notice);
+  PDF.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>', termination);
+};
+
+PDF.append304Windows = function (details) {
+  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
+                     Values.notice_begin);
+  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
+                     Values.notice_end);
+  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
+                     Values.term_begin);
+  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
+                     Values.term_end);
+  if (Values.d_notice_begin != undefined) {
+    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
+                       Values.d_notice_begin);
+    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
+                       Values.d_notice_end);
+    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
+                       Values.d_term_begin);
+    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
+                       Values.d_term_end);
+  }
+};
+
+PDF.appendWindows = function (details) {
+  if (Rules.is203()) {
+    PDF.append203Windows(details);
+  } else if (Rules.is304()) {
+    PDF.append304Windows(details);
+  }
+};
+
+PDF.details = function () {
+  var details = [];
+  Object.getOwnPropertyNames(varsToTitles).forEach(function (key) {
+    if ((Values[key] != undefined)
+        && (Values[key] != '')) {
+      PDF.appendProperty(details, varsToTitles[key], Values[key]);
+    }
+  });
+  PDF.appendWindows(details);
+  return details;
+};
+
+PDF.request = function () {
+  var data = {report_timestamp: Values.current_date.getTime()/1000,
+              flags: Values.flags.sort(), // Sorts inline & returns, so OK here
+              conclusion: Values.conclusion,
+              details: PDF.details(),
+             };
+  var totform = document.createElement("FORM");
+  totform.setAttribute("action", PDF.url);
+  totform.setAttribute("method", "post");
+  totform.setAttribute("enctype", "multipart/form-data");
+  totform.setAttribute("target", "_blank");
+  var data_field = document.createElement("INPUT");
+  data_field.setAttribute("type", "hidden");
+  data_field.setAttribute("name", "data");
+  data_field.setAttribute("value", JSON.stringify(data));
+  totform.appendChild(data_field);
+  jQuery('body').append(totform);
+  totform.submit();
+};
diff --git a/src/js/questions.js b/src/js/questions.js
new file mode 100644
index 0000000..ad73a51
--- /dev/null
+++ b/src/js/questions.js
@@ -0,0 +1,480 @@
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Presentation of questions, and main flow of control
+// (This is slightly overloaded)
+////////////////////////////////////////////////////////////////////////////////
+
+var Questions = {};
+
+////////////////////////////////////////////////////////////////////////////////
+// Section One
+////////////////////////////////////////////////////////////////////////////////
+
+// When was the work created?
+
+Questions.s1q1a = {
+  section: 1,
+  question: 'When was the work created?',
+  explanation:'The year in which a work was created can affect its copyright status and its treatment under U.S. copyright law. Most importantly, the tool is concerned with whether a worked was made before or after January 1, 1978, when the most recent overhaul of U.S. copyright went into effect.',   
+  variable: 'creation_year',
+  input: 'year',
+  pre: function () {
+    Navigation.disablePrevious();
+    Notifications.displayAnswersHint();
+  },
+  post: function () {
+    Notifications.removeAnswersHint();
+  }
+};
+
+// Has the work been published?
+
+Questions.s1q1b = {
+  question: 'Has the work been published?',
+  explanation:'Whether a work has been published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
+  variable: 'work_published',
+  input: 'radio',
+  pre: function () {
+    Navigation.enablePrevious();
+  }
+};
+
+// When was the work first published?
+
+Questions.s1q1bi = {
+  variable: 'pub_year',
+  question: 'When was the work first published?',
+  explanation:'When a work was published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
+  input: 'year',
+  validate: function () {
+    return Validation.validDate()
+      || ((parseInt(jQuery('.text-question').val()) < Values.creation_year)
+          ? 'The publication year cannot be earlier than the creation year.'
+          : false);
+  }
+
+};
+
+// When was the work first published under the grant?
+
+Questions.s1q1bii =  {
+  section: 1,
+  question: 'When was the work first published under the grant?',
+  explanation:'When a work was first published under the grant (which may be different than the the date the work was published for the first time) can factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date">glossary</a>.',
+  variable: 'grant_pub_year',
+  input: 'year',
+  validate: function () {
+    var errors = Validation.validDate();
+    if (errors == false) {
+      var year = parseInt(jQuery('.text-question').val());
+      if (year < Values.creation_year) {
+        errors = 'Year of publication under grant cannot be earlier than year of creation.';
+      } else if (year < Values.pub_year) {
+        errors = 'Year of publication under grant cannot be earlier than year of initial publication.';
+      } /* else if (year < Values.k_year) {
+        errors = 'Year of publication under grant cannot be earlier than year of grant.';
+      }*/
+    }
+    return errors;
+  }
+};
+
+
+// Works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?
+
+Questions.s1q1bi2 = {
+  question: 'Published works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?',
+  explanation:'For U.S. works published in certain years, U.S. law required that they feature a "copyright notice" in order to receive federal copyright protection. Whether or not the published version featured a copyright notice can affect the copyright status of these works.',	
+  variable: 'copyright_notice',
+  input: 'radio',
+  values: ['yes', 'no', 'maybe']
+};
+
+// Has the work been registered with the United State Copyright Office?
+
+Questions.s1q1c = {
+  question: 'Has the work been registered with the United State Copyright Office?',
+  explanation:'Before 1989, registration was one of the ways authors could secure federal copyright in their work. Whether a work was registered can affect copyright status and the timing of termination right.',  
+  variable: 'work_registered',
+  input: 'radio',
+  values: ['yes', 'no'] //, "don't know"] GitHub issue #33
+};
+
+// When was the work registered with the United States Copyright Office?
+
+Questions.s1q1ci = {
+  question: 'When was the work registered with the United States Copyright Office?',
+  explanation:'Before 1989, registration was one of the ways authors could secure federal copyright in their work. When a work was registered can affect copyright status and the timing of termination right.',  
+  variable: 'reg_year',
+  input: 'year'
+};
+
+// What is the date of the agreement or transfer? ...
+
+Questions.s1q1d = {
+  question: 'What is the year of the agreement or transfer?',
+  explanation:'When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work\'s copyright transfer may be eligible for termination.',
+  variable: 'k_year',
+  input: 'year',
+  validate: function () {
+    var errors = Validation.validDate();
+    if (errors == false) {
+        // Stash the user-entered agreement year
+        Values.user_inputted_k_year = parseInt(jQuery('.text-question').val());
+        // If date is before the creation year, use the creation year instead
+        if (Values.user_inputted_k_year < Values.creation_year) {
+	  jQuery('.text-question').val(Values.creation_year);
+	}
+    }
+    return errors;
+  },
+  answerDisplayValue: function () {
+    return "Effective: " + Values.k_year + "<br/>User entered: "
+	   + Values.user_inputted_k_year;
+  }
+};
+
+// Did the agreement or transfer include the right of publication?
+
+Questions.s1q1f =  {
+  // Last question in section 1, so set this if we've arrived via back button
+  section: 1,
+  question: 'Did the agreement or transfer include the right of publication?',
+  explanation:'If a <a href="/glossary/#agreement" target="_blank" title="Termination of Transfer: Glossary">transfer</a> from 1978 or later includes the right of <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">publication</a>, there is a different set of rules for determining when the transfer is eligible for termination.',	
+  variable: 'pub_right',
+  input: 'radio',
+  values: ['yes', 'no', 'maybe']
+};
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Section Two
+////////////////////////////////////////////////////////////////////////////////
+
+// Is the agreement or transfer you want to terminate part of a last will...
+
+Questions.s2q2a =  {
+  // First question in section 2
+  section: 2,
+  question: 'Is the agreement or transfer in question part of a <a href="/glossary/#will" target="_blank" title="Termination of Transfer: Glossary">last will and testament</a>?',
+  variable: 'last_will',
+  input: 'radio'
+};
+
+// Are any of the authors still alive?
+
+Questions.s2q2bi = {
+  question: 'Are <i>any</i> of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors or artists</a> still alive?',
+  explanation:'The copyright term for many works is based on the life of the author.',
+  variable: 'any_authors_alive',
+  input: 'radio'
+};
+
+// What is the year the last surviving author died?
+
+Questions.s2q2bi2 = {
+  question: 'What is the year the last surviving <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author or artist</a> died?',
+  explanation:'The copyright term for many works is based on the life of the author.',
+  variable: 'death',
+  input: 'year'
+};
+
+// Was the work created within the scope of the author’s employment?
+
+Questions.s2q2c =  {
+  question: 'Was the work created within the <a href="/glossary/#scope_of_employment" target="_blank" title="Termination of Transfer: Glossary">scope of the author’s employment</a>?',
+  variable: 'within_scope_of_employment',
+  input: 'radio'
+};
+
+// Was there an express agreement between the author and the author's employer to not treat the work as a work made for hire?
+
+Questions.s2q2ci =  {
+  question: 'Was there an express agreement the author and the author\'s employer to not treat the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
+  variable: 'express_agreement',
+  input: 'radio'
+};
+
+// Was the work created in response to a special order or commission
+
+Questions.s2q2d =  {
+  question: 'Was the work created in response to a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">special order or commission</a> by some other person or company?',
+  variable: 'special_order',
+  input: 'radio'
+};
+
+// Was there a signed written agreement regarding the special order...
+
+Questions.s2q2di =  {
+  question: 'Was there a signed written agreement regarding the special order or commission which explicitly refers to the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
+  variable: 'signed_written_agreement',
+  input: 'radio'
+};
+
+// Was the work created for use as one of the following? ...
+
+Questions.s2q2dia = {
+  question: 'Was the work created for use as one of the following? — <ul><li>a contribution to a collective work; a part of a motion picture or other audiovisual work;</li> <li>a translation;</li> <li>a <a href="/glossary/#supplementary_work" title="Termination of Transfer: Glossary">supplementary work</a> (such as a foreword, afterword, table, editorial note, musical arrangement, bibliography, appendix, or index);</li> <li>a <a href="/glossary/#compilation" target="_blank" title="Termination of Transfer: Glossary">compilation</a>;</li> <li>an <a href="/glossary/#instructional_text" target="_blank" title="Termination of Transfer: Glossary">instructional text (text and/or graphics)</a>;</li> <li>a test or answer material for a test;</li> <li>or as an atlas?</li></ul?>',
+  variable: 'created_as_part_of_motion_picture',
+  input: 'radio',
+  values: ["yes", "no", "don't know"]
+};
+
+// Has the original transfer since been renegotiated or altered?
+
+Questions.s2q2e = {
+  question: 'Has the original transfer since been renegotiated or altered?',
+  variable: 'renego',
+  input: 'radio',
+  values: ["yes", "no", "don't know"]
+};
+
+// Did one or more of the authors or artists enter into the agreement...
+
+Questions.s2q2f =  {
+  question: 'Did one or more of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors</a> enter into the agreement or transfer?',
+  variable: 'authors_entered_agreement',
+  input: 'radio'
+};
+
+// s2q2fii is part of the rule for s2q2f
+
+// Was the agreement or transfer made by a member of...
+
+Questions.s2q2fii =  {
+  // Last question in section 2, so set section if we're going back
+  section: 2,
+  question: 'Was the agreement or transfer made by a member of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author\'s</a> immediate family, or by the executors?<br><i>For more information about which family members qualify, check out the FAQ.</i>',
+  variable: 'agreement_by_family_or_executor',
+  input: 'radio'
+};
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Storing answers
+////////////////////////////////////////////////////////////////////////////////
+
+Questions.validateAnswer = function () {
+  var result = false;
+  var question = Questions[Questions.current_question];
+  if (question['validate']) {
+    result = question.validate();
+  } else if (question.type == 'year') {
+    result = Validation.validDate();
+  } else if (question.type == 'text') {
+    // If the text has a minimum length, check it
+    if (jQuery('.text-question').val().length < question.min_chars) {
+      result = 'Answer is too short, it must be at least '
+        + question.min_chars + 'characters';
+    }
+  }
+  // We don't worry about radio buttons
+  return result
+};
+
+Questions.getAnswer = function () {
+  var question = Questions[Questions.current_question];
+  var answer = undefined;
+  switch (question.input) {
+  case 'radio':
+    answer = jQuery(':input[type="radio"]:checked').val();
+    break;
+  case 'year':
+    if ((question.optional != true)
+        || ((question.optional == true)
+	    && jQuery('.text-question').val() != '')) {
+      answer = parseInt(jQuery('.text-question').val());
+    }
+    break;
+  case 'year_or_empty':
+    if (jQuery('.text-question').val() != '') {
+      answer = parseInt(jQuery('.text-question').val());
+    }
+    break;
+  case 'text':
+    // Fall through to default
+  default:
+    answer = jQuery('.text-question').val();
+    break;
+  }
+  return answer;
+};
+
+Questions.processAnswer = function () {
+  var result = false;
+  var warnings = Questions.validateAnswer();
+  if (warnings === false) {
+    var question = Questions[Questions.current_question];
+    var answer = Questions.getAnswer();
+    Values[question.variable] = answer;
+    // FIXME: handle converting radio buttons to correct store values
+    //        while recording their label in the answers table
+    if (answer) {
+      answer = (question.answerDisplayValue && question.answerDisplayValue())
+	       || answer;
+      Answers.appendAnswer(question.variable, question.question, answer);
+    }
+    Notifications.clearAlerts();
+    result = true;
+  } else {
+    Notifications.setAlert(warnings);
+  }
+  return result;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Flag and result lookup
+// These messages are stored in a json file so we can also use them in the PDF
+////////////////////////////////////////////////////////////////////////////////
+
+Questions.resultMap = undefined;
+// Asynchronous fetch of data that is accessed synchronously.
+// This data won't be used until after several questions, so this is tolerable.
+
+jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/js/questions.js']")
+               .attr('src').replace(/questions\.js.*$/, '')
+               + 'results.json')
+    .done(function (result) {
+        resultMap = result;
+    })
+    .fail(function (jqxhr, textStatus, error) {
+      var err = textStatus + ", " + error;
+      console.log("Request Failed: " + err);
+    });
+
+Questions.getConclusionDetails = function (specifier) {
+  var path = specifier.split('.');
+  var result = resultMap['Conclusion'][path[0]][path[1]];
+  return result;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Flow of control
+////////////////////////////////////////////////////////////////////////////////
+
+Questions.first_question = 's1q1a';
+Questions.last_question = 's2q2fii';
+
+Questions.start = function () {
+  jQuery('.questionnaire-section, .question-progress-buttons')
+    .removeClass('hidden');
+  jQuery('.no-javascript-alert').addClass('hidden');
+  //Navigation.disablePrevious();
+  Rendering.transitionTo(Questions.first_question);
+};
+
+Questions.transitionQuestion = function (next_question) {
+  var previous_question = Questions[Questions.current_question];
+  if (previous_question) {
+    if(previous_question.post) {
+      previous_question.post();
+    }
+  }
+  if (next_question == 'finish') {
+    Questions.finish();
+  } else {
+    Questions.current_question = next_question;
+    var question = Questions[Questions.current_question];
+    if (question['pre']) {
+      question.pre();
+    }
+    Rendering.transitionTo(question);
+  }
+};
+
+Questions.nextQuestionID = function () {
+  var next_question = Questions.current_question;
+  var rule = Rules[Questions.current_question];
+  if (typeof rule == 'function') {
+    next_question = rule();
+  } else {
+    next_question = rule;
+  }
+  return next_question;
+};
+
+Questions.nextQuestion = function () {
+  // If the answer was OK, move on
+  if (Questions.processAnswer()) {
+    ValuesStack.push();
+    var id = Questions.nextQuestionID();
+    Values.question_id = id;
+    if (id == 'finish') {
+      Questions.finish();
+    } else {
+      Questions.transitionQuestion(Values.question_id);
+      // Scroll down to make sure the input UI is visible
+      jQuery('html,body').animate({
+        scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
+    }
+  }
+};
+
+Questions.previousQuestion = function () {
+  // If we are going back from *after* the last question, re-enable UI
+  if (Values.question_id == 'finish') {
+    Navigation.unfinishQuestions();
+  }
+  // Don't pop past the very first item
+  if (ValuesStack.height() > 0) {
+    // Go back
+    ValuesStack.pop();
+    Questions.transitionQuestion(Values.question_id);
+    Notifications.clearAlerts();
+    // Clear previous answer
+    var previous_question = Questions[Values.question_id];
+    Answers.removeAnswer(previous_question.variable);
+    // Scroll down to make sure the input UI is visible
+    jQuery('html,body').animate({
+      scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
+  }
+};
+
+Questions.finish = function () {
+  var obj = Questions.getConclusionDetails(Values.conclusion);
+  Values.termination_type = obj.title;
+  Notifications.setResultAreaMessage(obj, 'panel-success');
+  Navigation.finishQuestions();
+  if (Values.conclusion_generate_pdf) {
+    PDF.request();
+  }
+};
+
+Questions.start = function () {
+  Values.reset();
+  Navigation.showQuestions();
+  Navigation.showAnswersTable();
+  Navigation.showNextPrevious();
+  jQuery('#button-question-next').click(Questions.nextQuestion);
+  jQuery('#button-question-back').click(Questions.previousQuestion);
+  // When the user presses "return" in a text area, move to next question
+  jQuery('#question-rendering-area').on('submit', function () {
+    if (jQuery('#button-question-next').is(':enabled')) {
+      jQuery('#button-question-next').click();
+    }
+    return false;
+  });
+  Questions.transitionQuestion(Questions.first_question);
+  Values.question_id = Questions.first_question;
+};
+
+jQuery( document ).ready(function () {
+  Questions.start();
+});
diff --git a/src/js/rendering.js b/src/js/rendering.js
new file mode 100644
index 0000000..84d6159
--- /dev/null
+++ b/src/js/rendering.js
@@ -0,0 +1,196 @@
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Rendering UI elements for input
+////////////////////////////////////////////////////////////////////////////////
+
+var Rendering = {};
+
+////////////////////////////////////////////////////////////////////////////////
+// Sections
+////////////////////////////////////////////////////////////////////////////////
+
+Rendering.sections = [
+  '',
+  'First tell us a few things about the work',
+  'Now, let’s find out whether the work is eligible for termination',
+  'Information about the work'
+];
+
+Rendering.currentSection = 0;
+
+////////////////////////////////////////////////////////////////////////////////
+// Template basics
+////////////////////////////////////////////////////////////////////////////////
+
+Rendering.questionTemplate = '\
+<form class="question-form">\
+  <div class="form-group">\
+    <label class="question-label"></label><br>\
+    <p class="help-block"></p> \
+  </div>\
+</form>';
+
+Rendering.createQuestion = function () {
+  return jQuery(Rendering.questionTemplate);
+};
+
+Rendering.common = function (config) {
+  var question = Rendering.createQuestion();
+  // If this is a question in a different section, change the section header
+  // Section is 1-based, so we can use a simple logical and here.
+  if (config.section
+      && (config.section != Rendering.currentSection)) {
+    jQuery('#section-title').html(Rendering.sections[config.section]).fadeIn();
+  }
+  question.find('.question-label').html(config.question);
+  if (config.explanation) {
+    question.find('.help-block').html(config.explanation);
+  }
+  question.css("display", "none");
+  // If we're entering this value for the first time (not via the back button)
+  // and this isn't an optional value
+  // don't let the user continue until they enter a value here.
+  if((Values[config.variable] === undefined)
+     && (! config.optional)) {
+    Navigation.disableNext();
+  } else {
+    Navigation.enableNext();
+  }
+  return question;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Multiple choice questions (radio buttons)
+////////////////////////////////////////////////////////////////////////////////
+
+Rendering.radio = function (config) {
+  var question = Rendering.common(config);
+  var form_group = question.find('.form-group');
+  var name = 'input-' + config.variable;
+  // If we are returning to this via the back button, get the previous value
+  var existing_value = Values[config.variable];
+  var radio_button_values = config.values || ['yes', 'no'];
+  radio_button_values.forEach(function (value) {
+    var radio_button = '<label class="radio-inline"><input type="radio" name=' + name + '" value="' + value  +'"';
+    if (value == existing_value) {
+      radio_button += ' checked="checked"';
+    }
+    radio_button += '>' + value +'</label>';
+    form_group.append(jQuery(radio_button));
+  });
+  // When the user makes a choice, go straight to the next question
+  form_group.find(':input[type="radio"]').click(function () {
+    Navigation.enableNext();
+    jQuery('#button-question-next').click();
+  });
+  return question;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Text input
+////////////////////////////////////////////////////////////////////////////////
+
+Rendering.makeTextLengthHandler = function (element, min_length, optional) {
+  return function () {
+    var length = element.val().length;
+    if ((optional && (length == 0))
+        || (length >= min_length)) {
+      Navigation.enableNext();
+    } else {
+      Navigation.disableNext();
+    }
+  };
+};
+
+Rendering.text = function (config) {
+  var question = Rendering.common(config);
+  var form_group = question.find('.form-group');
+  var name = 'input-' + config.variable;
+  var text_field = jQuery('<input type="text" class="form-control text-question" id="'
+                     + config.variable +
+                     '" placeholder="'
+                     + (config.placeholder || '')
+                     + '">');
+  form_group.append(text_field);
+  // Set the label
+  var label = question.find('.question-label').prop('for', name);
+  if (Values[config.variable]) {
+    form_group.find('text-question').val(Values[config.variable]);
+  }
+  var existing_value = Values[config.variable];
+  // Ensure next isn't enabled until enough characters are entered
+  var min_length = config.min_length || 4;
+  var text_field_element = question.find('.text-question');
+  var validator = Rendering.makeTextLengthHandler(text_field_element,
+                                                  min_length,
+                                                  config.optional);
+  text_field_element.on('keyup', validator);
+  text_field_element.on('change', validator);
+  // If we are returning to the field and the value has already been set, use it
+  if (existing_value !== undefined) {
+    text_field.val(Values[config.variable]);
+  }
+  return question;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Year input (text subtype)
+////////////////////////////////////////////////////////////////////////////////
+
+Rendering.year = function (config) {
+  var question = Rendering.text(config);
+  var text_field = question.find('.text-question');
+  Validation.allowOnlyNumbers(text_field);
+  text_field.prop('maxlength', 4);
+  text_field.prop('placeholder', '1977');
+  return question;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Render html UI from config specification
+////////////////////////////////////////////////////////////////////////////////
+
+Rendering.render = function (config) {
+  var result = undefined;
+  switch (config.input)  {
+  case 'radio':
+    result = Rendering.radio(config);
+    break;
+  case 'year':
+    result = Rendering.year(config);
+    break;
+  case 'text':
+    // Fall through to default
+  default:
+    result = Rendering.text(config);
+    break;
+  }
+  return result;
+};
+
+Rendering.transitionTo = function (config) {
+  var question = Rendering.render(config);
+  jQuery('.question-form').slideUp("fast",
+                              function () {
+                                jQuery(this).remove();
+                              });
+  jQuery('#question-rendering-area').append(question);
+  question.slideDown("fast");
+};
diff --git a/src/js/results.json b/src/js/results.json
new file mode 100644
index 0000000..bc85aaa
--- /dev/null
+++ b/src/js/results.json
@@ -0,0 +1,68 @@
+{"Flag": {"A": {"title": "Outside the notice window",
+                "i": {"title": "Before Notice Window",
+                      "a":  "It does not appear likely that a <i>current</i> right to terminate the agreement would exist for works with the characteristics provided, but it is possible that one may arise in the future. Details on possible future termination window(s) are provided in the information sheet.",
+                      "b": "It does not appear likely that a <i>current</i> right to terminate the agreement would exist for works with the characteristics provided, but it is possible that one could apply during the dates specified below."},
+                "ii": {"title": "Notice Window Expired",
+                       "a": "It appears likely that the termination process could no longer be initiated for works with the characteristics provided, either because the notice period or the termination window has expired.",
+                       "b": "It does not appear likely that the termination process could be initiated for works with the characteristics provided, either because the notice period or the termination window has expired."},
+                "iii": {"title": "Outside of Notice Window",
+                        "a": "If you are seeing this flag, you are either a time traveler or something has gone horribly wrong. Please let us know at timetravel@rightsback.org.",
+                        "b": "If you are seeing this flag, you are either a time traveler or something has gone horribly wrong. Please let us know at timetravel@rightsback.org."}},
+          "B": {"title": "Possible Public Domain Status",
+                "i": {"b": "Pre-1989 publication without notice—likely public domain<br>Works with the characteristics provided may be in the public domain. For U.S. works from before 1989, copyright depended on certain notice standards being met on publication. Please consult a licensed attorney for advice on the copyright status of a given work."},
+                "ii": {"b": "1989 publication without notice—possibly public domain<br>Works with the characteristics provided may be in the public domain. For U.S. works from before 1989, copyright depended on certain notice standards being met on publication. Please consult a licensed attorney for advice on the copyright status of a given work."},
+                "iii": {"b": "1989 or earlier publication, notice unknown—possibly public domain<br>Works with the characteristics provided may be in the public domain. For U.S. works from before 1989, copyright depended on the certain notice standards being met on publication. Please consult a licensed attorney for advice on the copyright status of a given work."}},
+          "C": {"title": "Possible renegotiations",
+                "i":  {"b": "The transfer agreement for works with the characteristics provided may have been renegotiated. Some courts have found renegotiations to affect the availability of the termination right. Please consult a licensed attorney for advice on the effect of renegotiation on the termination right."}},
+          "D": {"title": "Possible work made for hire",
+                "i":  {"b": "Pre-1978."},
+                "ii": {"b": "Post-1978"}},
+	  "E": {"title": "Dual Window Scenario",
+	        "i":  {"title": "Two possible notice/termination windows",
+		       "description": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304\">304</a>, some works receive two possible windows for termination. Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\"><a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a></a>, transfers are terminable in a window beginning 56 years from the date copyright was secured. Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>, transfers are terminable in a window beginning 75 years from the date copyright was secured. Note that transfers of rights related to a single work can only be terminated under one of these provisions—it is not possible to exercise both the § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a> and <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a> rights."},
+	        "ii": {"title": "Uncertain notice/termination window",
+		       "description": "Whether or not the right of publication was transferred is unknown for works with the characteristics provided. For transfers from 1978 or later, this information is often necessary in order to identify the correct termination window. Even not knowing this information, it is possible to see what the termination might look like in either scenario. As a result, works with the characteristics provided have two possible windows specified for both notice and termination. Only one window can apply to works transferred in 1978 or later. In order to know which window could apply to each scenario, please re-try the tool, specifying whether or not the publication right was transferred."}},
+	  "F": {"title": "Window explanations",
+		"i":  {"title": "Understanding the § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a> termination window",
+		       "description": "When a transfer made before 1978 is eligible for a termination, it will be under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304\">304</a> of the Copyright Act. Under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a>, the termination window opens 56 years after copyright was secured and lasts for five years."},
+		"ii": {"title": "Understanding the § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a> termination window",
+		       "description": "When a transfer made before 1978 of a work created before 1989 is eligible for a termination, it will be under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304\">304</a> of the Copyright Act. Under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>, the termination window opens 75 years after copyright was secured and lasts for five years."},
+		"iii":  {"title": "Understanding the § <a href=\"https://www.law.cornell.edu/uscode/text/17/203\">203</a> termination window",
+			     "description": "When a transfer made in or after 1978 is eligible for a termination, it will be under section <a href=\"https://www.law.cornell.edu/uscode/text/17/203\">203</a> of the Copyright Act. In these circumstances, the termination window opens 35 years after the transfer and lasts for five years. However, if the author granted publication rights, the test is a little different. In those cases, the five-year termination window opens either 35 years from publication or 40 years from the transfer—whichever comes first."},
+        "iv": {"title": "Understanding publication dates under § 203",
+               "description": "For terminations under section 203, the Copyright Office calculates the \"date of publication\" as the date the work is first published <i>under the grant being terminated</i> (which may or may not be the date the work was published for the first time). When the first publication date under the grant is different than the first publication date, the date of the first publication under the grant is the \"triggering publication date\" that is used to calculate the notice and termination windows."}},
+	  "G": {"title": "Uncertain terminability",
+		"i":  {"title": "Terminability Caveat",
+		       "description": "U.S. Copyright Office guidance suggests works copyrighted between October 27, 1937 and October 26, 1939 may be terminable under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>, but the statute is unclear. Consider seeking legal advice."},
+		"ii": {"title": "Important dates",
+                      "a":  "Note that works copyrighted after October 26, 1939 are NOT terminable under §<a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>."}},
+	  "H": {"title": "Gap grants etc.",
+		"i":  {"title": "A note on the date of the agreement",
+		       "description": "Following U.S. Copyright Office guidance, in most cases we treat the date of the agreement as being no earlier than the date of creation."}}},
+
+ "Conclusion": {"A": {"title": "Potentially Eligible for termination",
+                      "i": {"title": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a>",
+                            "description": "Thank you for using the Termination of Transfer Tool. Works with the characteristics provided potentially are eligible for termination during the windows specified in the PDF information sheet. Feel free to check out the FAQ for additional information. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
+                      "ii": {"title": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>",
+                             "description": "Thank you for using the Termination of Transfer Tool. Works with the characteristics provided potentially are eligible for termination during the windows specified in the PDF information sheet. Feel free to check out the FAQ for additional information. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
+                      "i-ii": {"title": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304\">304</a>",
+                               "description": "Thank you for using the Termination of Transfer Tool. Works with the characteristics provided potentially are eligible for termination during the windows specified in the PDF information sheet. Feel free to check out the FAQ for additional information. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
+                      "iii": {"title": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/203\">203</a>",
+                              "description":"Thank you for using the Termination of Transfer Tool. Works with the characteristics provided potentially are eligible for termination during the windows specified in the PDF information sheet. Feel free to check out the FAQ for additional information. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."}},
+                "B":{"title": "Termination Right Unlikely",
+                     "i": {"title": "Work Made For Hire - Scope of Employment",
+                           "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the work was likely created within the scope of employment. Works created within the scope of employment qualify as \"works made for hire\" and works made for hire are excluded from the termination of transfer provisions. Please consult a licensed attorney to better understand whether the work was created within the scope of employment and whether a termination right in fact exists for a given work."},
+                     "ii": {"title": "Work Made For Hire - Commissioned Work Post-1978 (Motion Pictures, etc)",
+                            "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the work was created after 1978 and likely qualifies as a \"work made for hire.\" As a general rule, works made for hire are excluded from the termination of transfer provisions.<br>For more information about what this result means, the FAQ section may be relevant. For more information about agreements and transfers that cannot be terminated, such as \"works made for hire,\" feel free check out this section of our FAQ. To learn more about why a distinction is made between pre- and post-1978 materials, this FAQ may be helpful. Please note, whether or not a given work is considered a work made for hire is a complex legal question. This tool does not attempt to determine whether any given work is a work made for hire.  Please consult a licensed attorney to better understand the complexities of copyright termination, to understand whether a given work is a work made for hire, and to determine whether a termination right in fact exists for a given work."},
+                     "iii": {"title": "Work Made For Hire - Commissioned Work Pre-1978",
+                             "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the work was created before 1978 and by special order or commission. As a general rule, works that were created by special order or commission before January 1, 1978 are likely to be \"works made for hire\" and works for hire are excluded from the termination of transfer provisions.<br>For more information about what this result means, this FAQ section may be relevant. For more information about agreements and transfers that cannot be terminated, such as works made for hire, feel free check out this section of our FAQ. To learn more about why a distinction is made between pre- and post-1978 materials, this FAQ may be helpful. Please note, whether or not a given work is considered a work made for hire is a complex legal question. This tool does not attempt to determine whether any given work is a work made for hire.  Please consult a licensed attorney to better understand the complexities of copyright termination, to understand whether a given work is a work made for hire, and to determine whether a termination right in fact exists for a given work."},
+                     "iv": {"title": "Transfer by Will",
+                            "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the agreement or transfer in question is a will. Transfers of copyright interests that occur by will cannot be terminated. Please consult a licensed attorney to determine whether the copyright assignment was transferred by a will and whether a termination right in fact exists for a given work."},
+                     "v": {"title": "Pre-1978 Grant by Non-Family Member",
+                           "description": "It is unlikely that works with the characteristics provided would have a termination right. Based on the information provided, it seems that someone other than the author or one of their family signed the agreement or transfer. As a general rule, for agreements and transfers that are signed before January 1, 1978, only those that are signed by the author(s) or their widows, widowers, children, next of kin or executors may be terminated. Please note that whether or not a given transfer has a termination right is a complex legal question. This tool does not attempt to determine whether any particular work in fact has a termination right. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
+                     "vi": {"title": "Post-1978 Grant by Non-Author",
+                            "description": "It is unlikely that works with the characteristics provided would have a termination right. As a general rule, for agreements and transfers that are entered into after January 1st, 1978, only those that are signed by the author may be terminated. Based on the information provided, it seems that someone other than the author or artist signed the agreement or transfer in question. Please note that whether or not a given transfer has a termination right is a complex legal question. This tool does not attempt to determine whether any particular work in fact has a termination right. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
+                     "vii": {"title": "Common law copyright grant (17 U.S.C. § 303)",
+                             "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the agreement or transfer may relate to works under \"common law copyright\"—protections the law gave to unpublished and unregistered works before 1978. The termination of transfer provisions appear to exclude agreements or transfers relating to common law copyright. Please consult a licensed attorney to determine whether a work with the characteristics provided are related to common law copyright and whether the termination right in fact exists for a given work."},
+                     "viii": {"title": "Public domain work",
+                              "description": "Works with the characterisitics provided would likely be in the public domain. Because works in the public domain are not protected by copyright, the termination of transfer provisions are inapplicable. Please consult a licensed attorney to determine whether a work with the characterisitcs provided are in the public domain and whether a termination right in fact exists for a given work."}}}}
diff --git a/src/js/rules.js b/src/js/rules.js
new file mode 100644
index 0000000..3b897d3
--- /dev/null
+++ b/src/js/rules.js
@@ -0,0 +1,505 @@
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+var Rules = {};
+
+Rules.simpleYesNoRule = function (variable_id, yesValue, noValue) {
+  return function () {
+    var result = undefined;
+    if (Values[variable_id] == 'yes') {
+      result = yesValue;
+    } else {
+      result = noValue;
+    }
+    return result;
+  };
+};
+
+Rules.jumpToFinish = 'finish';
+
+Rules.conclusion = function (conclusion) {
+  Values.conclusion = conclusion;
+  return Rules.jumpToFinish;
+};
+
+Rules.conclusionPDF = function (conclusion) {
+  Rules.conclusion(conclusion);
+  Values.conclusion_generate_pdf = true;
+  return Rules.jumpToFinish;
+};
+
+Rules.addFlag = function(flag) {
+  Values.flags.push(flag);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Calculated/inferred properties
+////////////////////////////////////////////////////////////////////////////////
+
+Rules.is203 = function () {
+  return (Values.conclusion == "A.iii");
+};
+
+Rules.is304 = function () {
+  return (['A.i', 'A.ii', 'A.i-ii'].indexOf(Values.conclusion) > -1);
+};
+
+Rules.hasPublicDomainFlags = function () {
+  var result = false;
+  for (var i = 0; i < Values.flags.length; i++) {
+    if (Values.flags[i][0] == 'B') {
+      result = true;
+    }
+  }
+  return result;
+};
+
+Rules.beforeEndOfNoticeWindow = function () {
+  return ((Values.notice_end != undefined)
+      && (Values.notice_end >= Values.current_year))
+    || ((Values.d_notice_end != undefined)
+    && (Values.d_notice_end >= Values.current_year))
+    || ((Values.p_notice_end != undefined)
+    && (Values.p_notice_end >= Values.current_year));
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Section N Analyses
+////////////////////////////////////////////////////////////////////////////////
+
+Rules.section304Analysis = function () {
+  // Note that this is part of the logic from the section 203 analysis
+  var result = 's1q1f';
+  if (Values.k_year < 1978) {
+    result = 's2q2a';
+    Rules.addFlag('F.i');
+    if ((Values.pub_year > 1977) && (Values.reg_year > 1977)) {
+      result = Rules.conclusion('B.vii');
+    } else {
+      // Under the 1909 Act, copyright term begins at the earlier of
+      // the registration date and the publication date.
+      // If the work is both registered and published use the minimum of them.
+      if ((Values.reg_year != undefined)
+          && (Values.pub_year != undefined)) {
+            Values.cright_year = Math.min(Values.pub_year,
+                                          Values.reg_year);
+      }
+      // Otherwise use whichever value is set. One *will* be set here, see top.
+      else {
+        Values.cright_year = Values.reg_year || Values.pub_year;
+      }
+      Values.cright_year = Math.min(Values.cright_year, 1978);
+      Values.term_begin = Values.cright_year + 56;
+      Values.term_begin = Math.max(Values.term_begin, 1978);
+      Values.term_end = Values.term_begin + 5;
+      Values.notice_begin = Values.term_begin - 10;
+      Values.notice_end = Values.term_end - 2;
+      // If the we're presently before the 304(c) window, then we don't have to worry about 304(d)
+	if (Values.notice_begin > Values.current_year) {
+        Rules.addFlag('A.i.a');
+       // Following Copyright Office guidance, works copyrighted before 1940 may also be eligible for termination under 304d
+       } else if (Values.cright_year < 1940) {
+          Rules.addFlag('F.ii');
+          Values.d_term_begin = Values.term_begin + 19;
+          Values.d_term_end = Values.d_term_begin + 5;
+          Values.d_notice_begin = Values.d_term_begin - 10;
+          Values.d_notice_end = Values.d_term_end - 2;
+          if (Values.cright_year > 1936) {
+            Rules.addFlag('G.i');
+          }
+          if (Values.cright_year == 1939) {
+            Rules.addFlag('G.ii.a');
+          }
+          if (Values.d_notice_begin > Values.current_year) {
+            // time traveler flag -- applies where the present day is between
+            // the 304(c) and 304(d) notice windows
+            Rules.addFlag('A.iii.a');
+          } else if (Values.d_notice_end < Values.current_year) {
+            Rules.addFlag('A.ii.a');
+          }
+       } else if (Values.notice_end < Values.current_year) {
+         Rules.addFlag('A.ii.a');
+       } else {
+         // Here for clarity / to reflect decision tree structure
+         // But note that we set it as the result above.
+         result = 's2q2a';
+       }
+    }
+    if ((Values.d_term_begin != undefined)
+        && (Values.term_begin != undefined)) {
+      Rules.addFlag('E.i');
+    }
+  }
+  return result;
+};
+
+Rules.section203Analysis = function () {
+  var result = 's2q2a';
+  if (typeof Values.grant_pub_year !== 'undefined') {
+    Rules.addFlag('F.iv');
+  }
+  Values.triggering_pub_year = Values.grant_pub_year || Values.pub_year;
+  if (Values.k_year > 1977) {
+    Rules.addFlag('F.iii');
+    if (Values.pub_right == 'yes' ) {
+      if (Values.triggering_pub_year != undefined) {
+        Values.term_begin = Math.min(Values.triggering_pub_year + 35 ,
+                                     Values.k_year + 40);
+      } else {
+        Values.term_begin = Values.k_year + 40;
+      }
+    } else if ((Values.triggering_pub_year != Values.k_year)
+           || (Values.pub_right == 'no'))  {
+      Values.term_begin = Values.k_year + 35;
+    }
+    if (Values.term_begin != undefined) {
+      Values.term_end = Values.term_begin + 5;
+      Values.notice_begin = Values.term_begin - 10;
+      Values.notice_end = Values.term_end - 2;
+      if (Values.notice_begin > Values.current_year) {
+        Rules.addFlag('A.i.a');
+      } else if (Values.notice_end < Values.current_year) {
+        Rules.addFlag('A.ii.a');
+      }
+    }
+    if (Values.pub_right == 'maybe') {
+      Values.p_term_begin = Values.k_year + 40;
+      if (Values.triggering_pub_year != undefined) {
+        Values.p_term_begin = Math.min(Values.triggering_pub_year + 35,
+                                       Values.p_term_begin);
+      }
+      Values.p_term_end = Values.p_term_begin  + 5;
+      Values.p_notice_begin = Values.p_term_begin - 10;
+      Values.p_notice_end = Values.p_term_end - 2;
+      if (Values.p_notice_begin > Values.current_year) {
+        Rules.addFlag('A.i.a');
+      } else if (Values.p_notice_end < Values.current_year) {
+        Rules.addFlag('A.ii.a');
+      }
+    }
+  }
+  if ((Values.p_term_begin != undefined)
+      && (Values.term_begin != undefined)) {
+      Rules.addFlag('E.ii');
+  }
+  return result;
+};
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Section 1
+////////////////////////////////////////////////////////////////////////////////
+
+// When was the work created?
+
+Rules.s1q1a = 's1q1b';
+
+// Has the work been published?
+
+Rules.s1q1b = Rules.simpleYesNoRule('work_published',
+                                    's1q1bi',
+                                    's1q1c');
+
+// When was the work first published?
+
+Rules.s1q1bi = 's1q1bii';
+
+// When was the work first published under the grant?
+// Note that the condition is based on s1q1b, we are inserting this question
+// after 'When was the work first published?' and *then* going on to the
+// questions about registration/notices or not.
+
+Rules.s1q1bii = function () {
+  var result = undefined;
+  if (Values.pub_year < 1923) {
+    result = Rules.conclusion('B.viii');
+  } else if (Values.pub_year < 1990)
+    result = 's1q1bi2';
+  else {
+    result = 's1q1d';
+  }
+  return result;
+};
+
+// Works from 1989 and earlier usually display a copyright notice...
+
+Rules.s1q1bi2 = function () {
+  var result = undefined;
+  if (Values.copyright_notice == 'yes') {
+    result = 's1q1c';
+  } else if (Values.copyright_notice == 'no') {
+    // The same
+    result = 's1q1c';
+    if (Values.pub_year < 1989) {
+      Rules.addFlag('B.i');
+    } else {
+      Rules.addFlag('B.ii');
+    }
+  } else /* maybe */ {
+    result = 's1q1c';
+    Rules.addFlag('B.iii');
+  }
+  return result;
+};
+
+// Has the work been registered with the United State Copyright Office?
+
+Rules.s1q1c = function () {
+  var result = undefined;
+  if (Values.work_registered == 'yes') {
+    result = 's1q1ci';
+  } else if (Values.work_registered == 'no') {
+    result = 's1q1d';
+  } else /* don't know */ {
+    // If someone doesn't know, continue without asking for registration number
+    result = 's1q1d';
+  }
+  return result;
+};
+
+// When was the work registered with the United States Copyright Office?
+
+Rules.s1q1ci = function () {
+  var result = undefined;
+  if (Values.reg_year < 1923) {
+    result = Rules.conclusion('B.viii');
+  } else {
+    result = 's1q1d';
+  }
+  return result;
+};
+
+// For s1q1d,
+// What is the date of the agreement or transfer? ...
+
+Rules.s1q1d = function () {
+  var result = undefined;
+  if (Values.user_inputted_k_year != Values.k_year) {
+    Rules.addFlag('H.i');
+  }
+  if ((Values.k_year < 1978)
+      && ((Values.pub_year == undefined)
+      && (Values.reg_year == undefined))) {
+      result = Rules.conclusion('B.vii');
+  } else {
+    // Intercept the result so we can add encouragement if things look good
+    result = Rules.section304Analysis();
+    if ((result != Rules.jumpToFinish)
+    && Rules.beforeEndOfNoticeWindow()
+    && (! Rules.hasPublicDomainFlags())) {
+    Notifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
+    }
+  }
+  return result;
+};
+
+// Did the agreement or transfer include the right of publication?
+
+Rules.s1q1f = function () {
+  // Intercept the result so we can add encouragement if things look good
+  var result = Rules.section203Analysis();
+  if ((result != Rules.jumpToFinish)
+      && Rules.beforeEndOfNoticeWindow()
+      && (! Rules.hasPublicDomainFlags())) {
+    Notifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
+  }
+  return result;
+};
+
+
+Rules.section203Analysis;
+
+////////////////////////////////////////////////////////////////////////////////
+// Section 2
+////////////////////////////////////////////////////////////////////////////////
+
+// Is the agreement or transfer you want to terminate part of a last will...
+
+Rules.s2q2a = function () {
+  var result = undefined;
+  if (Values.last_will == 'yes') {
+    result = Rules.conclusion('B.iv');
+  } else {
+    if ((Values.creation_year > 1977)
+    || (((Values.pub_year == undefined) || (Values.pub_year > 1977))
+        && ((Values.reg_year == undefined) || (Values.reg_year > 1977)))) {
+      result = 's2q2bi';
+    } else {
+      result = 's2q2c';
+    }
+  }
+  return result;
+};
+
+// Are any of the authors still alive?
+// It's i) because the conditional logic that starts b is included in a
+
+Rules.s2q2bi = function () {
+  var result = undefined;
+  if (Values.any_authors_alive == 'yes') {
+    result = 's2q2c'
+  } else {
+    result = 's2q2bi2';
+  }
+  return result;
+};
+
+// What is the year the last surviving author died?
+
+Rules.s2q2bi2 = function () {
+  var result = undefined;
+  // creation_year is always set, pub_year may not be, death will be here
+  if (Values.creation_year > 1977) {
+    Values.pd = Values.death + 71;
+  } else if ((Values.pub_year != undefined)
+     && (Values.pub_year < 2003)) {
+    Values.pd = Math.max((Values.death + 71), 2048);
+  } else {
+    Values.pd = Math.max((Values.death + 71), 2003);
+  }
+  // pd *will* have been set in the if/else block
+  if (Values.current_year > Values.pd) {
+    result = Rules.conclusion('B.viii');
+  } else {
+    result = 's2q2c';
+  }
+  return result;
+};
+
+// Was the work created within the scope of the author’s employment?
+
+Rules.s2q2c = function () {
+  var result = undefined;
+  if (Values.within_scope_of_employment == 'yes') {
+    if (Values.creation_year > 1977) {
+      result = 's2q2ci';
+    } else {
+      result = Rules.conclusion('B.i');
+    }
+  } else {
+    result = 's2q2d';
+  }
+  return result
+};
+
+// Was there an express agreement between you...
+
+Rules.s2q2ci = function () {
+  var result = undefined;
+   if (Values.express_agreement == 'yes') {
+    result = 's2q2d';
+   } else {
+     result = Rules.conclusion('B.i');
+  }
+  return result;
+};
+
+// Was the work created in response to a special order or commission?
+
+Rules.s2q2d = function () {
+  var result = undefined;
+  if (Values.special_order == 'yes') {
+    if (Values.creation_year < 1978) {
+      Rules.addFlag('D.i');
+      result = 's2q2e';
+    } else {
+      result = 's2q2di';
+    }
+  } else {
+    result = 's2q2e';
+  }
+  return result
+};
+
+// Was there a signed written agreement regarding the special order...
+
+Rules.s2q2di = function () {
+  var result = undefined;
+  if (Values.signed_written_agreement == 'yes') {
+    if (Values.creation_year < 1978) {
+      result = Rules.conclusion('B.iii');
+    } else {
+      result = 's2q2dia';
+    }
+  } else {
+    result = 's2q2e';
+  }
+  return result
+};
+
+// Was the work created for use as one of the following? ...
+
+Rules.s2q2dia = function () {
+  var result = undefined;
+  if (Values.created_as_part_of_motion_picture == 'yes') {
+    result = Rules.conclusion('C.ii');
+  } else if (Values.created_as_part_of_motion_picture == 'no') {
+    result = 's2q2e';
+  } else /* don't know */ {
+    Rules.addFlag('D.ii');
+    result = 's2q2e';
+  }
+  return result;
+};
+
+// Has the original transfer since been renegotiated or altered?
+
+Rules.s2q2e = function () {
+  var result = 's2q2f';
+  if (Values.renego == 'yes') {
+    Rules.addFlag('C.i');
+  } else if (Values.renego == 'no') {
+    // Continue
+  } else /* don't know */ {
+    Rules.addFlag('C.ii');
+  }
+  return result;
+};
+
+// Did one or more of the authors or artists enter into the agreement...
+
+Rules.s2q2f = function () {
+  var result = undefined;
+  if (Values.authors_entered_agreement == 'yes') {
+    if (Values.k_year < 1978) {
+      result = Rules.conclusionPDF('A.i-ii');
+    } else /*if (k_year > 1977)*/ {
+      result = Rules.conclusionPDF('A.iii');
+    }
+  } else {
+    if (Values.k_year < 1978) {
+      result = 's2q2fii';
+    } else /*if (Values.k_year > 1977)*/ {
+      result = Rules.conclusion('B.vi');
+    }
+  }
+  return result;
+};
+
+// Was the agreement or transfer made by a member of...
+
+Rules.s2q2fii = function () {
+  var result = undefined;
+  if (Values.agreement_by_family_or_executor) {
+    result = Rules.conclusionPDF('A.i-ii');
+  } else {
+    result = Rules.conclusion('B.v');
+  }
+  return result
+ };
diff --git a/src/js/validation.js b/src/js/validation.js
new file mode 100644
index 0000000..67e58c2
--- /dev/null
+++ b/src/js/validation.js
@@ -0,0 +1,68 @@
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Validation of values and of UI state
+////////////////////////////////////////////////////////////////////////////////
+
+var Validation = {};
+
+// Naughty. If we're going to monkeypatch we should have a file for these
+
+String.prototype.capitalizeFirstLetter = function() {
+    return this.charAt(0).toUpperCase() + this.slice(1);
+}
+
+Validation.allowOnlyNumbers = function (element) {
+  // http://stackoverflow.com/a/995193
+  element.keydown(function (e) {
+    // Allow: backspace, delete, tab, escape, enter and .
+    if (jQuery.inArray(e.keyCode, [46, 8, 9, 27, 13, 110, 190]) !== -1 ||
+        // Allow: Ctrl+A, Command+A
+        (e.keyCode == 65 && ( e.ctrlKey === true || e.metaKey === true ) ) ||
+        // Allow: home, end, left, right, down, up
+        (e.keyCode >= 35 && e.keyCode <= 40)) {
+      // let it happen, don't do anything
+      return;
+    }
+    // Ensure that it is a number and stop the keypress
+    if ((e.shiftKey || (e.keyCode < 48 || e.keyCode > 57))
+        && (e.keyCode < 96 || e.keyCode > 105)) {
+      e.preventDefault();
+    }
+  });
+};
+
+// false here means no errors, a string means errors
+
+Validation.validDate = function () {
+  var text_field = jQuery('.text-question');
+  var date = text_field.val();
+  var result = false;
+  var errors = [];
+  if (! date.match(/[0-9]{4}/)) {
+    errors.push("date must be four digits");
+  }
+  if (parseInt(date) > Values.current_year) {
+    errors.push("date must be in the past");
+  }
+  if (errors.length != 0) {
+    result = errors.join().capitalizeFirstLetter() + '.';
+  }
+  return result;
+};
diff --git a/src/js/values.js b/src/js/values.js
new file mode 100644
index 0000000..6952c06
--- /dev/null
+++ b/src/js/values.js
@@ -0,0 +1,74 @@
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Storing answers and computed values
+// Questions save their answers here,
+// Rules consult these values and add their own.
+////////////////////////////////////////////////////////////////////////////////
+
+var Values = {};
+
+Values.reset = function () {
+  var now = new Date();
+  Values = {
+    current_date: now,
+    current_year: now.getFullYear(),
+    flags: []
+  };
+};
+
+//FIXME: Hello namespace pollution
+
+var varsToTitles = {
+  work_authors: 'Author',
+  work_title: 'Title of Work',
+  creation_year: 'Creation Year',
+  pub_year: 'Publication Year',
+  grant_pub_year: 'Publication Year Under Grant',
+  triggering_pub_year: 'Triggering Publication Date',
+  k_year: 'Effective Grant Year',
+  user_inputted_k_year: 'User Entered Grant Year',
+  reg_year: 'Copyright Registration Year',
+  work_copyright_reg_num: 'Registration Number',
+  termination_type: 'Termination Type',
+  work_agreement_type: 'Agreement or Transfer Type',
+  work_agreement_desc: 'Agreement or Transfer Description',
+  //'': 'Grantor',
+};
+
+var ValuesStack = {};
+
+ValuesStack._stack = [];
+
+ValuesStack.height = function () {
+  return this._stack.length;
+};
+
+ValuesStack.push = function () {
+  // Handle the date not liking being serialized.
+  var now = Values.current_date;
+  this._stack.push(Values);
+  // Deep clone
+  Values = JSON.parse(JSON.stringify(Values));
+  Values.current_date = now;
+};
+
+ValuesStack.pop = function () {
+  Values = this._stack.pop();
+};
diff --git a/src/js/widgets.js b/src/js/widgets.js
new file mode 100644
index 0000000..0ff4855
--- /dev/null
+++ b/src/js/widgets.js
@@ -0,0 +1,160 @@
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Control of the html UI
+////////////////////////////////////////////////////////////////////////////////
+
+var Widgets = {};
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual display of the user's responses
+////////////////////////////////////////////////////////////////////////////////
+
+var Answers = {};
+
+Answers.resetAnswers = function () {
+  jQuery('#answers-table-rows').empty();
+};
+
+Answers.appendAnswer = function (myId, label, value) {
+  if (! label) {
+    label = jQuery('#' + myId + '> label').first().text();
+  }
+  // If the user has gone back and is changing the answer, first remove it
+  Answers.removeAnswer(myId);
+  jQuery('#answers-table-rows').append('<tr id="answer-row-' + myId + '"><td>'
+				       + label + '</td><td align="right">'
+				       + value  + '</td></tr>');
+};
+
+Answers.removeAnswer = function (myId) {
+  jQuery('#answer-row-' + myId).remove();
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Notifications and other notices
+////////////////////////////////////////////////////////////////////////////////
+
+var Notifications = {};
+
+Notifications.clearAlerts = function () {
+  jQuery('#alert-area').empty();
+};
+
+Notifications.setAlert = function (message) {
+  Notifications.clearAlerts();
+  jQuery('#alert-area').append('<div class="alert alert-warning" role="alert">'
+                               + message
+                               + '</div>');
+};
+
+Notifications.setEncouragement = function (message) {
+  Notifications.clearAlerts();
+  jQuery('#alert-area').append('<div class="alert alert-success" role="alert">'
+                               + message
+                               + '</div>');
+};
+
+Notifications.displayAnswersHint = function () {
+  jQuery('#answers-table-rows').append('<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>');
+};
+
+Notifications.removeAnswersHint = function () {
+  jQuery('#answers-table-row-placeholder').remove();
+};
+
+Notifications.displayResultArea = function () {
+  jQuery('#result-area').removeClass('hidden');
+};
+
+Notifications.hideResultArea = function () {
+  jQuery('#result-area').addClass('hidden');
+};
+
+Notifications.setResultAreaMessage = function (obj, panelClass) {
+  jQuery('#result-area').addClass(panelClass);
+  jQuery('#result-area-title').html(obj.title);
+  jQuery('#result-area-message').html(obj.description);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Navigation of questions
+////////////////////////////////////////////////////////////////////////////////
+
+var Navigation = {};
+
+Navigation.progressStack = [];
+
+// These return true so we can use them as "handlers" in simpleNextQuestion
+
+Navigation.disableNext = function () {
+  jQuery('#button-question-next').prop("disabled", true);
+  return true;
+};
+
+Navigation.disablePrevious = function () {
+  jQuery('#button-question-back').prop("disabled", true);
+  return true;
+};
+
+Navigation.enableNext = function () {
+  jQuery('#button-question-next').prop("disabled", false);
+  return true;
+};
+
+Navigation.enablePrevious = function () {
+  jQuery('#button-question-back').prop("disabled", false);
+  return true;
+};
+
+Navigation.showNextPrevious = function () {
+  jQuery("#question-progress-buttons").removeClass('hidden');
+};
+
+Navigation.hideQuestions = function () {
+  jQuery('#questionnaire-section').addClass('hidden');
+  jQuery('.form-group').addClass('hidden');
+};
+
+Navigation.showQuestions = function () {
+  jQuery('#questionnaire-section').removeClass('hidden');
+  jQuery('.form-group').removeClass('hidden');
+};
+
+Navigation.hideNoJSWarning = function () {
+};
+
+Navigation.showAnswersTable = function () {
+  jQuery("#answers-table").removeClass('hidden');
+};
+
+// After this, do not restart the questionnaire, reload the page to restart
+
+Navigation.finishQuestions = function () {
+  Navigation.hideQuestions();
+  Notifications.displayResultArea();
+  Navigation.disableNext();
+  jQuery("#button-restart").removeClass('hidden');
+};
+
+Navigation.unfinishQuestions = function () {
+  Navigation.showQuestions();
+  Notifications.hideResultArea();
+  jQuery("#button-restart").addClass('hidden');
+};
diff --git a/src/tot/Result.php b/src/tot/Result.php
new file mode 100644
index 0000000..e69de29
diff --git a/src/tot/TerminationOfTransfer.php b/src/tot/TerminationOfTransfer.php
index 65cd172..c2bbaea 100644
--- a/src/tot/TerminationOfTransfer.php
+++ b/src/tot/TerminationOfTransfer.php
@@ -30,7 +30,7 @@ protected function registerScripts()
             $script = \explode('/', $value);
             if (isset($script[1])) {
                 $n = $script[1];
-                wp_enqueue_script( "tot-$n", plugins_url( "$value.js", __FILE__ ) );
+                wp_enqueue_script( "tot-$n", plugins_url( "src/$value.js", __FILE__ ) );
             } else {
                 wp_enqueue_script($value);
             }
@@ -43,7 +43,7 @@ protected function registerStyles()
             $style = \explode('/', $value);
             if (isset($style[1])) {
                 $n = $style[1];
-                wp_enqueue_style( "tot-style-$n", plugins_url( "$value.css", __FILE__ ) );
+                wp_enqueue_style( "tot-style-$n", plugins_url( "src/$value.css", __FILE__ ) );
             } else {
                 wp_enqueue_style($value);
             }

From bc43a30ff34c6a1402cba968ca6354bf107e487a Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 19:08:06 +0100
Subject: [PATCH 028/196] updated result logic

---
 src/js/pdf.js         |   4 +-
 src/tot/Result.php    |   0
 src/tot/ResultPdf.php | 153 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+), 2 deletions(-)
 delete mode 100644 src/tot/Result.php
 create mode 100644 src/tot/ResultPdf.php

diff --git a/src/js/pdf.js b/src/js/pdf.js
index 5748eee..641159c 100644
--- a/src/js/pdf.js
+++ b/src/js/pdf.js
@@ -23,9 +23,9 @@
 
 var PDF = {};
 
-PDF.url = jQuery("script[src*='/termination-of-transfer/js/pdf.js']")
+PDF.url = jQuery("script[src*='/termination-of-transfer/src/js/pdf.js']")
 	       .attr('src').replace(/js\/pdf\.js.*$/, '')
-	       + 'result-pdf.php';
+	       + 'tot/ResultPdf.php';
 
 PDF.appendProperty = function (details, key, value) {
   var mapping = {key: key,
diff --git a/src/tot/Result.php b/src/tot/Result.php
deleted file mode 100644
index e69de29..0000000
diff --git a/src/tot/ResultPdf.php b/src/tot/ResultPdf.php
new file mode 100644
index 0000000..c218c39
--- /dev/null
+++ b/src/tot/ResultPdf.php
@@ -0,0 +1,153 @@
+<?php
+namespace CreativeCommons_TOT\tot;
+
+use Smarty;
+use Mpdf\Mpdf;
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016, 2017 Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class ResultPdf
+{
+    public $data;
+
+    protected $results_strings;
+
+    protected $flags;
+
+    protected $conclusion_path;
+
+    protected $conclusion_section;
+
+    protected $conclusion_title;
+
+    protected $conclusion_details;
+
+    protected $conclusion_subtitle;
+
+    protected $conclusion_description;
+
+    public function __construct()
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+        // Make sure we have the data to decode
+        ////////////////////////////////////////////////////////////////////////////////
+
+        if (! isset($_POST['data'])) {
+            exit('No data provided.');
+        }
+    }
+
+    public function init()
+    {
+        $this->validate();
+        $this->getFlags();
+    }
+
+    public function validate()
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+        // Decode the data
+        ////////////////////////////////////////////////////////////////////////////////
+
+        $data = json_decode($_POST['data'], true);
+
+        ////////////////////////////////////////////////////////////////////////////////
+        // Make sure the data is well-structured
+        ////////////////////////////////////////////////////////////////////////////////
+
+        if (!isset($data['report_timestamp'])) {
+            exit('Report timestamp not provided.');
+        }
+
+        if (!isset($data['conclusion'])) {
+            exit('Conclusion not provided.');
+        }
+
+        if (!isset($data['flags'])) {
+            exit('Flags not provided.');
+        }
+
+        if (!isset($data['details'])) {
+            exit('Details not provided.');
+        }
+        $this->data = $data;
+    }
+
+    public function flagTitleAndDescription ($spec)
+    {
+        $results_json = file_get_contents(\dirname(__DIR__ ). '/js/results.json');
+        $this->results_strings = json_decode($results_json, true);
+        $path = explode('.', $spec);
+        // A, B, C, D
+        $section = $this->results_strings['Flag'][$path[0]];
+        // i, ii, iii
+        $subsection = $section[$path[1]];
+        // For historical reasons, some flags take their section title and have
+        // their description under 'b', and others have their own title and their
+        // description under 'description'
+        if (array_key_exists('description', $subsection)) {
+            $title = $subsection['title'];
+            $description = $subsection['description'];
+        } else {
+            $title = $section['title'];
+            $description = $subsection['b'];
+        }
+        return [$title, $description];
+    }
+
+    public function getFlags()
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+        // Flag and conclusion expansion
+        ////////////////////////////////////////////////////////////////////////////////
+        $this->flags = array_map([$this, 'flagTitleAndDescription'], $this->data['flags']);
+        $this->conclusion_path = explode('.', $this->data['conclusion']);
+        $this->conclusion_section = $this->results_strings['Conclusion'][$this->conclusion_path[0]];
+        $this->conclusion_title = $this->conclusion_section['title'];
+        $this->conclusion_details = $this->conclusion_section[$this->conclusion_path[1]];
+        $this->conclusion_subtitle = $this->conclusion_details['title'];
+        $this->conclusion_description = $this->conclusion_details['description'];
+    }
+
+    public function generatePdf()
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+        // Fill out the template with the details from the provided data
+        ////////////////////////////////////////////////////////////////////////////////
+
+        $now_timestamp = intval($this->data['report_timestamp']);
+
+        $smarty = new Smarty;
+        $smarty->setCompileDir(\dirname(__DIR__) . '/../templates_c');
+        $smarty->assign('date', date('jS F Y', $now_timestamp));
+        $smarty->assign('flags', $this->flags);
+        $smarty->assign('details', $this->data['details']);
+        $smarty->assign('conclusion_title', $this->conclusion_title);
+        $smarty->assign('conclusion_subtitle', $this->conclusion_subtitle);
+        $smarty->assign('conclusion_description', $this->conclusion_description);
+        $html = $smarty->fetch(\dirname(__DIR__) . '/../template/result.tpl');
+
+        ////////////////////////////////////////////////////////////////////////////////
+        // Generate and return the PDF
+        ////////////////////////////////////////////////////////////////////////////////
+
+        $mpdf = new mPDF();
+        $mpdf->WriteHTML($html);
+        $mpdf->Output('ToT.pdf', 'I');
+    }
+}

From 1bffee9b96545587744e371d02215ddc447671a3 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 19:11:06 +0100
Subject: [PATCH 029/196] updated php version to 7.4 and WordPress version to
 5.0

---
 composer.json                     | 2 +-
 src/tot/TerminationOfTransfer.php | 4 ++--
 termination-of-transfer.php       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 98f9e51..4f42970 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=5.4",
+        "php": ">=7.4",
         "mpdf/mpdf": "^6.0",
         "smarty/smarty": "^3.1"
     },
diff --git a/src/tot/TerminationOfTransfer.php b/src/tot/TerminationOfTransfer.php
index c2bbaea..3ee327b 100644
--- a/src/tot/TerminationOfTransfer.php
+++ b/src/tot/TerminationOfTransfer.php
@@ -52,9 +52,9 @@ protected function registerStyles()
 
     public function run()
     {
-        if ( ! version_compare( PHP_VERSION, '5.4', '>=' ) ) {
+        if ( ! version_compare( PHP_VERSION, '7.4', '>=' ) ) {
             add_action( 'admin_notices', 'fail_php_version' );
-        } elseif ( ! version_compare( get_bloginfo( 'version' ), '4.0', '>=' ) ) {
+        } elseif ( ! version_compare( get_bloginfo( 'version' ), '5.0', '>=' ) ) {
             add_action( 'admin_notices', 'fail_wp_version' );
         } else {
             add_shortcode( 'termination-of-transfer-tool', [$this, 'handleShortcode'] );
diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index 8d17bcf..5882a9b 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -27,7 +27,7 @@
 Version: 1.0.0
 Author: Creative Commons Corporation
 Author URI: https://github.com/creativecommons/
-Requires PHP: 5.4.0
+Requires PHP: 7.4.0
 */
 
 add_action('plugins_loaded', 'termination_of_transfer_tool_init');

From 63528900afdefcb256e9fac77d5b043fed2e5689 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 19:52:48 +0100
Subject: [PATCH 030/196] updated ResultPdf to run sode

---
 src/tot/ResultPdf.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tot/ResultPdf.php b/src/tot/ResultPdf.php
index c218c39..be1cd55 100644
--- a/src/tot/ResultPdf.php
+++ b/src/tot/ResultPdf.php
@@ -148,6 +148,10 @@ public function generatePdf()
 
         $mpdf = new mPDF();
         $mpdf->WriteHTML($html);
-        $mpdf->Output('ToT.pdf', 'I');
+        return $mpdf->Output('ToT.pdf', 'I');
     }
 }
+
+$result = new ResultPdf();
+$result->init();
+return $result->generatePdf();

From 2985464f37b854ad4cb0ab854a79c9bba6857b9b Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 19:57:19 +0100
Subject: [PATCH 031/196] changed generateHtml method to public

---
 src/tot/WpPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tot/WpPlugin.php b/src/tot/WpPlugin.php
index 4bf0c27..4a854e7 100644
--- a/src/tot/WpPlugin.php
+++ b/src/tot/WpPlugin.php
@@ -20,7 +20,7 @@ public function __construct()
     /**
      * This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ... 
      */
-    protected function generateHtml()
+    public function generateHtml()
     {
         $tot_tool_html = <<<'EOD'
             <div class="panel panel-info hidden" id="answers-table">

From ca6dd6d0b3bd2b0953a05f9a962b5474733a1a1c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 20:00:17 +0100
Subject: [PATCH 032/196] added docker-compose.dev.yml to enable real time
 docker testing as file changes

---
 docker-compose.dev.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docker-compose.dev.yml

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..e69de29

From 5329c362238d066df093cc596734fed5b9df8bd9 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 20:18:40 +0100
Subject: [PATCH 033/196] updated services in docker-compose.dev.yml

---
 docker-compose.dev.yml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index e69de29..cd596be 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -0,0 +1,36 @@
+version: '3.3'
+
+services:
+ tot-wp:
+  build:
+   context: .
+  restart: always
+  environment:
+    WORDPRESS_DB_PASSWORD: SqlNotTooMuch
+    WORDPRESS_DB_USER: codex
+  ports:
+   - 8080:80
+  networks:
+    tot-server:
+  volumes:
+   - tot-space:/etc/php
+
+ mariadb:
+  image: mariadb
+  restart: always
+  ports:
+   - 3006:3306
+  networks:
+    tot-server:
+  environment:
+    MARIADB_ROOT_PASSWORD: NotTooMuch
+    MARIADB_USER: codex
+    MARIADB_PASSWORD: SqlNotTooMuch
+  volumes:
+   #- ./my.cnf:/etc/mysql/my.cf
+   - tot-space:/var/lib/mysql
+  #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
+volumes:
+ tot-space:
+networks:
+  tot-server:
\ No newline at end of file

From cc23ca19dd307d577dff87b14a100139c8c29af2 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 20:57:59 +0100
Subject: [PATCH 034/196] cd to plugin directory before runing composer install
 in Dockerfile

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 3d1e432..a09515c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,4 +6,6 @@ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 
+RUN cd /var/www/html/wp-content/plugins/termination-of-transfer
+
 RUN composer install

From 83ec4e3e0ea7de011bfabe7a9fe2ecd759e69d13 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 21:03:43 +0100
Subject: [PATCH 035/196] changed composer location in Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a09515c..47deb27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM wordpress:php7.4-fpm-alpine
 
-COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:latest /usr/bin/composer /bin/sh/composer
 
 COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 

From 4a27e0424ddcc08ede92b413dcf82eb92856e7c9 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 21:32:34 +0100
Subject: [PATCH 036/196] updated composer install in Dockerfile

---
 Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 47deb27..8c3945a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,13 @@
 
 FROM wordpress:php7.4-fpm-alpine
 
-COPY --from=composer:latest /usr/bin/composer /bin/sh/composer
+WORKDIR /app
 
-COPY . /var/www/html/wp-content/plugins/termination-of-transfer
+RUN apk update && apk add curl
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-RUN cd /var/www/html/wp-content/plugins/termination-of-transfer
+COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 
-RUN composer install
+RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install

From 018d8a06aca1ae1cc55185f1fd23c265ec203282 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 21:40:46 +0100
Subject: [PATCH 037/196] updated ports in docker-compose

---
 docker-compose.dev.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index cd596be..8527277 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -9,7 +9,7 @@ services:
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
   ports:
-   - 8080:80
+   - 3003:80
   networks:
     tot-server:
   volumes:
@@ -19,7 +19,7 @@ services:
   image: mariadb
   restart: always
   ports:
-   - 3006:3306
+   - 3306:3306
   networks:
     tot-server:
   environment:

From a541995f5bc9d33a25e565e1afac1bdc23f276c4 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 21:43:40 +0100
Subject: [PATCH 038/196] updated ports in docker-compose

---
 docker-compose.dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 8527277..6c48361 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -19,7 +19,7 @@ services:
   image: mariadb
   restart: always
   ports:
-   - 3306:3306
+   - 3006:3306
   networks:
     tot-server:
   environment:

From c219dbf9eae9c88dfa11162f58809d4d1858609f Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 22:29:57 +0100
Subject: [PATCH 039/196] updated Dockerfile comments and made it lite

---
 Dockerfile             | 9 ++++-----
 docker-compose.dev.yml | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8c3945a..741f938 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,13 @@
 # syntax=docker/dockerfile:experimental
 
-FROM wordpress:php7.4-fpm-alpine
-
-WORKDIR /app
-
-RUN apk update && apk add curl
+# use wordpress image as the base image
+FROM wordpress
 
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
+# copy all the files in this folder to plugins directory
 COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 
+# cd to plugin directory AND install plugin dependencies
 RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 6c48361..f496da9 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -9,7 +9,7 @@ services:
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
   ports:
-   - 3003:80
+   - 8701:80
   networks:
     tot-server:
   volumes:
@@ -28,9 +28,10 @@ services:
     MARIADB_PASSWORD: SqlNotTooMuch
   volumes:
    #- ./my.cnf:/etc/mysql/my.cf
-   - tot-space:/var/lib/mysql
+   - tot:/var/lib/mysql
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
 volumes:
  tot-space:
+ tot:
 networks:
   tot-server:
\ No newline at end of file

From c8df75891fbd7aa4f0ff72bcba26cb97c2198a0e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 22:44:50 +0100
Subject: [PATCH 040/196] added phpmyadmin to docker-compose

---
 docker-compose.dev.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index f496da9..4d1278a 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -6,8 +6,13 @@ services:
    context: .
   restart: always
   environment:
+    WORDPRESS_DEBUG: 1
+    WORDPRESS_DB_HOST: 172.19.0.1
+    WORDPRESS_DB_NAME: cc_tot
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
+  extra_hosts:
+   - 'host.docker.internal:108.61.222.241'
   ports:
    - 8701:80
   networks:
@@ -30,6 +35,21 @@ services:
    #- ./my.cnf:/etc/mysql/my.cf
    - tot:/var/lib/mysql
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
+
+  phpmyadmin:
+   image: phpmyadmin
+   restart: always
+   ports:
+    - 3010:80
+   environment:
+    - PMA_ARBITRARY=0
+    - PMA_PORT=3006
+    - PMA_HOST=172.19.0.1
+   networks:
+    server:
+   extra_hosts:
+    - 'host.docker.internal:108.61.222.241'
+
 volumes:
  tot-space:
  tot:

From 33fb5328029c717ac9863110ce7ca523111b3f1a Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 11 Oct 2022 23:02:31 +0100
Subject: [PATCH 041/196] updated container ip in docker-compose

---
 docker-compose.dev.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 4d1278a..d9b37cc 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,7 +7,7 @@ services:
   restart: always
   environment:
     WORDPRESS_DEBUG: 1
-    WORDPRESS_DB_HOST: 172.19.0.1
+    WORDPRESS_DB_HOST: 172.21.0.3
     WORDPRESS_DB_NAME: cc_tot
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
@@ -36,7 +36,7 @@ services:
    - tot:/var/lib/mysql
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
 
-  phpmyadmin:
+ phpmyadmin:
    image: phpmyadmin
    restart: always
    ports:
@@ -44,9 +44,9 @@ services:
    environment:
     - PMA_ARBITRARY=0
     - PMA_PORT=3006
-    - PMA_HOST=172.19.0.1
+    - PMA_HOST=172.21.0.3
    networks:
-    server:
+    tot-server:
    extra_hosts:
     - 'host.docker.internal:108.61.222.241'
 

From f0aa96ca33c358ff6f9bd4866454c1f7638ab79c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 01:05:39 +0100
Subject: [PATCH 042/196] connected to docker mariadb server

---
 Dockerfile             |   3 +
 docker-compose.dev.yml |  16 +++--
 my.cnf                 | 134 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 144 insertions(+), 9 deletions(-)
 create mode 100644 my.cnf

diff --git a/Dockerfile b/Dockerfile
index 741f938..2112bab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,9 @@
 # use wordpress image as the base image
 FROM wordpress
 
+# install mysql-client to enable databse management from container
+RUN apt-get update && apt-get install mariadb-client -y 
+
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index d9b37cc..b34e9e7 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,13 +1,13 @@
 version: '3.3'
 
 services:
- tot-wp:
+ wp:
   build:
    context: .
   restart: always
   environment:
     WORDPRESS_DEBUG: 1
-    WORDPRESS_DB_HOST: 172.21.0.3
+    WORDPRESS_DB_HOST: 172.25.0.3
     WORDPRESS_DB_NAME: cc_tot
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
@@ -23,8 +23,6 @@ services:
  mariadb:
   image: mariadb
   restart: always
-  ports:
-   - 3006:3306
   networks:
     tot-server:
   environment:
@@ -32,8 +30,8 @@ services:
     MARIADB_USER: codex
     MARIADB_PASSWORD: SqlNotTooMuch
   volumes:
-   #- ./my.cnf:/etc/mysql/my.cf
-   - tot:/var/lib/mysql
+   - ./my.cnf:/etc/mysql/my.cf
+   - tot-sql:/var/lib/mysql
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
 
  phpmyadmin:
@@ -43,8 +41,8 @@ services:
     - 3010:80
    environment:
     - PMA_ARBITRARY=0
-    - PMA_PORT=3006
-    - PMA_HOST=172.21.0.3
+    #- PMA_PORT=3006
+    - PMA_HOST=172.25.0.3
    networks:
     tot-server:
    extra_hosts:
@@ -52,6 +50,6 @@ services:
 
 volumes:
  tot-space:
- tot:
+ tot-sql:
 networks:
   tot-server:
\ No newline at end of file
diff --git a/my.cnf b/my.cnf
new file mode 100644
index 0000000..bdafc54
--- /dev/null
+++ b/my.cnf
@@ -0,0 +1,134 @@
+#
+# These groups are read by MariaDB server.
+# Use it for options that only the server (but not clients) should see
+#
+# See the examples of server my.cnf files in /usr/share/mysql/
+#
+
+# this is read by the standalone daemon and embedded servers
+[server]
+
+# this is only for the mysqld standalone daemon
+[mysqld]
+
+#
+# * Basic Settings
+#
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+lc-messages-dir	= /usr/share/mysql
+skip-external-locking
+
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address		= 0.0.0.0
+
+#
+# * Fine Tuning
+#
+key_buffer_size		= 16M
+max_allowed_packet	= 16M
+thread_stack		= 192K
+thread_cache_size       = 8
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+myisam_recover_options  = BACKUP
+#max_connections        = 100
+#table_cache            = 64
+#thread_concurrency     = 10
+
+#
+# * Query Cache Configuration
+#
+query_cache_limit	= 1M
+query_cache_size        = 16M
+
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+#
+# Error log - should be very few entries.
+#
+log_error = /var/log/mysql/error.log
+#
+# Enable the slow query log to see queries with especially long duration
+#slow_query_log_file	= /var/log/mysql/mariadb-slow.log
+#long_query_time = 10
+#log_slow_rate_limit	= 1000
+#log_slow_verbosity	= query_plan
+#log-queries-not-using-indexes
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id		= 1
+#log_bin			= /var/log/mysql/mysql-bin.log
+expire_logs_days	= 10
+max_binlog_size   = 100M
+#binlog_do_db		= include_database_name
+#binlog_ignore_db	= exclude_database_name
+
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates you can use for example the GUI tool "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+#
+# Accept only connections using the latest and most secure TLS protocol version.
+# ..when MariaDB is compiled with OpenSSL:
+# ssl-cipher=TLSv1.2
+# ..when MariaDB is compiled with YaSSL (default in Debian):
+# ssl=on
+
+#
+# * Character sets
+#
+# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full
+# utf8 4-byte character set. See also client.cnf
+#
+character-set-server  = utf8mb4
+collation-server      = utf8mb4_general_ci
+
+#
+# * Unix socket authentication plugin is built-in since 10.0.22-6
+#
+# Needed so the root database user can authenticate without a password but
+# only when running as the unix root user.
+#
+# Also available for other users if required.
+# See https://mariadb.com/kb/en/unix_socket-authentication-plugin/
+
+# this is only for embedded server
+[embedded]
+
+# This group is only read by MariaDB servers, not by MySQL.
+# If you use the same .cnf file for MySQL and MariaDB,
+# you can put MariaDB-only options here
+[mariadb]
+
+# This group is only read by MariaDB-10.1 servers.
+# If you use the same .cnf file for MariaDB of different versions,
+# use this group for options that older servers don't understand
+[mariadb-10.1]
\ No newline at end of file

From ed5a435d63246d1ecb4a18ba6ed593a5bbd38d68 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 01:07:04 +0100
Subject: [PATCH 043/196] updated database name

---
 docker-compose.dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index b34e9e7..a76363d 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -8,7 +8,7 @@ services:
   environment:
     WORDPRESS_DEBUG: 1
     WORDPRESS_DB_HOST: 172.25.0.3
-    WORDPRESS_DB_NAME: cc_tot
+    WORDPRESS_DB_NAME: wordpress
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
   extra_hosts:

From 8630d41a827c89e1f062188c288ac42a8ce0427c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 01:29:17 +0100
Subject: [PATCH 044/196] updated ip

---
 docker-compose.dev.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index a76363d..328216d 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,7 +7,7 @@ services:
   restart: always
   environment:
     WORDPRESS_DEBUG: 1
-    WORDPRESS_DB_HOST: 172.25.0.3
+    WORDPRESS_DB_HOST: 172.25.0.2
     WORDPRESS_DB_NAME: wordpress
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
@@ -42,7 +42,7 @@ services:
    environment:
     - PMA_ARBITRARY=0
     #- PMA_PORT=3006
-    - PMA_HOST=172.25.0.3
+    - PMA_HOST=172.25.0.2
    networks:
     tot-server:
    extra_hosts:

From 3ef5559eb0a0857a29f7e064e58ed524164d1e52 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 01:52:12 +0100
Subject: [PATCH 045/196] updated namespace

---
 Dockerfile                  | 3 ---
 composer.json               | 2 +-
 termination-of-transfer.php | 2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2112bab..741f938 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,6 @@
 # use wordpress image as the base image
 FROM wordpress
 
-# install mysql-client to enable databse management from container
-RUN apt-get update && apt-get install mariadb-client -y 
-
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
diff --git a/composer.json b/composer.json
index 4f42970..99c9f51 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     },
     "autoload": {
-        "psr-4": {"CreativeCommons_TOT\\": "src"}
+        "psr-4": {"CreativeCommons_TOT\\": "./src"}
     },
     "repositories": [
         {
diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index 5882a9b..d4e572c 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -1,4 +1,6 @@
 <?php
+require_once ABSPATH . 'vendor/autoload.php';
+
 use CreativeCommons_TOT\tot\Plugin;
 use CreativeCommons_TOT\tot\TerminationOfTransfer;
 

From 4e63e6b51e939cb763ea5871429635b6d8a26025 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 02:35:22 +0100
Subject: [PATCH 046/196] updated namespace and ip

---
 autoload.php                            | 8 ++++++++
 composer.json                           | 2 +-
 docker-compose.dev.yml                  | 6 +++---
 src/{tot => }/Plugin.php                | 2 +-
 src/{tot => }/ResultPdf.php             | 2 +-
 src/{tot => }/TerminationOfTransfer.php | 2 +-
 src/{tot => }/WpPlugin.php              | 2 +-
 src/js/pdf.js                           | 2 +-
 termination-of-transfer.php             | 5 +++--
 9 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 autoload.php
 rename src/{tot => }/Plugin.php (96%)
 rename src/{tot => }/ResultPdf.php (99%)
 rename src/{tot => }/TerminationOfTransfer.php (98%)
 rename src/{tot => }/WpPlugin.php (98%)

diff --git a/autoload.php b/autoload.php
new file mode 100644
index 0000000..cdb5d33
--- /dev/null
+++ b/autoload.php
@@ -0,0 +1,8 @@
+spl_autoload_register( 'tot_autoloader' );
+function tot_autoloader( $class_name ) {
+  if ( false !== strpos( $class_name, 'CreativeCommons_TOT' ) ) {
+    $classes_dir = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR;
+    $class_file = str_replace( '\\', DIRECTORY_SEPARATOR, $class_name ) . '.php';
+    require_once $classes_dir . $class_file;
+  }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 99c9f51..14e4f34 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     },
     "autoload": {
-        "psr-4": {"CreativeCommons_TOT\\": "./src"}
+        "psr-4": {"CreativeCommons_TOT\\tot\\": "./src"}
     },
     "repositories": [
         {
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 328216d..cb5a3e5 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,7 +7,7 @@ services:
   restart: always
   environment:
     WORDPRESS_DEBUG: 1
-    WORDPRESS_DB_HOST: 172.25.0.2
+    WORDPRESS_DB_HOST: 172.25.0.3
     WORDPRESS_DB_NAME: wordpress
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
@@ -42,7 +42,7 @@ services:
    environment:
     - PMA_ARBITRARY=0
     #- PMA_PORT=3006
-    - PMA_HOST=172.25.0.2
+    - PMA_HOST=172.25.0.3
    networks:
     tot-server:
    extra_hosts:
@@ -52,4 +52,4 @@ volumes:
  tot-space:
  tot-sql:
 networks:
-  tot-server:
\ No newline at end of file
+  tot-server:
diff --git a/src/tot/Plugin.php b/src/Plugin.php
similarity index 96%
rename from src/tot/Plugin.php
rename to src/Plugin.php
index 4bfdb3f..9ce0148 100644
--- a/src/tot/Plugin.php
+++ b/src/Plugin.php
@@ -1,5 +1,5 @@
 <?php
-namespace CreativeCommons_TOT\tot;
+namespace CreativeCommons_TOT;
 
 /**
  * Serves as a container for the plugin
diff --git a/src/tot/ResultPdf.php b/src/ResultPdf.php
similarity index 99%
rename from src/tot/ResultPdf.php
rename to src/ResultPdf.php
index be1cd55..ec591b0 100644
--- a/src/tot/ResultPdf.php
+++ b/src/ResultPdf.php
@@ -1,5 +1,5 @@
 <?php
-namespace CreativeCommons_TOT\tot;
+namespace CreativeCommons_TOT;
 
 use Smarty;
 use Mpdf\Mpdf;
diff --git a/src/tot/TerminationOfTransfer.php b/src/TerminationOfTransfer.php
similarity index 98%
rename from src/tot/TerminationOfTransfer.php
rename to src/TerminationOfTransfer.php
index 3ee327b..1178927 100644
--- a/src/tot/TerminationOfTransfer.php
+++ b/src/TerminationOfTransfer.php
@@ -1,5 +1,5 @@
 <?php
-namespace CreativeCommons_TOT\tot;
+namespace CreativeCommons_TOT;
 
 /**
  * Handles HTML generating nd shortcode logics
diff --git a/src/tot/WpPlugin.php b/src/WpPlugin.php
similarity index 98%
rename from src/tot/WpPlugin.php
rename to src/WpPlugin.php
index 4a854e7..0faceaa 100644
--- a/src/tot/WpPlugin.php
+++ b/src/WpPlugin.php
@@ -1,5 +1,5 @@
 <?php
-namespace CreativeCommons_TOT\tot;
+namespace CreativeCommons_TOT;
 
 abstract class WpPlugin
 {
diff --git a/src/js/pdf.js b/src/js/pdf.js
index 641159c..a9b6b65 100644
--- a/src/js/pdf.js
+++ b/src/js/pdf.js
@@ -25,7 +25,7 @@ var PDF = {};
 
 PDF.url = jQuery("script[src*='/termination-of-transfer/src/js/pdf.js']")
 	       .attr('src').replace(/js\/pdf\.js.*$/, '')
-	       + 'tot/ResultPdf.php';
+	       + 'ResultPdf.php';
 
 PDF.appendProperty = function (details, key, value) {
   var mapping = {key: key,
diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index d4e572c..f9677ab 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -1,8 +1,9 @@
 <?php
 require_once ABSPATH . 'vendor/autoload.php';
+include_once ABSPATH . 'autoload.php';
 
-use CreativeCommons_TOT\tot\Plugin;
-use CreativeCommons_TOT\tot\TerminationOfTransfer;
+use CreativeCommons_TOT\Plugin;
+use CreativeCommons_TOT\TerminationOfTransfer;
 
 /*
     Termination of Transfer - tool to help in returning authors rights.

From 6b7b5130ff07d578c0583ed5afb2ca9c37024720 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 02:39:12 +0100
Subject: [PATCH 047/196] updated namespace and ip

---
 Dockerfile             | 2 +-
 docker-compose.dev.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 741f938..671d169 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,4 +10,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 
 # cd to plugin directory AND install plugin dependencies
-RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install
+RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index cb5a3e5..328216d 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,7 +7,7 @@ services:
   restart: always
   environment:
     WORDPRESS_DEBUG: 1
-    WORDPRESS_DB_HOST: 172.25.0.3
+    WORDPRESS_DB_HOST: 172.25.0.2
     WORDPRESS_DB_NAME: wordpress
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
@@ -42,7 +42,7 @@ services:
    environment:
     - PMA_ARBITRARY=0
     #- PMA_PORT=3006
-    - PMA_HOST=172.25.0.3
+    - PMA_HOST=172.25.0.2
    networks:
     tot-server:
    extra_hosts:
@@ -52,4 +52,4 @@ volumes:
  tot-space:
  tot-sql:
 networks:
-  tot-server:
+  tot-server:
\ No newline at end of file

From 66984b442d5b092a2213fffc17e477e601abd67e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 02:49:22 +0100
Subject: [PATCH 048/196] updated namespace and ip

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 671d169..6450f30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,9 @@
 # use wordpress image as the base image
 FROM wordpress
 
+# install mysql-client to enable databse management from container
+RUN apt-get update 
+
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
@@ -10,4 +13,4 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 
 # cd to plugin directory AND install plugin dependencies
-RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install
\ No newline at end of file
+RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install

From b574ee894d222aa7f7766920910d099565db6406 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 10:01:24 +0100
Subject: [PATCH 049/196] updated autoload include

---
 termination-of-transfer.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index f9677ab..d07be3c 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -1,6 +1,5 @@
 <?php
-require_once ABSPATH . 'vendor/autoload.php';
-include_once ABSPATH . 'autoload.php';
+require_once plugin_dir_path(__FILE__) . 'vendor/autoload.php';
 
 use CreativeCommons_TOT\Plugin;
 use CreativeCommons_TOT\TerminationOfTransfer;

From 86c6ca0a303625f614ee41ad8292e114606423cc Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 10:01:57 +0100
Subject: [PATCH 050/196] updated autoload include

---
 autoload.php | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 autoload.php

diff --git a/autoload.php b/autoload.php
deleted file mode 100644
index cdb5d33..0000000
--- a/autoload.php
+++ /dev/null
@@ -1,8 +0,0 @@
-spl_autoload_register( 'tot_autoloader' );
-function tot_autoloader( $class_name ) {
-  if ( false !== strpos( $class_name, 'CreativeCommons_TOT' ) ) {
-    $classes_dir = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR;
-    $class_file = str_replace( '\\', DIRECTORY_SEPARATOR, $class_name ) . '.php';
-    require_once $classes_dir . $class_file;
-  }
-}
\ No newline at end of file

From 9323792e7fd2de9118d529bf105332372f9a3a2b Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 10:02:40 +0100
Subject: [PATCH 051/196] updated namespace

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 14e4f34..99c9f51 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     },
     "autoload": {
-        "psr-4": {"CreativeCommons_TOT\\tot\\": "./src"}
+        "psr-4": {"CreativeCommons_TOT\\": "./src"}
     },
     "repositories": [
         {

From 58c6f218b4a37f103c2e0db5814c0944f5a826a3 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 10:04:25 +0100
Subject: [PATCH 052/196] deleted composer.lock file

---
 composer.lock | 182 --------------------------------------------------
 1 file changed, 182 deletions(-)
 delete mode 100644 composer.lock

diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 2bb6956..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "be9b858b5d4ad979b3d96414485baac0",
-    "packages": [
-        {
-            "name": "mpdf/mpdf",
-            "version": "v6.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mpdf/mpdf.git",
-                "reference": "9116f8b28e86d1eaf858d1a4623d26a910441672"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/9116f8b28e86d1eaf858d1a4623d26a910441672",
-                "reference": "9116f8b28e86d1eaf858d1a4623d26a910441672",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.4.0",
-                "setasign/fpdi": "1.6.*"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.7"
-            },
-            "suggest": {
-                "ext-zlib": "Needed for compression of embedded resources, such as fonts"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "mpdf.php",
-                    "classes"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Ian Back",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A PHP class to generate PDF files from HTML with Unicode/UTF-8 and CJK support",
-            "homepage": "http://mpdf.github.io",
-            "keywords": [
-                "pdf",
-                "php",
-                "utf-8"
-            ],
-            "time": "2016-04-28T18:19:01+00:00"
-        },
-        {
-            "name": "setasign/fpdi",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Setasign/FPDI.git",
-                "reference": "5b899b2b41463bf261aa69840fd30b50950a500c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/5b899b2b41463bf261aa69840fd30b50950a500c",
-                "reference": "5b899b2b41463bf261aa69840fd30b50950a500c",
-                "shasum": ""
-            },
-            "suggest": {
-                "setasign/fpdf": "FPDI will extend this class but as it is also possible to use \"tecnickcom/tcpdf\" as an alternative there's no fixed dependency configured.",
-                "setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.",
-                "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF."
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "filters/",
-                    "fpdi.php",
-                    "fpdf_tpl.php",
-                    "fpdi_pdf_parser.php",
-                    "pdf_context.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jan Slabon",
-                    "email": "jan.slabon@setasign.com",
-                    "homepage": "https://www.setasign.com"
-                }
-            ],
-            "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
-            "homepage": "https://www.setasign.com/fpdi",
-            "keywords": [
-                "fpdf",
-                "fpdi",
-                "pdf"
-            ],
-            "time": "2015-11-30T10:53:14+00:00"
-        },
-        {
-            "name": "smarty/smarty",
-            "version": "v3.1.39",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "e27da524f7bcd7361e3ea5cdfa99c4378a7b5419"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/e27da524f7bcd7361e3ea5cdfa99c4378a7b5419",
-                "reference": "e27da524f7bcd7361e3ea5cdfa99c4378a7b5419",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
-                "smarty/smarty-lexer": "^3.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "libs/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Monte Ohrt",
-                    "email": "monte@ohrt.com"
-                },
-                {
-                    "name": "Uwe Tews",
-                    "email": "uwe.tews@googlemail.com"
-                },
-                {
-                    "name": "Rodney Rehm",
-                    "email": "rodney.rehm@medialize.de"
-                }
-            ],
-            "description": "Smarty - the compiling PHP template engine",
-            "homepage": "http://www.smarty.net",
-            "keywords": [
-                "templating"
-            ],
-            "support": {
-                "forum": "http://www.smarty.net/forums/",
-                "irc": "irc://irc.freenode.org/smarty",
-                "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v3.1.39"
-            },
-            "time": "2021-02-17T21:57:51+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "2.0.0"
-}

From 0ca7fb0827bbadaf4a0e4add1c4546899658f003 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 12 Oct 2022 10:05:09 +0100
Subject: [PATCH 053/196] updated Dockerfile for composer

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6450f30..41b7611 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@
 # use wordpress image as the base image
 FROM wordpress
 
-# install mysql-client to enable databse management from container
-RUN apt-get update 
+# install unzip for composer
+RUN apt-get update && apt-get install apt-utils zip unzip
 
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

From fefa4f847dfb87b264c20b0ce7eca7f0d88efef6 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Thu, 13 Oct 2022 13:24:59 +0100
Subject: [PATCH 054/196] deleted plugin's old folder

---
 wordpress-plugin/index.php        |  94 ------
 wordpress-plugin/js/pdf.js        | 117 -------
 wordpress-plugin/js/questions.js  | 480 ----------------------------
 wordpress-plugin/js/rendering.js  | 196 ------------
 wordpress-plugin/js/results.json  |  68 ----
 wordpress-plugin/js/rules.js      | 505 ------------------------------
 wordpress-plugin/js/validation.js |  68 ----
 wordpress-plugin/js/values.js     |  74 -----
 wordpress-plugin/js/widgets.js    | 160 ----------
 wordpress-plugin/result-pdf.php   | 115 -------
 10 files changed, 1877 deletions(-)
 delete mode 100644 wordpress-plugin/index.php
 delete mode 100644 wordpress-plugin/js/pdf.js
 delete mode 100644 wordpress-plugin/js/questions.js
 delete mode 100644 wordpress-plugin/js/rendering.js
 delete mode 100644 wordpress-plugin/js/results.json
 delete mode 100644 wordpress-plugin/js/rules.js
 delete mode 100644 wordpress-plugin/js/validation.js
 delete mode 100644 wordpress-plugin/js/values.js
 delete mode 100644 wordpress-plugin/js/widgets.js
 delete mode 100644 wordpress-plugin/result-pdf.php

diff --git a/wordpress-plugin/index.php b/wordpress-plugin/index.php
deleted file mode 100644
index ff638e1..0000000
--- a/wordpress-plugin/index.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016, 2017  Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-/*
-Plugin Name: Termination of Tranfer Tool
-Plugin URI: https://github.com/creativecommons/termination-of-transfer
-Version: 1.0.0
-Author: Creative Commons Corporation
-Author URI: https://github.com/creativecommons/
-*/
-
-// This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ...
-$tot_tool_html = <<<'EOD'
-       <div class="panel panel-info hidden" id="answers-table">
-         <div class="panel-heading">
-           <h3 class="panel-title">Your answers</h3>
-         </div>
-         <div class="panel-body">
-           <table class="table table-striped">
-             <tbody id="answers-table-rows">
-             </tbody>
-           </table>
-         </div>
-       </div>
-
-       <div class="panel panel-primary hidden" id="questionnaire-section">
-        <div class="panel-heading">
-          <h3 class="panel-title" id="section-title"></h3>
-        </div>
-        <div class="panel-body" id="question-rendering-area">
-        </div>
-       </div>
-
-      <div id="alert-area">
-      </div>
-
-      <div class="panel hidden" id="result-area">
-        <div class="panel-heading">
-          <h3 class="panel-title" id="result-area-title"></h3>
-        </div>
-        <div class="panel-body" id="result-area-message">
-        </div>
-      </div>
-
-      <div class="hidden" id="question-progress-buttons">
-        <button class="btn btn-default" id="button-question-back">Back</button>
-        <button class="btn btn-default" id="button-question-next">Next</button>
-        <a href="."
-           class="btn btn-default hidden"
-           id="button-restart">Restart</a>
-      </div>
-EOD;
-
-
-//[termination-of-transfer-tool]
-function tot_tool_handle_shortcode( $atts ){
-    global $tot_tool_html;
-    wp_enqueue_script("jquery");
-    wp_enqueue_script( 'tot-values',
-                       plugins_url( 'js/values.js', __FILE__ ) );
-    wp_enqueue_script( 'tot-rules',
-                       plugins_url( 'js/rules.js', __FILE__ ) );
-    wp_enqueue_script( 'tot-validation',
-                       plugins_url( 'js/validation.js', __FILE__ ) );
-    wp_enqueue_script( 'tot-widgets',
-                       plugins_url( 'js/widgets.js', __FILE__ ) );
-    wp_enqueue_script( 'tot-rendering',
-                       plugins_url( 'js/rendering.js', __FILE__ ) );
-    wp_enqueue_script( 'tot-pdf',
-                       plugins_url( 'js/pdf.js', __FILE__ ) );
-    wp_enqueue_script( 'tot-questions',
-                       plugins_url( 'js/questions.js', __FILE__ ) );
-	return $tot_tool_html;
-}
-
-add_shortcode( 'termination-of-transfer-tool',
-               'tot_tool_handle_shortcode' );
diff --git a/wordpress-plugin/js/pdf.js b/wordpress-plugin/js/pdf.js
deleted file mode 100644
index 5748eee..0000000
--- a/wordpress-plugin/js/pdf.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016  Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// PDF Generation
-// (browser-side data preparation and call to server)
-////////////////////////////////////////////////////////////////////////////////
-
-var PDF = {};
-
-PDF.url = jQuery("script[src*='/termination-of-transfer/js/pdf.js']")
-	       .attr('src').replace(/js\/pdf\.js.*$/, '')
-	       + 'result-pdf.php';
-
-PDF.appendProperty = function (details, key, value) {
-  var mapping = {key: key,
-                 value: value};
-  details.push(mapping);
-};
-
-PDF.append203Windows = function (details) {
-  var notice = '';
-  var termination = '';
-
-  if (Values.notice_begin != undefined) {
-    notice += Values.notice_begin + '-' + Values.notice_end;
-    termination += Values.term_begin + '-' + Values.term_end
-  }
-
-  if (Values.p_term_begin != undefined) {
-    if (notice != '') {
-      notice += ' or ';
-      termination += ' or ';
-    }
-    notice += Values.p_notice_begin + '-' + Values.p_notice_end;
-    termination += Values.p_term_begin + '-' + Values.p_term_end;
-  }
-
-  PDF.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>', notice);
-  PDF.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>', termination);
-};
-
-PDF.append304Windows = function (details) {
-  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
-                     Values.notice_begin);
-  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
-                     Values.notice_end);
-  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
-                     Values.term_begin);
-  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
-                     Values.term_end);
-  if (Values.d_notice_begin != undefined) {
-    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
-                       Values.d_notice_begin);
-    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
-                       Values.d_notice_end);
-    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
-                       Values.d_term_begin);
-    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
-                       Values.d_term_end);
-  }
-};
-
-PDF.appendWindows = function (details) {
-  if (Rules.is203()) {
-    PDF.append203Windows(details);
-  } else if (Rules.is304()) {
-    PDF.append304Windows(details);
-  }
-};
-
-PDF.details = function () {
-  var details = [];
-  Object.getOwnPropertyNames(varsToTitles).forEach(function (key) {
-    if ((Values[key] != undefined)
-        && (Values[key] != '')) {
-      PDF.appendProperty(details, varsToTitles[key], Values[key]);
-    }
-  });
-  PDF.appendWindows(details);
-  return details;
-};
-
-PDF.request = function () {
-  var data = {report_timestamp: Values.current_date.getTime()/1000,
-              flags: Values.flags.sort(), // Sorts inline & returns, so OK here
-              conclusion: Values.conclusion,
-              details: PDF.details(),
-             };
-  var totform = document.createElement("FORM");
-  totform.setAttribute("action", PDF.url);
-  totform.setAttribute("method", "post");
-  totform.setAttribute("enctype", "multipart/form-data");
-  totform.setAttribute("target", "_blank");
-  var data_field = document.createElement("INPUT");
-  data_field.setAttribute("type", "hidden");
-  data_field.setAttribute("name", "data");
-  data_field.setAttribute("value", JSON.stringify(data));
-  totform.appendChild(data_field);
-  jQuery('body').append(totform);
-  totform.submit();
-};
diff --git a/wordpress-plugin/js/questions.js b/wordpress-plugin/js/questions.js
deleted file mode 100644
index ad73a51..0000000
--- a/wordpress-plugin/js/questions.js
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016  Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// Presentation of questions, and main flow of control
-// (This is slightly overloaded)
-////////////////////////////////////////////////////////////////////////////////
-
-var Questions = {};
-
-////////////////////////////////////////////////////////////////////////////////
-// Section One
-////////////////////////////////////////////////////////////////////////////////
-
-// When was the work created?
-
-Questions.s1q1a = {
-  section: 1,
-  question: 'When was the work created?',
-  explanation:'The year in which a work was created can affect its copyright status and its treatment under U.S. copyright law. Most importantly, the tool is concerned with whether a worked was made before or after January 1, 1978, when the most recent overhaul of U.S. copyright went into effect.',   
-  variable: 'creation_year',
-  input: 'year',
-  pre: function () {
-    Navigation.disablePrevious();
-    Notifications.displayAnswersHint();
-  },
-  post: function () {
-    Notifications.removeAnswersHint();
-  }
-};
-
-// Has the work been published?
-
-Questions.s1q1b = {
-  question: 'Has the work been published?',
-  explanation:'Whether a work has been published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
-  variable: 'work_published',
-  input: 'radio',
-  pre: function () {
-    Navigation.enablePrevious();
-  }
-};
-
-// When was the work first published?
-
-Questions.s1q1bi = {
-  variable: 'pub_year',
-  question: 'When was the work first published?',
-  explanation:'When a work was published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
-  input: 'year',
-  validate: function () {
-    return Validation.validDate()
-      || ((parseInt(jQuery('.text-question').val()) < Values.creation_year)
-          ? 'The publication year cannot be earlier than the creation year.'
-          : false);
-  }
-
-};
-
-// When was the work first published under the grant?
-
-Questions.s1q1bii =  {
-  section: 1,
-  question: 'When was the work first published under the grant?',
-  explanation:'When a work was first published under the grant (which may be different than the the date the work was published for the first time) can factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date">glossary</a>.',
-  variable: 'grant_pub_year',
-  input: 'year',
-  validate: function () {
-    var errors = Validation.validDate();
-    if (errors == false) {
-      var year = parseInt(jQuery('.text-question').val());
-      if (year < Values.creation_year) {
-        errors = 'Year of publication under grant cannot be earlier than year of creation.';
-      } else if (year < Values.pub_year) {
-        errors = 'Year of publication under grant cannot be earlier than year of initial publication.';
-      } /* else if (year < Values.k_year) {
-        errors = 'Year of publication under grant cannot be earlier than year of grant.';
-      }*/
-    }
-    return errors;
-  }
-};
-
-
-// Works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?
-
-Questions.s1q1bi2 = {
-  question: 'Published works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?',
-  explanation:'For U.S. works published in certain years, U.S. law required that they feature a "copyright notice" in order to receive federal copyright protection. Whether or not the published version featured a copyright notice can affect the copyright status of these works.',	
-  variable: 'copyright_notice',
-  input: 'radio',
-  values: ['yes', 'no', 'maybe']
-};
-
-// Has the work been registered with the United State Copyright Office?
-
-Questions.s1q1c = {
-  question: 'Has the work been registered with the United State Copyright Office?',
-  explanation:'Before 1989, registration was one of the ways authors could secure federal copyright in their work. Whether a work was registered can affect copyright status and the timing of termination right.',  
-  variable: 'work_registered',
-  input: 'radio',
-  values: ['yes', 'no'] //, "don't know"] GitHub issue #33
-};
-
-// When was the work registered with the United States Copyright Office?
-
-Questions.s1q1ci = {
-  question: 'When was the work registered with the United States Copyright Office?',
-  explanation:'Before 1989, registration was one of the ways authors could secure federal copyright in their work. When a work was registered can affect copyright status and the timing of termination right.',  
-  variable: 'reg_year',
-  input: 'year'
-};
-
-// What is the date of the agreement or transfer? ...
-
-Questions.s1q1d = {
-  question: 'What is the year of the agreement or transfer?',
-  explanation:'When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work\'s copyright transfer may be eligible for termination.',
-  variable: 'k_year',
-  input: 'year',
-  validate: function () {
-    var errors = Validation.validDate();
-    if (errors == false) {
-        // Stash the user-entered agreement year
-        Values.user_inputted_k_year = parseInt(jQuery('.text-question').val());
-        // If date is before the creation year, use the creation year instead
-        if (Values.user_inputted_k_year < Values.creation_year) {
-	  jQuery('.text-question').val(Values.creation_year);
-	}
-    }
-    return errors;
-  },
-  answerDisplayValue: function () {
-    return "Effective: " + Values.k_year + "<br/>User entered: "
-	   + Values.user_inputted_k_year;
-  }
-};
-
-// Did the agreement or transfer include the right of publication?
-
-Questions.s1q1f =  {
-  // Last question in section 1, so set this if we've arrived via back button
-  section: 1,
-  question: 'Did the agreement or transfer include the right of publication?',
-  explanation:'If a <a href="/glossary/#agreement" target="_blank" title="Termination of Transfer: Glossary">transfer</a> from 1978 or later includes the right of <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">publication</a>, there is a different set of rules for determining when the transfer is eligible for termination.',	
-  variable: 'pub_right',
-  input: 'radio',
-  values: ['yes', 'no', 'maybe']
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Section Two
-////////////////////////////////////////////////////////////////////////////////
-
-// Is the agreement or transfer you want to terminate part of a last will...
-
-Questions.s2q2a =  {
-  // First question in section 2
-  section: 2,
-  question: 'Is the agreement or transfer in question part of a <a href="/glossary/#will" target="_blank" title="Termination of Transfer: Glossary">last will and testament</a>?',
-  variable: 'last_will',
-  input: 'radio'
-};
-
-// Are any of the authors still alive?
-
-Questions.s2q2bi = {
-  question: 'Are <i>any</i> of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors or artists</a> still alive?',
-  explanation:'The copyright term for many works is based on the life of the author.',
-  variable: 'any_authors_alive',
-  input: 'radio'
-};
-
-// What is the year the last surviving author died?
-
-Questions.s2q2bi2 = {
-  question: 'What is the year the last surviving <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author or artist</a> died?',
-  explanation:'The copyright term for many works is based on the life of the author.',
-  variable: 'death',
-  input: 'year'
-};
-
-// Was the work created within the scope of the author’s employment?
-
-Questions.s2q2c =  {
-  question: 'Was the work created within the <a href="/glossary/#scope_of_employment" target="_blank" title="Termination of Transfer: Glossary">scope of the author’s employment</a>?',
-  variable: 'within_scope_of_employment',
-  input: 'radio'
-};
-
-// Was there an express agreement between the author and the author's employer to not treat the work as a work made for hire?
-
-Questions.s2q2ci =  {
-  question: 'Was there an express agreement the author and the author\'s employer to not treat the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
-  variable: 'express_agreement',
-  input: 'radio'
-};
-
-// Was the work created in response to a special order or commission
-
-Questions.s2q2d =  {
-  question: 'Was the work created in response to a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">special order or commission</a> by some other person or company?',
-  variable: 'special_order',
-  input: 'radio'
-};
-
-// Was there a signed written agreement regarding the special order...
-
-Questions.s2q2di =  {
-  question: 'Was there a signed written agreement regarding the special order or commission which explicitly refers to the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
-  variable: 'signed_written_agreement',
-  input: 'radio'
-};
-
-// Was the work created for use as one of the following? ...
-
-Questions.s2q2dia = {
-  question: 'Was the work created for use as one of the following? — <ul><li>a contribution to a collective work; a part of a motion picture or other audiovisual work;</li> <li>a translation;</li> <li>a <a href="/glossary/#supplementary_work" title="Termination of Transfer: Glossary">supplementary work</a> (such as a foreword, afterword, table, editorial note, musical arrangement, bibliography, appendix, or index);</li> <li>a <a href="/glossary/#compilation" target="_blank" title="Termination of Transfer: Glossary">compilation</a>;</li> <li>an <a href="/glossary/#instructional_text" target="_blank" title="Termination of Transfer: Glossary">instructional text (text and/or graphics)</a>;</li> <li>a test or answer material for a test;</li> <li>or as an atlas?</li></ul?>',
-  variable: 'created_as_part_of_motion_picture',
-  input: 'radio',
-  values: ["yes", "no", "don't know"]
-};
-
-// Has the original transfer since been renegotiated or altered?
-
-Questions.s2q2e = {
-  question: 'Has the original transfer since been renegotiated or altered?',
-  variable: 'renego',
-  input: 'radio',
-  values: ["yes", "no", "don't know"]
-};
-
-// Did one or more of the authors or artists enter into the agreement...
-
-Questions.s2q2f =  {
-  question: 'Did one or more of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors</a> enter into the agreement or transfer?',
-  variable: 'authors_entered_agreement',
-  input: 'radio'
-};
-
-// s2q2fii is part of the rule for s2q2f
-
-// Was the agreement or transfer made by a member of...
-
-Questions.s2q2fii =  {
-  // Last question in section 2, so set section if we're going back
-  section: 2,
-  question: 'Was the agreement or transfer made by a member of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author\'s</a> immediate family, or by the executors?<br><i>For more information about which family members qualify, check out the FAQ.</i>',
-  variable: 'agreement_by_family_or_executor',
-  input: 'radio'
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Storing answers
-////////////////////////////////////////////////////////////////////////////////
-
-Questions.validateAnswer = function () {
-  var result = false;
-  var question = Questions[Questions.current_question];
-  if (question['validate']) {
-    result = question.validate();
-  } else if (question.type == 'year') {
-    result = Validation.validDate();
-  } else if (question.type == 'text') {
-    // If the text has a minimum length, check it
-    if (jQuery('.text-question').val().length < question.min_chars) {
-      result = 'Answer is too short, it must be at least '
-        + question.min_chars + 'characters';
-    }
-  }
-  // We don't worry about radio buttons
-  return result
-};
-
-Questions.getAnswer = function () {
-  var question = Questions[Questions.current_question];
-  var answer = undefined;
-  switch (question.input) {
-  case 'radio':
-    answer = jQuery(':input[type="radio"]:checked').val();
-    break;
-  case 'year':
-    if ((question.optional != true)
-        || ((question.optional == true)
-	    && jQuery('.text-question').val() != '')) {
-      answer = parseInt(jQuery('.text-question').val());
-    }
-    break;
-  case 'year_or_empty':
-    if (jQuery('.text-question').val() != '') {
-      answer = parseInt(jQuery('.text-question').val());
-    }
-    break;
-  case 'text':
-    // Fall through to default
-  default:
-    answer = jQuery('.text-question').val();
-    break;
-  }
-  return answer;
-};
-
-Questions.processAnswer = function () {
-  var result = false;
-  var warnings = Questions.validateAnswer();
-  if (warnings === false) {
-    var question = Questions[Questions.current_question];
-    var answer = Questions.getAnswer();
-    Values[question.variable] = answer;
-    // FIXME: handle converting radio buttons to correct store values
-    //        while recording their label in the answers table
-    if (answer) {
-      answer = (question.answerDisplayValue && question.answerDisplayValue())
-	       || answer;
-      Answers.appendAnswer(question.variable, question.question, answer);
-    }
-    Notifications.clearAlerts();
-    result = true;
-  } else {
-    Notifications.setAlert(warnings);
-  }
-  return result;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Flag and result lookup
-// These messages are stored in a json file so we can also use them in the PDF
-////////////////////////////////////////////////////////////////////////////////
-
-Questions.resultMap = undefined;
-// Asynchronous fetch of data that is accessed synchronously.
-// This data won't be used until after several questions, so this is tolerable.
-
-jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/js/questions.js']")
-               .attr('src').replace(/questions\.js.*$/, '')
-               + 'results.json')
-    .done(function (result) {
-        resultMap = result;
-    })
-    .fail(function (jqxhr, textStatus, error) {
-      var err = textStatus + ", " + error;
-      console.log("Request Failed: " + err);
-    });
-
-Questions.getConclusionDetails = function (specifier) {
-  var path = specifier.split('.');
-  var result = resultMap['Conclusion'][path[0]][path[1]];
-  return result;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Flow of control
-////////////////////////////////////////////////////////////////////////////////
-
-Questions.first_question = 's1q1a';
-Questions.last_question = 's2q2fii';
-
-Questions.start = function () {
-  jQuery('.questionnaire-section, .question-progress-buttons')
-    .removeClass('hidden');
-  jQuery('.no-javascript-alert').addClass('hidden');
-  //Navigation.disablePrevious();
-  Rendering.transitionTo(Questions.first_question);
-};
-
-Questions.transitionQuestion = function (next_question) {
-  var previous_question = Questions[Questions.current_question];
-  if (previous_question) {
-    if(previous_question.post) {
-      previous_question.post();
-    }
-  }
-  if (next_question == 'finish') {
-    Questions.finish();
-  } else {
-    Questions.current_question = next_question;
-    var question = Questions[Questions.current_question];
-    if (question['pre']) {
-      question.pre();
-    }
-    Rendering.transitionTo(question);
-  }
-};
-
-Questions.nextQuestionID = function () {
-  var next_question = Questions.current_question;
-  var rule = Rules[Questions.current_question];
-  if (typeof rule == 'function') {
-    next_question = rule();
-  } else {
-    next_question = rule;
-  }
-  return next_question;
-};
-
-Questions.nextQuestion = function () {
-  // If the answer was OK, move on
-  if (Questions.processAnswer()) {
-    ValuesStack.push();
-    var id = Questions.nextQuestionID();
-    Values.question_id = id;
-    if (id == 'finish') {
-      Questions.finish();
-    } else {
-      Questions.transitionQuestion(Values.question_id);
-      // Scroll down to make sure the input UI is visible
-      jQuery('html,body').animate({
-        scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
-    }
-  }
-};
-
-Questions.previousQuestion = function () {
-  // If we are going back from *after* the last question, re-enable UI
-  if (Values.question_id == 'finish') {
-    Navigation.unfinishQuestions();
-  }
-  // Don't pop past the very first item
-  if (ValuesStack.height() > 0) {
-    // Go back
-    ValuesStack.pop();
-    Questions.transitionQuestion(Values.question_id);
-    Notifications.clearAlerts();
-    // Clear previous answer
-    var previous_question = Questions[Values.question_id];
-    Answers.removeAnswer(previous_question.variable);
-    // Scroll down to make sure the input UI is visible
-    jQuery('html,body').animate({
-      scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
-  }
-};
-
-Questions.finish = function () {
-  var obj = Questions.getConclusionDetails(Values.conclusion);
-  Values.termination_type = obj.title;
-  Notifications.setResultAreaMessage(obj, 'panel-success');
-  Navigation.finishQuestions();
-  if (Values.conclusion_generate_pdf) {
-    PDF.request();
-  }
-};
-
-Questions.start = function () {
-  Values.reset();
-  Navigation.showQuestions();
-  Navigation.showAnswersTable();
-  Navigation.showNextPrevious();
-  jQuery('#button-question-next').click(Questions.nextQuestion);
-  jQuery('#button-question-back').click(Questions.previousQuestion);
-  // When the user presses "return" in a text area, move to next question
-  jQuery('#question-rendering-area').on('submit', function () {
-    if (jQuery('#button-question-next').is(':enabled')) {
-      jQuery('#button-question-next').click();
-    }
-    return false;
-  });
-  Questions.transitionQuestion(Questions.first_question);
-  Values.question_id = Questions.first_question;
-};
-
-jQuery( document ).ready(function () {
-  Questions.start();
-});
diff --git a/wordpress-plugin/js/rendering.js b/wordpress-plugin/js/rendering.js
deleted file mode 100644
index 84d6159..0000000
--- a/wordpress-plugin/js/rendering.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016  Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// Rendering UI elements for input
-////////////////////////////////////////////////////////////////////////////////
-
-var Rendering = {};
-
-////////////////////////////////////////////////////////////////////////////////
-// Sections
-////////////////////////////////////////////////////////////////////////////////
-
-Rendering.sections = [
-  '',
-  'First tell us a few things about the work',
-  'Now, let’s find out whether the work is eligible for termination',
-  'Information about the work'
-];
-
-Rendering.currentSection = 0;
-
-////////////////////////////////////////////////////////////////////////////////
-// Template basics
-////////////////////////////////////////////////////////////////////////////////
-
-Rendering.questionTemplate = '\
-<form class="question-form">\
-  <div class="form-group">\
-    <label class="question-label"></label><br>\
-    <p class="help-block"></p> \
-  </div>\
-</form>';
-
-Rendering.createQuestion = function () {
-  return jQuery(Rendering.questionTemplate);
-};
-
-Rendering.common = function (config) {
-  var question = Rendering.createQuestion();
-  // If this is a question in a different section, change the section header
-  // Section is 1-based, so we can use a simple logical and here.
-  if (config.section
-      && (config.section != Rendering.currentSection)) {
-    jQuery('#section-title').html(Rendering.sections[config.section]).fadeIn();
-  }
-  question.find('.question-label').html(config.question);
-  if (config.explanation) {
-    question.find('.help-block').html(config.explanation);
-  }
-  question.css("display", "none");
-  // If we're entering this value for the first time (not via the back button)
-  // and this isn't an optional value
-  // don't let the user continue until they enter a value here.
-  if((Values[config.variable] === undefined)
-     && (! config.optional)) {
-    Navigation.disableNext();
-  } else {
-    Navigation.enableNext();
-  }
-  return question;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Multiple choice questions (radio buttons)
-////////////////////////////////////////////////////////////////////////////////
-
-Rendering.radio = function (config) {
-  var question = Rendering.common(config);
-  var form_group = question.find('.form-group');
-  var name = 'input-' + config.variable;
-  // If we are returning to this via the back button, get the previous value
-  var existing_value = Values[config.variable];
-  var radio_button_values = config.values || ['yes', 'no'];
-  radio_button_values.forEach(function (value) {
-    var radio_button = '<label class="radio-inline"><input type="radio" name=' + name + '" value="' + value  +'"';
-    if (value == existing_value) {
-      radio_button += ' checked="checked"';
-    }
-    radio_button += '>' + value +'</label>';
-    form_group.append(jQuery(radio_button));
-  });
-  // When the user makes a choice, go straight to the next question
-  form_group.find(':input[type="radio"]').click(function () {
-    Navigation.enableNext();
-    jQuery('#button-question-next').click();
-  });
-  return question;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Text input
-////////////////////////////////////////////////////////////////////////////////
-
-Rendering.makeTextLengthHandler = function (element, min_length, optional) {
-  return function () {
-    var length = element.val().length;
-    if ((optional && (length == 0))
-        || (length >= min_length)) {
-      Navigation.enableNext();
-    } else {
-      Navigation.disableNext();
-    }
-  };
-};
-
-Rendering.text = function (config) {
-  var question = Rendering.common(config);
-  var form_group = question.find('.form-group');
-  var name = 'input-' + config.variable;
-  var text_field = jQuery('<input type="text" class="form-control text-question" id="'
-                     + config.variable +
-                     '" placeholder="'
-                     + (config.placeholder || '')
-                     + '">');
-  form_group.append(text_field);
-  // Set the label
-  var label = question.find('.question-label').prop('for', name);
-  if (Values[config.variable]) {
-    form_group.find('text-question').val(Values[config.variable]);
-  }
-  var existing_value = Values[config.variable];
-  // Ensure next isn't enabled until enough characters are entered
-  var min_length = config.min_length || 4;
-  var text_field_element = question.find('.text-question');
-  var validator = Rendering.makeTextLengthHandler(text_field_element,
-                                                  min_length,
-                                                  config.optional);
-  text_field_element.on('keyup', validator);
-  text_field_element.on('change', validator);
-  // If we are returning to the field and the value has already been set, use it
-  if (existing_value !== undefined) {
-    text_field.val(Values[config.variable]);
-  }
-  return question;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Year input (text subtype)
-////////////////////////////////////////////////////////////////////////////////
-
-Rendering.year = function (config) {
-  var question = Rendering.text(config);
-  var text_field = question.find('.text-question');
-  Validation.allowOnlyNumbers(text_field);
-  text_field.prop('maxlength', 4);
-  text_field.prop('placeholder', '1977');
-  return question;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Render html UI from config specification
-////////////////////////////////////////////////////////////////////////////////
-
-Rendering.render = function (config) {
-  var result = undefined;
-  switch (config.input)  {
-  case 'radio':
-    result = Rendering.radio(config);
-    break;
-  case 'year':
-    result = Rendering.year(config);
-    break;
-  case 'text':
-    // Fall through to default
-  default:
-    result = Rendering.text(config);
-    break;
-  }
-  return result;
-};
-
-Rendering.transitionTo = function (config) {
-  var question = Rendering.render(config);
-  jQuery('.question-form').slideUp("fast",
-                              function () {
-                                jQuery(this).remove();
-                              });
-  jQuery('#question-rendering-area').append(question);
-  question.slideDown("fast");
-};
diff --git a/wordpress-plugin/js/results.json b/wordpress-plugin/js/results.json
deleted file mode 100644
index bc85aaa..0000000
--- a/wordpress-plugin/js/results.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{"Flag": {"A": {"title": "Outside the notice window",
-                "i": {"title": "Before Notice Window",
-                      "a":  "It does not appear likely that a <i>current</i> right to terminate the agreement would exist for works with the characteristics provided, but it is possible that one may arise in the future. Details on possible future termination window(s) are provided in the information sheet.",
-                      "b": "It does not appear likely that a <i>current</i> right to terminate the agreement would exist for works with the characteristics provided, but it is possible that one could apply during the dates specified below."},
-                "ii": {"title": "Notice Window Expired",
-                       "a": "It appears likely that the termination process could no longer be initiated for works with the characteristics provided, either because the notice period or the termination window has expired.",
-                       "b": "It does not appear likely that the termination process could be initiated for works with the characteristics provided, either because the notice period or the termination window has expired."},
-                "iii": {"title": "Outside of Notice Window",
-                        "a": "If you are seeing this flag, you are either a time traveler or something has gone horribly wrong. Please let us know at timetravel@rightsback.org.",
-                        "b": "If you are seeing this flag, you are either a time traveler or something has gone horribly wrong. Please let us know at timetravel@rightsback.org."}},
-          "B": {"title": "Possible Public Domain Status",
-                "i": {"b": "Pre-1989 publication without notice—likely public domain<br>Works with the characteristics provided may be in the public domain. For U.S. works from before 1989, copyright depended on certain notice standards being met on publication. Please consult a licensed attorney for advice on the copyright status of a given work."},
-                "ii": {"b": "1989 publication without notice—possibly public domain<br>Works with the characteristics provided may be in the public domain. For U.S. works from before 1989, copyright depended on certain notice standards being met on publication. Please consult a licensed attorney for advice on the copyright status of a given work."},
-                "iii": {"b": "1989 or earlier publication, notice unknown—possibly public domain<br>Works with the characteristics provided may be in the public domain. For U.S. works from before 1989, copyright depended on the certain notice standards being met on publication. Please consult a licensed attorney for advice on the copyright status of a given work."}},
-          "C": {"title": "Possible renegotiations",
-                "i":  {"b": "The transfer agreement for works with the characteristics provided may have been renegotiated. Some courts have found renegotiations to affect the availability of the termination right. Please consult a licensed attorney for advice on the effect of renegotiation on the termination right."}},
-          "D": {"title": "Possible work made for hire",
-                "i":  {"b": "Pre-1978."},
-                "ii": {"b": "Post-1978"}},
-	  "E": {"title": "Dual Window Scenario",
-	        "i":  {"title": "Two possible notice/termination windows",
-		       "description": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304\">304</a>, some works receive two possible windows for termination. Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\"><a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a></a>, transfers are terminable in a window beginning 56 years from the date copyright was secured. Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>, transfers are terminable in a window beginning 75 years from the date copyright was secured. Note that transfers of rights related to a single work can only be terminated under one of these provisions—it is not possible to exercise both the § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a> and <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a> rights."},
-	        "ii": {"title": "Uncertain notice/termination window",
-		       "description": "Whether or not the right of publication was transferred is unknown for works with the characteristics provided. For transfers from 1978 or later, this information is often necessary in order to identify the correct termination window. Even not knowing this information, it is possible to see what the termination might look like in either scenario. As a result, works with the characteristics provided have two possible windows specified for both notice and termination. Only one window can apply to works transferred in 1978 or later. In order to know which window could apply to each scenario, please re-try the tool, specifying whether or not the publication right was transferred."}},
-	  "F": {"title": "Window explanations",
-		"i":  {"title": "Understanding the § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a> termination window",
-		       "description": "When a transfer made before 1978 is eligible for a termination, it will be under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304\">304</a> of the Copyright Act. Under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a>, the termination window opens 56 years after copyright was secured and lasts for five years."},
-		"ii": {"title": "Understanding the § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a> termination window",
-		       "description": "When a transfer made before 1978 of a work created before 1989 is eligible for a termination, it will be under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304\">304</a> of the Copyright Act. Under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>, the termination window opens 75 years after copyright was secured and lasts for five years."},
-		"iii":  {"title": "Understanding the § <a href=\"https://www.law.cornell.edu/uscode/text/17/203\">203</a> termination window",
-			     "description": "When a transfer made in or after 1978 is eligible for a termination, it will be under section <a href=\"https://www.law.cornell.edu/uscode/text/17/203\">203</a> of the Copyright Act. In these circumstances, the termination window opens 35 years after the transfer and lasts for five years. However, if the author granted publication rights, the test is a little different. In those cases, the five-year termination window opens either 35 years from publication or 40 years from the transfer—whichever comes first."},
-        "iv": {"title": "Understanding publication dates under § 203",
-               "description": "For terminations under section 203, the Copyright Office calculates the \"date of publication\" as the date the work is first published <i>under the grant being terminated</i> (which may or may not be the date the work was published for the first time). When the first publication date under the grant is different than the first publication date, the date of the first publication under the grant is the \"triggering publication date\" that is used to calculate the notice and termination windows."}},
-	  "G": {"title": "Uncertain terminability",
-		"i":  {"title": "Terminability Caveat",
-		       "description": "U.S. Copyright Office guidance suggests works copyrighted between October 27, 1937 and October 26, 1939 may be terminable under section <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>, but the statute is unclear. Consider seeking legal advice."},
-		"ii": {"title": "Important dates",
-                      "a":  "Note that works copyrighted after October 26, 1939 are NOT terminable under §<a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>."}},
-	  "H": {"title": "Gap grants etc.",
-		"i":  {"title": "A note on the date of the agreement",
-		       "description": "Following U.S. Copyright Office guidance, in most cases we treat the date of the agreement as being no earlier than the date of creation."}}},
-
- "Conclusion": {"A": {"title": "Potentially Eligible for termination",
-                      "i": {"title": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#c\">304(c)</a>",
-                            "description": "Thank you for using the Termination of Transfer Tool. Works with the characteristics provided potentially are eligible for termination during the windows specified in the PDF information sheet. Feel free to check out the FAQ for additional information. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
-                      "ii": {"title": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304#d\">304(d)</a>",
-                             "description": "Thank you for using the Termination of Transfer Tool. Works with the characteristics provided potentially are eligible for termination during the windows specified in the PDF information sheet. Feel free to check out the FAQ for additional information. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
-                      "i-ii": {"title": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/304\">304</a>",
-                               "description": "Thank you for using the Termination of Transfer Tool. Works with the characteristics provided potentially are eligible for termination during the windows specified in the PDF information sheet. Feel free to check out the FAQ for additional information. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
-                      "iii": {"title": "Under § <a href=\"https://www.law.cornell.edu/uscode/text/17/203\">203</a>",
-                              "description":"Thank you for using the Termination of Transfer Tool. Works with the characteristics provided potentially are eligible for termination during the windows specified in the PDF information sheet. Feel free to check out the FAQ for additional information. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."}},
-                "B":{"title": "Termination Right Unlikely",
-                     "i": {"title": "Work Made For Hire - Scope of Employment",
-                           "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the work was likely created within the scope of employment. Works created within the scope of employment qualify as \"works made for hire\" and works made for hire are excluded from the termination of transfer provisions. Please consult a licensed attorney to better understand whether the work was created within the scope of employment and whether a termination right in fact exists for a given work."},
-                     "ii": {"title": "Work Made For Hire - Commissioned Work Post-1978 (Motion Pictures, etc)",
-                            "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the work was created after 1978 and likely qualifies as a \"work made for hire.\" As a general rule, works made for hire are excluded from the termination of transfer provisions.<br>For more information about what this result means, the FAQ section may be relevant. For more information about agreements and transfers that cannot be terminated, such as \"works made for hire,\" feel free check out this section of our FAQ. To learn more about why a distinction is made between pre- and post-1978 materials, this FAQ may be helpful. Please note, whether or not a given work is considered a work made for hire is a complex legal question. This tool does not attempt to determine whether any given work is a work made for hire.  Please consult a licensed attorney to better understand the complexities of copyright termination, to understand whether a given work is a work made for hire, and to determine whether a termination right in fact exists for a given work."},
-                     "iii": {"title": "Work Made For Hire - Commissioned Work Pre-1978",
-                             "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the work was created before 1978 and by special order or commission. As a general rule, works that were created by special order or commission before January 1, 1978 are likely to be \"works made for hire\" and works for hire are excluded from the termination of transfer provisions.<br>For more information about what this result means, this FAQ section may be relevant. For more information about agreements and transfers that cannot be terminated, such as works made for hire, feel free check out this section of our FAQ. To learn more about why a distinction is made between pre- and post-1978 materials, this FAQ may be helpful. Please note, whether or not a given work is considered a work made for hire is a complex legal question. This tool does not attempt to determine whether any given work is a work made for hire.  Please consult a licensed attorney to better understand the complexities of copyright termination, to understand whether a given work is a work made for hire, and to determine whether a termination right in fact exists for a given work."},
-                     "iv": {"title": "Transfer by Will",
-                            "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the agreement or transfer in question is a will. Transfers of copyright interests that occur by will cannot be terminated. Please consult a licensed attorney to determine whether the copyright assignment was transferred by a will and whether a termination right in fact exists for a given work."},
-                     "v": {"title": "Pre-1978 Grant by Non-Family Member",
-                           "description": "It is unlikely that works with the characteristics provided would have a termination right. Based on the information provided, it seems that someone other than the author or one of their family signed the agreement or transfer. As a general rule, for agreements and transfers that are signed before January 1, 1978, only those that are signed by the author(s) or their widows, widowers, children, next of kin or executors may be terminated. Please note that whether or not a given transfer has a termination right is a complex legal question. This tool does not attempt to determine whether any particular work in fact has a termination right. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
-                     "vi": {"title": "Post-1978 Grant by Non-Author",
-                            "description": "It is unlikely that works with the characteristics provided would have a termination right. As a general rule, for agreements and transfers that are entered into after January 1st, 1978, only those that are signed by the author may be terminated. Based on the information provided, it seems that someone other than the author or artist signed the agreement or transfer in question. Please note that whether or not a given transfer has a termination right is a complex legal question. This tool does not attempt to determine whether any particular work in fact has a termination right. Please consult a licensed attorney to better understand the complexities of copyright termination and to determine whether a termination right in fact exists for a given work."},
-                     "vii": {"title": "Common law copyright grant (17 U.S.C. § 303)",
-                             "description": "It is unlikely that works with the characteristics provided would have a termination right. The information provided indicates that the agreement or transfer may relate to works under \"common law copyright\"—protections the law gave to unpublished and unregistered works before 1978. The termination of transfer provisions appear to exclude agreements or transfers relating to common law copyright. Please consult a licensed attorney to determine whether a work with the characteristics provided are related to common law copyright and whether the termination right in fact exists for a given work."},
-                     "viii": {"title": "Public domain work",
-                              "description": "Works with the characterisitics provided would likely be in the public domain. Because works in the public domain are not protected by copyright, the termination of transfer provisions are inapplicable. Please consult a licensed attorney to determine whether a work with the characterisitcs provided are in the public domain and whether a termination right in fact exists for a given work."}}}}
diff --git a/wordpress-plugin/js/rules.js b/wordpress-plugin/js/rules.js
deleted file mode 100644
index 3b897d3..0000000
--- a/wordpress-plugin/js/rules.js
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016  Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-var Rules = {};
-
-Rules.simpleYesNoRule = function (variable_id, yesValue, noValue) {
-  return function () {
-    var result = undefined;
-    if (Values[variable_id] == 'yes') {
-      result = yesValue;
-    } else {
-      result = noValue;
-    }
-    return result;
-  };
-};
-
-Rules.jumpToFinish = 'finish';
-
-Rules.conclusion = function (conclusion) {
-  Values.conclusion = conclusion;
-  return Rules.jumpToFinish;
-};
-
-Rules.conclusionPDF = function (conclusion) {
-  Rules.conclusion(conclusion);
-  Values.conclusion_generate_pdf = true;
-  return Rules.jumpToFinish;
-};
-
-Rules.addFlag = function(flag) {
-  Values.flags.push(flag);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Calculated/inferred properties
-////////////////////////////////////////////////////////////////////////////////
-
-Rules.is203 = function () {
-  return (Values.conclusion == "A.iii");
-};
-
-Rules.is304 = function () {
-  return (['A.i', 'A.ii', 'A.i-ii'].indexOf(Values.conclusion) > -1);
-};
-
-Rules.hasPublicDomainFlags = function () {
-  var result = false;
-  for (var i = 0; i < Values.flags.length; i++) {
-    if (Values.flags[i][0] == 'B') {
-      result = true;
-    }
-  }
-  return result;
-};
-
-Rules.beforeEndOfNoticeWindow = function () {
-  return ((Values.notice_end != undefined)
-      && (Values.notice_end >= Values.current_year))
-    || ((Values.d_notice_end != undefined)
-    && (Values.d_notice_end >= Values.current_year))
-    || ((Values.p_notice_end != undefined)
-    && (Values.p_notice_end >= Values.current_year));
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Section N Analyses
-////////////////////////////////////////////////////////////////////////////////
-
-Rules.section304Analysis = function () {
-  // Note that this is part of the logic from the section 203 analysis
-  var result = 's1q1f';
-  if (Values.k_year < 1978) {
-    result = 's2q2a';
-    Rules.addFlag('F.i');
-    if ((Values.pub_year > 1977) && (Values.reg_year > 1977)) {
-      result = Rules.conclusion('B.vii');
-    } else {
-      // Under the 1909 Act, copyright term begins at the earlier of
-      // the registration date and the publication date.
-      // If the work is both registered and published use the minimum of them.
-      if ((Values.reg_year != undefined)
-          && (Values.pub_year != undefined)) {
-            Values.cright_year = Math.min(Values.pub_year,
-                                          Values.reg_year);
-      }
-      // Otherwise use whichever value is set. One *will* be set here, see top.
-      else {
-        Values.cright_year = Values.reg_year || Values.pub_year;
-      }
-      Values.cright_year = Math.min(Values.cright_year, 1978);
-      Values.term_begin = Values.cright_year + 56;
-      Values.term_begin = Math.max(Values.term_begin, 1978);
-      Values.term_end = Values.term_begin + 5;
-      Values.notice_begin = Values.term_begin - 10;
-      Values.notice_end = Values.term_end - 2;
-      // If the we're presently before the 304(c) window, then we don't have to worry about 304(d)
-	if (Values.notice_begin > Values.current_year) {
-        Rules.addFlag('A.i.a');
-       // Following Copyright Office guidance, works copyrighted before 1940 may also be eligible for termination under 304d
-       } else if (Values.cright_year < 1940) {
-          Rules.addFlag('F.ii');
-          Values.d_term_begin = Values.term_begin + 19;
-          Values.d_term_end = Values.d_term_begin + 5;
-          Values.d_notice_begin = Values.d_term_begin - 10;
-          Values.d_notice_end = Values.d_term_end - 2;
-          if (Values.cright_year > 1936) {
-            Rules.addFlag('G.i');
-          }
-          if (Values.cright_year == 1939) {
-            Rules.addFlag('G.ii.a');
-          }
-          if (Values.d_notice_begin > Values.current_year) {
-            // time traveler flag -- applies where the present day is between
-            // the 304(c) and 304(d) notice windows
-            Rules.addFlag('A.iii.a');
-          } else if (Values.d_notice_end < Values.current_year) {
-            Rules.addFlag('A.ii.a');
-          }
-       } else if (Values.notice_end < Values.current_year) {
-         Rules.addFlag('A.ii.a');
-       } else {
-         // Here for clarity / to reflect decision tree structure
-         // But note that we set it as the result above.
-         result = 's2q2a';
-       }
-    }
-    if ((Values.d_term_begin != undefined)
-        && (Values.term_begin != undefined)) {
-      Rules.addFlag('E.i');
-    }
-  }
-  return result;
-};
-
-Rules.section203Analysis = function () {
-  var result = 's2q2a';
-  if (typeof Values.grant_pub_year !== 'undefined') {
-    Rules.addFlag('F.iv');
-  }
-  Values.triggering_pub_year = Values.grant_pub_year || Values.pub_year;
-  if (Values.k_year > 1977) {
-    Rules.addFlag('F.iii');
-    if (Values.pub_right == 'yes' ) {
-      if (Values.triggering_pub_year != undefined) {
-        Values.term_begin = Math.min(Values.triggering_pub_year + 35 ,
-                                     Values.k_year + 40);
-      } else {
-        Values.term_begin = Values.k_year + 40;
-      }
-    } else if ((Values.triggering_pub_year != Values.k_year)
-           || (Values.pub_right == 'no'))  {
-      Values.term_begin = Values.k_year + 35;
-    }
-    if (Values.term_begin != undefined) {
-      Values.term_end = Values.term_begin + 5;
-      Values.notice_begin = Values.term_begin - 10;
-      Values.notice_end = Values.term_end - 2;
-      if (Values.notice_begin > Values.current_year) {
-        Rules.addFlag('A.i.a');
-      } else if (Values.notice_end < Values.current_year) {
-        Rules.addFlag('A.ii.a');
-      }
-    }
-    if (Values.pub_right == 'maybe') {
-      Values.p_term_begin = Values.k_year + 40;
-      if (Values.triggering_pub_year != undefined) {
-        Values.p_term_begin = Math.min(Values.triggering_pub_year + 35,
-                                       Values.p_term_begin);
-      }
-      Values.p_term_end = Values.p_term_begin  + 5;
-      Values.p_notice_begin = Values.p_term_begin - 10;
-      Values.p_notice_end = Values.p_term_end - 2;
-      if (Values.p_notice_begin > Values.current_year) {
-        Rules.addFlag('A.i.a');
-      } else if (Values.p_notice_end < Values.current_year) {
-        Rules.addFlag('A.ii.a');
-      }
-    }
-  }
-  if ((Values.p_term_begin != undefined)
-      && (Values.term_begin != undefined)) {
-      Rules.addFlag('E.ii');
-  }
-  return result;
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Section 1
-////////////////////////////////////////////////////////////////////////////////
-
-// When was the work created?
-
-Rules.s1q1a = 's1q1b';
-
-// Has the work been published?
-
-Rules.s1q1b = Rules.simpleYesNoRule('work_published',
-                                    's1q1bi',
-                                    's1q1c');
-
-// When was the work first published?
-
-Rules.s1q1bi = 's1q1bii';
-
-// When was the work first published under the grant?
-// Note that the condition is based on s1q1b, we are inserting this question
-// after 'When was the work first published?' and *then* going on to the
-// questions about registration/notices or not.
-
-Rules.s1q1bii = function () {
-  var result = undefined;
-  if (Values.pub_year < 1923) {
-    result = Rules.conclusion('B.viii');
-  } else if (Values.pub_year < 1990)
-    result = 's1q1bi2';
-  else {
-    result = 's1q1d';
-  }
-  return result;
-};
-
-// Works from 1989 and earlier usually display a copyright notice...
-
-Rules.s1q1bi2 = function () {
-  var result = undefined;
-  if (Values.copyright_notice == 'yes') {
-    result = 's1q1c';
-  } else if (Values.copyright_notice == 'no') {
-    // The same
-    result = 's1q1c';
-    if (Values.pub_year < 1989) {
-      Rules.addFlag('B.i');
-    } else {
-      Rules.addFlag('B.ii');
-    }
-  } else /* maybe */ {
-    result = 's1q1c';
-    Rules.addFlag('B.iii');
-  }
-  return result;
-};
-
-// Has the work been registered with the United State Copyright Office?
-
-Rules.s1q1c = function () {
-  var result = undefined;
-  if (Values.work_registered == 'yes') {
-    result = 's1q1ci';
-  } else if (Values.work_registered == 'no') {
-    result = 's1q1d';
-  } else /* don't know */ {
-    // If someone doesn't know, continue without asking for registration number
-    result = 's1q1d';
-  }
-  return result;
-};
-
-// When was the work registered with the United States Copyright Office?
-
-Rules.s1q1ci = function () {
-  var result = undefined;
-  if (Values.reg_year < 1923) {
-    result = Rules.conclusion('B.viii');
-  } else {
-    result = 's1q1d';
-  }
-  return result;
-};
-
-// For s1q1d,
-// What is the date of the agreement or transfer? ...
-
-Rules.s1q1d = function () {
-  var result = undefined;
-  if (Values.user_inputted_k_year != Values.k_year) {
-    Rules.addFlag('H.i');
-  }
-  if ((Values.k_year < 1978)
-      && ((Values.pub_year == undefined)
-      && (Values.reg_year == undefined))) {
-      result = Rules.conclusion('B.vii');
-  } else {
-    // Intercept the result so we can add encouragement if things look good
-    result = Rules.section304Analysis();
-    if ((result != Rules.jumpToFinish)
-    && Rules.beforeEndOfNoticeWindow()
-    && (! Rules.hasPublicDomainFlags())) {
-    Notifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
-    }
-  }
-  return result;
-};
-
-// Did the agreement or transfer include the right of publication?
-
-Rules.s1q1f = function () {
-  // Intercept the result so we can add encouragement if things look good
-  var result = Rules.section203Analysis();
-  if ((result != Rules.jumpToFinish)
-      && Rules.beforeEndOfNoticeWindow()
-      && (! Rules.hasPublicDomainFlags())) {
-    Notifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
-  }
-  return result;
-};
-
-
-Rules.section203Analysis;
-
-////////////////////////////////////////////////////////////////////////////////
-// Section 2
-////////////////////////////////////////////////////////////////////////////////
-
-// Is the agreement or transfer you want to terminate part of a last will...
-
-Rules.s2q2a = function () {
-  var result = undefined;
-  if (Values.last_will == 'yes') {
-    result = Rules.conclusion('B.iv');
-  } else {
-    if ((Values.creation_year > 1977)
-    || (((Values.pub_year == undefined) || (Values.pub_year > 1977))
-        && ((Values.reg_year == undefined) || (Values.reg_year > 1977)))) {
-      result = 's2q2bi';
-    } else {
-      result = 's2q2c';
-    }
-  }
-  return result;
-};
-
-// Are any of the authors still alive?
-// It's i) because the conditional logic that starts b is included in a
-
-Rules.s2q2bi = function () {
-  var result = undefined;
-  if (Values.any_authors_alive == 'yes') {
-    result = 's2q2c'
-  } else {
-    result = 's2q2bi2';
-  }
-  return result;
-};
-
-// What is the year the last surviving author died?
-
-Rules.s2q2bi2 = function () {
-  var result = undefined;
-  // creation_year is always set, pub_year may not be, death will be here
-  if (Values.creation_year > 1977) {
-    Values.pd = Values.death + 71;
-  } else if ((Values.pub_year != undefined)
-     && (Values.pub_year < 2003)) {
-    Values.pd = Math.max((Values.death + 71), 2048);
-  } else {
-    Values.pd = Math.max((Values.death + 71), 2003);
-  }
-  // pd *will* have been set in the if/else block
-  if (Values.current_year > Values.pd) {
-    result = Rules.conclusion('B.viii');
-  } else {
-    result = 's2q2c';
-  }
-  return result;
-};
-
-// Was the work created within the scope of the author’s employment?
-
-Rules.s2q2c = function () {
-  var result = undefined;
-  if (Values.within_scope_of_employment == 'yes') {
-    if (Values.creation_year > 1977) {
-      result = 's2q2ci';
-    } else {
-      result = Rules.conclusion('B.i');
-    }
-  } else {
-    result = 's2q2d';
-  }
-  return result
-};
-
-// Was there an express agreement between you...
-
-Rules.s2q2ci = function () {
-  var result = undefined;
-   if (Values.express_agreement == 'yes') {
-    result = 's2q2d';
-   } else {
-     result = Rules.conclusion('B.i');
-  }
-  return result;
-};
-
-// Was the work created in response to a special order or commission?
-
-Rules.s2q2d = function () {
-  var result = undefined;
-  if (Values.special_order == 'yes') {
-    if (Values.creation_year < 1978) {
-      Rules.addFlag('D.i');
-      result = 's2q2e';
-    } else {
-      result = 's2q2di';
-    }
-  } else {
-    result = 's2q2e';
-  }
-  return result
-};
-
-// Was there a signed written agreement regarding the special order...
-
-Rules.s2q2di = function () {
-  var result = undefined;
-  if (Values.signed_written_agreement == 'yes') {
-    if (Values.creation_year < 1978) {
-      result = Rules.conclusion('B.iii');
-    } else {
-      result = 's2q2dia';
-    }
-  } else {
-    result = 's2q2e';
-  }
-  return result
-};
-
-// Was the work created for use as one of the following? ...
-
-Rules.s2q2dia = function () {
-  var result = undefined;
-  if (Values.created_as_part_of_motion_picture == 'yes') {
-    result = Rules.conclusion('C.ii');
-  } else if (Values.created_as_part_of_motion_picture == 'no') {
-    result = 's2q2e';
-  } else /* don't know */ {
-    Rules.addFlag('D.ii');
-    result = 's2q2e';
-  }
-  return result;
-};
-
-// Has the original transfer since been renegotiated or altered?
-
-Rules.s2q2e = function () {
-  var result = 's2q2f';
-  if (Values.renego == 'yes') {
-    Rules.addFlag('C.i');
-  } else if (Values.renego == 'no') {
-    // Continue
-  } else /* don't know */ {
-    Rules.addFlag('C.ii');
-  }
-  return result;
-};
-
-// Did one or more of the authors or artists enter into the agreement...
-
-Rules.s2q2f = function () {
-  var result = undefined;
-  if (Values.authors_entered_agreement == 'yes') {
-    if (Values.k_year < 1978) {
-      result = Rules.conclusionPDF('A.i-ii');
-    } else /*if (k_year > 1977)*/ {
-      result = Rules.conclusionPDF('A.iii');
-    }
-  } else {
-    if (Values.k_year < 1978) {
-      result = 's2q2fii';
-    } else /*if (Values.k_year > 1977)*/ {
-      result = Rules.conclusion('B.vi');
-    }
-  }
-  return result;
-};
-
-// Was the agreement or transfer made by a member of...
-
-Rules.s2q2fii = function () {
-  var result = undefined;
-  if (Values.agreement_by_family_or_executor) {
-    result = Rules.conclusionPDF('A.i-ii');
-  } else {
-    result = Rules.conclusion('B.v');
-  }
-  return result
- };
diff --git a/wordpress-plugin/js/validation.js b/wordpress-plugin/js/validation.js
deleted file mode 100644
index 67e58c2..0000000
--- a/wordpress-plugin/js/validation.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016  Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// Validation of values and of UI state
-////////////////////////////////////////////////////////////////////////////////
-
-var Validation = {};
-
-// Naughty. If we're going to monkeypatch we should have a file for these
-
-String.prototype.capitalizeFirstLetter = function() {
-    return this.charAt(0).toUpperCase() + this.slice(1);
-}
-
-Validation.allowOnlyNumbers = function (element) {
-  // http://stackoverflow.com/a/995193
-  element.keydown(function (e) {
-    // Allow: backspace, delete, tab, escape, enter and .
-    if (jQuery.inArray(e.keyCode, [46, 8, 9, 27, 13, 110, 190]) !== -1 ||
-        // Allow: Ctrl+A, Command+A
-        (e.keyCode == 65 && ( e.ctrlKey === true || e.metaKey === true ) ) ||
-        // Allow: home, end, left, right, down, up
-        (e.keyCode >= 35 && e.keyCode <= 40)) {
-      // let it happen, don't do anything
-      return;
-    }
-    // Ensure that it is a number and stop the keypress
-    if ((e.shiftKey || (e.keyCode < 48 || e.keyCode > 57))
-        && (e.keyCode < 96 || e.keyCode > 105)) {
-      e.preventDefault();
-    }
-  });
-};
-
-// false here means no errors, a string means errors
-
-Validation.validDate = function () {
-  var text_field = jQuery('.text-question');
-  var date = text_field.val();
-  var result = false;
-  var errors = [];
-  if (! date.match(/[0-9]{4}/)) {
-    errors.push("date must be four digits");
-  }
-  if (parseInt(date) > Values.current_year) {
-    errors.push("date must be in the past");
-  }
-  if (errors.length != 0) {
-    result = errors.join().capitalizeFirstLetter() + '.';
-  }
-  return result;
-};
diff --git a/wordpress-plugin/js/values.js b/wordpress-plugin/js/values.js
deleted file mode 100644
index 6952c06..0000000
--- a/wordpress-plugin/js/values.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016  Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// Storing answers and computed values
-// Questions save their answers here,
-// Rules consult these values and add their own.
-////////////////////////////////////////////////////////////////////////////////
-
-var Values = {};
-
-Values.reset = function () {
-  var now = new Date();
-  Values = {
-    current_date: now,
-    current_year: now.getFullYear(),
-    flags: []
-  };
-};
-
-//FIXME: Hello namespace pollution
-
-var varsToTitles = {
-  work_authors: 'Author',
-  work_title: 'Title of Work',
-  creation_year: 'Creation Year',
-  pub_year: 'Publication Year',
-  grant_pub_year: 'Publication Year Under Grant',
-  triggering_pub_year: 'Triggering Publication Date',
-  k_year: 'Effective Grant Year',
-  user_inputted_k_year: 'User Entered Grant Year',
-  reg_year: 'Copyright Registration Year',
-  work_copyright_reg_num: 'Registration Number',
-  termination_type: 'Termination Type',
-  work_agreement_type: 'Agreement or Transfer Type',
-  work_agreement_desc: 'Agreement or Transfer Description',
-  //'': 'Grantor',
-};
-
-var ValuesStack = {};
-
-ValuesStack._stack = [];
-
-ValuesStack.height = function () {
-  return this._stack.length;
-};
-
-ValuesStack.push = function () {
-  // Handle the date not liking being serialized.
-  var now = Values.current_date;
-  this._stack.push(Values);
-  // Deep clone
-  Values = JSON.parse(JSON.stringify(Values));
-  Values.current_date = now;
-};
-
-ValuesStack.pop = function () {
-  Values = this._stack.pop();
-};
diff --git a/wordpress-plugin/js/widgets.js b/wordpress-plugin/js/widgets.js
deleted file mode 100644
index 0ff4855..0000000
--- a/wordpress-plugin/js/widgets.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016  Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// Control of the html UI
-////////////////////////////////////////////////////////////////////////////////
-
-var Widgets = {};
-
-////////////////////////////////////////////////////////////////////////////////
-// Visual display of the user's responses
-////////////////////////////////////////////////////////////////////////////////
-
-var Answers = {};
-
-Answers.resetAnswers = function () {
-  jQuery('#answers-table-rows').empty();
-};
-
-Answers.appendAnswer = function (myId, label, value) {
-  if (! label) {
-    label = jQuery('#' + myId + '> label').first().text();
-  }
-  // If the user has gone back and is changing the answer, first remove it
-  Answers.removeAnswer(myId);
-  jQuery('#answers-table-rows').append('<tr id="answer-row-' + myId + '"><td>'
-				       + label + '</td><td align="right">'
-				       + value  + '</td></tr>');
-};
-
-Answers.removeAnswer = function (myId) {
-  jQuery('#answer-row-' + myId).remove();
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Notifications and other notices
-////////////////////////////////////////////////////////////////////////////////
-
-var Notifications = {};
-
-Notifications.clearAlerts = function () {
-  jQuery('#alert-area').empty();
-};
-
-Notifications.setAlert = function (message) {
-  Notifications.clearAlerts();
-  jQuery('#alert-area').append('<div class="alert alert-warning" role="alert">'
-                               + message
-                               + '</div>');
-};
-
-Notifications.setEncouragement = function (message) {
-  Notifications.clearAlerts();
-  jQuery('#alert-area').append('<div class="alert alert-success" role="alert">'
-                               + message
-                               + '</div>');
-};
-
-Notifications.displayAnswersHint = function () {
-  jQuery('#answers-table-rows').append('<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>');
-};
-
-Notifications.removeAnswersHint = function () {
-  jQuery('#answers-table-row-placeholder').remove();
-};
-
-Notifications.displayResultArea = function () {
-  jQuery('#result-area').removeClass('hidden');
-};
-
-Notifications.hideResultArea = function () {
-  jQuery('#result-area').addClass('hidden');
-};
-
-Notifications.setResultAreaMessage = function (obj, panelClass) {
-  jQuery('#result-area').addClass(panelClass);
-  jQuery('#result-area-title').html(obj.title);
-  jQuery('#result-area-message').html(obj.description);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Navigation of questions
-////////////////////////////////////////////////////////////////////////////////
-
-var Navigation = {};
-
-Navigation.progressStack = [];
-
-// These return true so we can use them as "handlers" in simpleNextQuestion
-
-Navigation.disableNext = function () {
-  jQuery('#button-question-next').prop("disabled", true);
-  return true;
-};
-
-Navigation.disablePrevious = function () {
-  jQuery('#button-question-back').prop("disabled", true);
-  return true;
-};
-
-Navigation.enableNext = function () {
-  jQuery('#button-question-next').prop("disabled", false);
-  return true;
-};
-
-Navigation.enablePrevious = function () {
-  jQuery('#button-question-back').prop("disabled", false);
-  return true;
-};
-
-Navigation.showNextPrevious = function () {
-  jQuery("#question-progress-buttons").removeClass('hidden');
-};
-
-Navigation.hideQuestions = function () {
-  jQuery('#questionnaire-section').addClass('hidden');
-  jQuery('.form-group').addClass('hidden');
-};
-
-Navigation.showQuestions = function () {
-  jQuery('#questionnaire-section').removeClass('hidden');
-  jQuery('.form-group').removeClass('hidden');
-};
-
-Navigation.hideNoJSWarning = function () {
-};
-
-Navigation.showAnswersTable = function () {
-  jQuery("#answers-table").removeClass('hidden');
-};
-
-// After this, do not restart the questionnaire, reload the page to restart
-
-Navigation.finishQuestions = function () {
-  Navigation.hideQuestions();
-  Notifications.displayResultArea();
-  Navigation.disableNext();
-  jQuery("#button-restart").removeClass('hidden');
-};
-
-Navigation.unfinishQuestions = function () {
-  Navigation.showQuestions();
-  Notifications.hideResultArea();
-  jQuery("#button-restart").addClass('hidden');
-};
diff --git a/wordpress-plugin/result-pdf.php b/wordpress-plugin/result-pdf.php
deleted file mode 100644
index c3920e6..0000000
--- a/wordpress-plugin/result-pdf.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*
-    Termination of Transfer - tool to help in returning authors rights.
-    Copyright (C) 2016, 2017 Creative Commons Corporation.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-require __DIR__ . '/../vendor/autoload.php';
-
-////////////////////////////////////////////////////////////////////////////////
-// Make sure we have the data to decode
-////////////////////////////////////////////////////////////////////////////////
-
-if (! isset($_POST['data'])) {
-    exit('No data provided.');
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Decode the data
-////////////////////////////////////////////////////////////////////////////////
-
-$data = json_decode($_POST['data'], true);
-
-////////////////////////////////////////////////////////////////////////////////
-// Make sure the data is well-structured
-////////////////////////////////////////////////////////////////////////////////
-
-if (!isset($data['report_timestamp'])) {
-    exit('Report timestamp not provided.');
-}
-
-if (!isset($data['conclusion'])) {
-    exit('Conclusion not provided.');
-}
-
-if (!isset($data['flags'])) {
-    exit('Flags not provided.');
-}
-
-if (!isset($data['details'])) {
-    exit('Details not provided.');
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Flag and conclusion expansion
-////////////////////////////////////////////////////////////////////////////////
-
-$results_json = file_get_contents(__DIR__ . '/js/results.json');
-$results_strings = json_decode($results_json, $assoc=true);
-
-function flag_title_and_description ($spec)
-{
-    global $results_strings;
-    $path = explode('.', $spec);
-    // A, B, C, D
-    $section = $results_strings['Flag'][$path[0]];
-    // i, ii, iii
-    $subsection = $section[$path[1]];
-    // For historical reasons, some flags take their section title and have
-    // their description under 'b', and others have their own title and their
-    // description under 'description'
-    if (array_key_exists('description', $subsection)) {
-        $title = $subsection['title'];
-        $description = $subsection['description'];
-    } else {
-        $title = $section['title'];
-        $description = $subsection['b'];
-    }
-    return [$title, $description];
-}
-
-$flags = array_map('flag_title_and_description', $data['flags']);
-
-$conclusion_path = explode('.', $data['conclusion']);
-$conclusion_section = $results_strings['Conclusion'][$conclusion_path[0]];
-$conclusion_title = $conclusion_section['title'];
-$conclusion_details = $conclusion_section[$conclusion_path[1]];
-$conclusion_subtitle = $conclusion_details['title'];
-$conclusion_description = $conclusion_details['description'];
-
-////////////////////////////////////////////////////////////////////////////////
-// Fill out the template with the details from the provided data
-////////////////////////////////////////////////////////////////////////////////
-
-$now_timestamp = intval($data['report_timestamp']);
-
-$smarty = new Smarty;
-$smarty->setCompileDir(__DIR__ . '/../templates_c');
-$smarty->assign('date', date('jS F Y', $now_timestamp));
-$smarty->assign('flags', $flags);
-$smarty->assign('details', $data['details']);
-$smarty->assign('conclusion_title', $conclusion_title);
-$smarty->assign('conclusion_subtitle', $conclusion_subtitle);
-$smarty->assign('conclusion_description', $conclusion_description);
-$html = $smarty->fetch(__DIR__ . '/../template/result.tpl');
-
-////////////////////////////////////////////////////////////////////////////////
-// Generate and return the PDF
-////////////////////////////////////////////////////////////////////////////////
-
-$mpdf = new mPDF();
-$mpdf->WriteHTML($html);
-$mpdf->Output('ToT.pdf', 'I');

From 22fa47bf045b3328d41d9d3e91e42ba33a9078df Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Thu, 13 Oct 2022 13:31:06 +0100
Subject: [PATCH 055/196] updated generateHtml method's comment

---
 Dockerfile       | 2 +-
 src/WpPlugin.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 41b7611..3a96aea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 FROM wordpress
 
 # install unzip for composer
-RUN apt-get update && apt-get install apt-utils zip unzip
+RUN apt-get update && apt-get install apt-utils zip unzip -y
 
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
diff --git a/src/WpPlugin.php b/src/WpPlugin.php
index 0faceaa..9a33fb4 100644
--- a/src/WpPlugin.php
+++ b/src/WpPlugin.php
@@ -18,7 +18,9 @@ public function __construct()
     }
 
     /**
-     * This will only work in 5.3 or later and WP 3.8 allows 2.4.2+ ... 
+     * The HTML code to display
+     * 
+     * @return String The HTML string
      */
     public function generateHtml()
     {

From 507051c6bd6e7e34028fe6d939dfef90634d5026 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Thu, 13 Oct 2022 13:56:40 +0100
Subject: [PATCH 056/196] updated handleShortcode method's comment

---
 src/TerminationOfTransfer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/TerminationOfTransfer.php b/src/TerminationOfTransfer.php
index 1178927..86a2e81 100644
--- a/src/TerminationOfTransfer.php
+++ b/src/TerminationOfTransfer.php
@@ -63,6 +63,7 @@ public function run()
     
 
     /**
+     * Registers the assets then return the HTML code to display
      * 
      * @param $atts Array
      */

From 4b6ec6c2a87f857752be9c76e41b27e3938bd927 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Thu, 13 Oct 2022 14:00:07 +0100
Subject: [PATCH 057/196] created assets folder to house plugin assets and
 moved js folder into it

---
 {src => assets}/js/pdf.js        | 0
 {src => assets}/js/questions.js  | 0
 {src => assets}/js/rendering.js  | 0
 {src => assets}/js/results.json  | 0
 {src => assets}/js/rules.js      | 0
 {src => assets}/js/validation.js | 0
 {src => assets}/js/values.js     | 0
 {src => assets}/js/widgets.js    | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename {src => assets}/js/pdf.js (100%)
 rename {src => assets}/js/questions.js (100%)
 rename {src => assets}/js/rendering.js (100%)
 rename {src => assets}/js/results.json (100%)
 rename {src => assets}/js/rules.js (100%)
 rename {src => assets}/js/validation.js (100%)
 rename {src => assets}/js/values.js (100%)
 rename {src => assets}/js/widgets.js (100%)

diff --git a/src/js/pdf.js b/assets/js/pdf.js
similarity index 100%
rename from src/js/pdf.js
rename to assets/js/pdf.js
diff --git a/src/js/questions.js b/assets/js/questions.js
similarity index 100%
rename from src/js/questions.js
rename to assets/js/questions.js
diff --git a/src/js/rendering.js b/assets/js/rendering.js
similarity index 100%
rename from src/js/rendering.js
rename to assets/js/rendering.js
diff --git a/src/js/results.json b/assets/js/results.json
similarity index 100%
rename from src/js/results.json
rename to assets/js/results.json
diff --git a/src/js/rules.js b/assets/js/rules.js
similarity index 100%
rename from src/js/rules.js
rename to assets/js/rules.js
diff --git a/src/js/validation.js b/assets/js/validation.js
similarity index 100%
rename from src/js/validation.js
rename to assets/js/validation.js
diff --git a/src/js/values.js b/assets/js/values.js
similarity index 100%
rename from src/js/values.js
rename to assets/js/values.js
diff --git a/src/js/widgets.js b/assets/js/widgets.js
similarity index 100%
rename from src/js/widgets.js
rename to assets/js/widgets.js

From 4d93555459812001971ec27fae6c91d5424ee623 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Thu, 13 Oct 2022 14:05:29 +0100
Subject: [PATCH 058/196] updated assets path from src to assets

---
 src/TerminationOfTransfer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TerminationOfTransfer.php b/src/TerminationOfTransfer.php
index 86a2e81..eb05d34 100644
--- a/src/TerminationOfTransfer.php
+++ b/src/TerminationOfTransfer.php
@@ -30,7 +30,7 @@ protected function registerScripts()
             $script = \explode('/', $value);
             if (isset($script[1])) {
                 $n = $script[1];
-                wp_enqueue_script( "tot-$n", plugins_url( "src/$value.js", __FILE__ ) );
+                wp_enqueue_script( "tot-$n", plugins_url( "assets/$value.js", __FILE__ ) );
             } else {
                 wp_enqueue_script($value);
             }
@@ -43,7 +43,7 @@ protected function registerStyles()
             $style = \explode('/', $value);
             if (isset($style[1])) {
                 $n = $style[1];
-                wp_enqueue_style( "tot-style-$n", plugins_url( "src/$value.css", __FILE__ ) );
+                wp_enqueue_style( "tot-style-$n", plugins_url( "assets/$value.css", __FILE__ ) );
             } else {
                 wp_enqueue_style($value);
             }

From 2deaa807ecd06a6ecbffa4da10ef5119499d0fc7 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Thu, 13 Oct 2022 14:33:44 +0100
Subject: [PATCH 059/196] changed __FILE__ to __DIR__ to refernece parent
 directory

---
 src/TerminationOfTransfer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TerminationOfTransfer.php b/src/TerminationOfTransfer.php
index eb05d34..1908d51 100644
--- a/src/TerminationOfTransfer.php
+++ b/src/TerminationOfTransfer.php
@@ -30,7 +30,7 @@ protected function registerScripts()
             $script = \explode('/', $value);
             if (isset($script[1])) {
                 $n = $script[1];
-                wp_enqueue_script( "tot-$n", plugins_url( "assets/$value.js", __FILE__ ) );
+                wp_enqueue_script( "tot-$n", plugins_url( "assets/$value.js", __DIR__ ) );
             } else {
                 wp_enqueue_script($value);
             }
@@ -43,7 +43,7 @@ protected function registerStyles()
             $style = \explode('/', $value);
             if (isset($style[1])) {
                 $n = $style[1];
-                wp_enqueue_style( "tot-style-$n", plugins_url( "assets/$value.css", __FILE__ ) );
+                wp_enqueue_style( "tot-style-$n", plugins_url( "assets/$value.css", __DIR__ ) );
             } else {
                 wp_enqueue_style($value);
             }

From f5ff8c992b97c3bbad7d602048924f78bd266d9d Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Thu, 13 Oct 2022 16:06:39 +0100
Subject: [PATCH 060/196] updated file location

---
 assets/js/questions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index ad73a51..c79d3f4 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -348,7 +348,7 @@ Questions.resultMap = undefined;
 // Asynchronous fetch of data that is accessed synchronously.
 // This data won't be used until after several questions, so this is tolerable.
 
-jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/js/questions.js']")
+jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/assets/js/questions.js']")
                .attr('src').replace(/questions\.js.*$/, '')
                + 'results.json')
     .done(function (result) {

From b93b521167f2762df1461cb5755eb136c87ae638 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 05:56:01 +0100
Subject: [PATCH 061/196] removed extra-host field from docker-compose.dev.yml

---
 docker-compose.dev.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 328216d..a1d1c7c 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -11,8 +11,6 @@ services:
     WORDPRESS_DB_NAME: wordpress
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
-  extra_hosts:
-   - 'host.docker.internal:108.61.222.241'
   ports:
    - 8701:80
   networks:
@@ -45,8 +43,6 @@ services:
     - PMA_HOST=172.25.0.2
    networks:
     tot-server:
-   extra_hosts:
-    - 'host.docker.internal:108.61.222.241'
 
 volumes:
  tot-space:

From 35971424e416e3d1db2af539e848cd45cfc2056b Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 06:04:29 +0100
Subject: [PATCH 062/196] updated network and volumn names in 
 docker-compose.dev.yml and added the plugin folder as a volumn to enable
 real-time updates on file changes during development

---
 docker-compose.dev.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index a1d1c7c..b7bacbb 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,29 +7,29 @@ services:
   restart: always
   environment:
     WORDPRESS_DEBUG: 1
-    WORDPRESS_DB_HOST: 172.25.0.2
+    WORDPRESS_DB_HOST: 192.168.128.2
     WORDPRESS_DB_NAME: wordpress
     WORDPRESS_DB_PASSWORD: SqlNotTooMuch
     WORDPRESS_DB_USER: codex
   ports:
    - 8701:80
   networks:
-    tot-server:
+    server:
   volumes:
-   - tot-space:/etc/php
+   - ./:/var/www/html/wp-content/plugins/termination-of-transfer
 
  mariadb:
   image: mariadb
   restart: always
   networks:
-    tot-server:
+    server:
   environment:
     MARIADB_ROOT_PASSWORD: NotTooMuch
     MARIADB_USER: codex
     MARIADB_PASSWORD: SqlNotTooMuch
   volumes:
    - ./my.cnf:/etc/mysql/my.cf
-   - tot-sql:/var/lib/mysql
+   - sql:/var/lib/mysql
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
 
  phpmyadmin:
@@ -40,12 +40,11 @@ services:
    environment:
     - PMA_ARBITRARY=0
     #- PMA_PORT=3006
-    - PMA_HOST=172.25.0.2
+    - PMA_HOST=192.168.128.2
    networks:
-    tot-server:
+    server:
 
 volumes:
- tot-space:
- tot-sql:
+ sql:
 networks:
-  tot-server:
\ No newline at end of file
+  server:
\ No newline at end of file

From bb08122835c8672f6813966c4e88e0dabd97cf06 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 06:06:55 +0100
Subject: [PATCH 063/196] updated pdf file path

---
 assets/js/pdf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index a9b6b65..d81fc37 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -23,7 +23,7 @@
 
 var PDF = {};
 
-PDF.url = jQuery("script[src*='/termination-of-transfer/src/js/pdf.js']")
+PDF.url = jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
 	       .attr('src').replace(/js\/pdf\.js.*$/, '')
 	       + 'ResultPdf.php';
 

From 19b5c90b9df8e127c3116fbc145e85096daca561 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 06:09:40 +0100
Subject: [PATCH 064/196] removed my.cnf file and its reference since we are
 not using it

---
 docker-compose.dev.yml |   1 -
 my.cnf                 | 134 -----------------------------------------
 2 files changed, 135 deletions(-)
 delete mode 100644 my.cnf

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index b7bacbb..b68054f 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -28,7 +28,6 @@ services:
     MARIADB_USER: codex
     MARIADB_PASSWORD: SqlNotTooMuch
   volumes:
-   - ./my.cnf:/etc/mysql/my.cf
    - sql:/var/lib/mysql
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
 
diff --git a/my.cnf b/my.cnf
deleted file mode 100644
index bdafc54..0000000
--- a/my.cnf
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# These groups are read by MariaDB server.
-# Use it for options that only the server (but not clients) should see
-#
-# See the examples of server my.cnf files in /usr/share/mysql/
-#
-
-# this is read by the standalone daemon and embedded servers
-[server]
-
-# this is only for the mysqld standalone daemon
-[mysqld]
-
-#
-# * Basic Settings
-#
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-port		= 3306
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-lc-messages-dir	= /usr/share/mysql
-skip-external-locking
-
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-bind-address		= 0.0.0.0
-
-#
-# * Fine Tuning
-#
-key_buffer_size		= 16M
-max_allowed_packet	= 16M
-thread_stack		= 192K
-thread_cache_size       = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam_recover_options  = BACKUP
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
-
-#
-# * Query Cache Configuration
-#
-query_cache_limit	= 1M
-query_cache_size        = 16M
-
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /var/log/mysql/mysql.log
-#general_log             = 1
-#
-# Error log - should be very few entries.
-#
-log_error = /var/log/mysql/error.log
-#
-# Enable the slow query log to see queries with especially long duration
-#slow_query_log_file	= /var/log/mysql/mariadb-slow.log
-#long_query_time = 10
-#log_slow_rate_limit	= 1000
-#log_slow_verbosity	= query_plan
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-#server-id		= 1
-#log_bin			= /var/log/mysql/mysql-bin.log
-expire_logs_days	= 10
-max_binlog_size   = 100M
-#binlog_do_db		= include_database_name
-#binlog_ignore_db	= exclude_database_name
-
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates you can use for example the GUI tool "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-#
-# Accept only connections using the latest and most secure TLS protocol version.
-# ..when MariaDB is compiled with OpenSSL:
-# ssl-cipher=TLSv1.2
-# ..when MariaDB is compiled with YaSSL (default in Debian):
-# ssl=on
-
-#
-# * Character sets
-#
-# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full
-# utf8 4-byte character set. See also client.cnf
-#
-character-set-server  = utf8mb4
-collation-server      = utf8mb4_general_ci
-
-#
-# * Unix socket authentication plugin is built-in since 10.0.22-6
-#
-# Needed so the root database user can authenticate without a password but
-# only when running as the unix root user.
-#
-# Also available for other users if required.
-# See https://mariadb.com/kb/en/unix_socket-authentication-plugin/
-
-# this is only for embedded server
-[embedded]
-
-# This group is only read by MariaDB servers, not by MySQL.
-# If you use the same .cnf file for MySQL and MariaDB,
-# you can put MariaDB-only options here
-[mariadb]
-
-# This group is only read by MariaDB-10.1 servers.
-# If you use the same .cnf file for MariaDB of different versions,
-# use this group for options that older servers don't understand
-[mariadb-10.1]
\ No newline at end of file

From f28300ffbc1b438545200aebd0cc5040dc6fc450 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 06:26:26 +0100
Subject: [PATCH 065/196] added composer-fix.sh as entrypoint to ensure
 dependencies are installed in other to avoid vendor/autoload include error.

---
 composer-fix.sh        | 9 +++++++++
 docker-compose.dev.yml | 2 ++
 2 files changed, 11 insertions(+)
 create mode 100755 composer-fix.sh

diff --git a/composer-fix.sh b/composer-fix.sh
new file mode 100755
index 0000000..f3efecd
--- /dev/null
+++ b/composer-fix.sh
@@ -0,0 +1,9 @@
+if [ -d /var/www/html/wp-content/plugins/termination-of-transfer ]; then
+  
+   # change directory
+   cd /var/www/html/wp-content/plugins/termination-of-transfer
+
+   # ensure dependencies are installed
+   composer update
+
+fi
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index b68054f..9b90480 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -16,7 +16,9 @@ services:
   networks:
     server:
   volumes:
+   - composer-fix.sh:/var/www/html/composer-fix.sh
    - ./:/var/www/html/wp-content/plugins/termination-of-transfer
+  entrypoint: chmod +x composer-fix.sh && ./composer-fix.sh
 
  mariadb:
   image: mariadb

From 8173a026695b5130ef35c324221ea61c329e95fc Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 06:58:43 +0100
Subject: [PATCH 066/196] updated pdf result url

---
 assets/js/pdf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index d81fc37..f2a7393 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -25,7 +25,7 @@ var PDF = {};
 
 PDF.url = jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
 	       .attr('src').replace(/js\/pdf\.js.*$/, '')
-	       + 'ResultPdf.php';
+	       + 'src/ResultPdf.php';
 
 PDF.appendProperty = function (details, key, value) {
   var mapping = {key: key,

From 89da99ab5df8a2d2e081557ae89b772b5e11aa04 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:04:30 +0100
Subject: [PATCH 067/196] updated pdf result url

---
 assets/js/pdf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index f2a7393..dd55cc6 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -24,7 +24,7 @@
 var PDF = {};
 
 PDF.url = jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
-	       .attr('src').replace(/js\/pdf\.js.*$/, '')
+	       .attr('src').replace(/assets\/js\/pdf\.js.*$/, '')
 	       + 'src/ResultPdf.php';
 
 PDF.appendProperty = function (details, key, value) {

From 71e4bac06ad43d564ec901a6b7ca6700582988bb Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:25:19 +0100
Subject: [PATCH 068/196] commented out unused variable Widgets

---
 assets/js/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 0ff4855..040b6ee 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -20,7 +20,7 @@
 // Control of the html UI
 ////////////////////////////////////////////////////////////////////////////////
 
-var Widgets = {};
+//var Widgets = {};
 
 ////////////////////////////////////////////////////////////////////////////////
 // Visual display of the user's responses

From 54a13b0b5f4dc70082f50551f044f674e785011c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:30:04 +0100
Subject: [PATCH 069/196] renamed var Answers to const TotAnswers

---
 assets/js/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 040b6ee..2e7c99e 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -26,7 +26,7 @@
 // Visual display of the user's responses
 ////////////////////////////////////////////////////////////////////////////////
 
-var Answers = {};
+const Answers = {};
 
 Answers.resetAnswers = function () {
   jQuery('#answers-table-rows').empty();

From a7c5885157e9373b776d078bd9391be869ca6d8d Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:36:08 +0100
Subject: [PATCH 070/196] updated widget.js functions to es6 arrow function

---
 assets/js/questions.js |  4 ++--
 assets/js/widgets.js   | 46 +++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index c79d3f4..8822a5d 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -329,7 +329,7 @@ Questions.processAnswer = function () {
     if (answer) {
       answer = (question.answerDisplayValue && question.answerDisplayValue())
 	       || answer;
-      Answers.appendAnswer(question.variable, question.question, answer);
+      TotAnswers.appendAnswer(question.variable, question.question, answer);
     }
     Notifications.clearAlerts();
     result = true;
@@ -440,7 +440,7 @@ Questions.previousQuestion = function () {
     Notifications.clearAlerts();
     // Clear previous answer
     var previous_question = Questions[Values.question_id];
-    Answers.removeAnswer(previous_question.variable);
+    TotAnswers.removeAnswer(previous_question.variable);
     // Scroll down to make sure the input UI is visible
     jQuery('html,body').animate({
       scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 2e7c99e..0e1ec09 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -26,24 +26,24 @@
 // Visual display of the user's responses
 ////////////////////////////////////////////////////////////////////////////////
 
-const Answers = {};
+const TotAnswers = {};
 
-Answers.resetAnswers = function () {
+TotAnswers.resetAnswers = () => {
   jQuery('#answers-table-rows').empty();
 };
 
-Answers.appendAnswer = function (myId, label, value) {
+TotAnswers.appendAnswer = (myId, label, value) => {
   if (! label) {
     label = jQuery('#' + myId + '> label').first().text();
   }
   // If the user has gone back and is changing the answer, first remove it
-  Answers.removeAnswer(myId);
+  TotAnswers.removeAnswer(myId);
   jQuery('#answers-table-rows').append('<tr id="answer-row-' + myId + '"><td>'
 				       + label + '</td><td align="right">'
 				       + value  + '</td></tr>');
 };
 
-Answers.removeAnswer = function (myId) {
+TotAnswers.removeAnswer = (myId) => {
   jQuery('#answer-row-' + myId).remove();
 };
 
@@ -53,37 +53,37 @@ Answers.removeAnswer = function (myId) {
 
 var Notifications = {};
 
-Notifications.clearAlerts = function () {
+Notifications.clearAlerts = () => {
   jQuery('#alert-area').empty();
 };
 
-Notifications.setAlert = function (message) {
+Notifications.setAlert = (message) => {
   Notifications.clearAlerts();
   jQuery('#alert-area').append('<div class="alert alert-warning" role="alert">'
                                + message
                                + '</div>');
 };
 
-Notifications.setEncouragement = function (message) {
+Notifications.setEncouragement = (message) => {
   Notifications.clearAlerts();
   jQuery('#alert-area').append('<div class="alert alert-success" role="alert">'
                                + message
                                + '</div>');
 };
 
-Notifications.displayAnswersHint = function () {
+Notifications.displayAnswersHint = () => {
   jQuery('#answers-table-rows').append('<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>');
 };
 
-Notifications.removeAnswersHint = function () {
+Notifications.removeAnswersHint = () => {
   jQuery('#answers-table-row-placeholder').remove();
 };
 
-Notifications.displayResultArea = function () {
+Notifications.displayResultArea = () => {
   jQuery('#result-area').removeClass('hidden');
 };
 
-Notifications.hideResultArea = function () {
+Notifications.hideResultArea = () => {
   jQuery('#result-area').addClass('hidden');
 };
 
@@ -103,57 +103,57 @@ Navigation.progressStack = [];
 
 // These return true so we can use them as "handlers" in simpleNextQuestion
 
-Navigation.disableNext = function () {
+Navigation.disableNext = () => {
   jQuery('#button-question-next').prop("disabled", true);
   return true;
 };
 
-Navigation.disablePrevious = function () {
+Navigation.disablePrevious = () => {
   jQuery('#button-question-back').prop("disabled", true);
   return true;
 };
 
-Navigation.enableNext = function () {
+Navigation.enableNext = () => {
   jQuery('#button-question-next').prop("disabled", false);
   return true;
 };
 
-Navigation.enablePrevious = function () {
+Navigation.enablePrevious = () => {
   jQuery('#button-question-back').prop("disabled", false);
   return true;
 };
 
-Navigation.showNextPrevious = function () {
+Navigation.showNextPrevious = () => {
   jQuery("#question-progress-buttons").removeClass('hidden');
 };
 
-Navigation.hideQuestions = function () {
+Navigation.hideQuestions = () => {
   jQuery('#questionnaire-section').addClass('hidden');
   jQuery('.form-group').addClass('hidden');
 };
 
-Navigation.showQuestions = function () {
+Navigation.showQuestions = () => {
   jQuery('#questionnaire-section').removeClass('hidden');
   jQuery('.form-group').removeClass('hidden');
 };
 
-Navigation.hideNoJSWarning = function () {
+Navigation.hideNoJSWarning = () => {
 };
 
-Navigation.showAnswersTable = function () {
+Navigation.showAnswersTable = () => {
   jQuery("#answers-table").removeClass('hidden');
 };
 
 // After this, do not restart the questionnaire, reload the page to restart
 
-Navigation.finishQuestions = function () {
+Navigation.finishQuestions = () => {
   Navigation.hideQuestions();
   Notifications.displayResultArea();
   Navigation.disableNext();
   jQuery("#button-restart").removeClass('hidden');
 };
 
-Navigation.unfinishQuestions = function () {
+Navigation.unfinishQuestions = () => {
   Navigation.showQuestions();
   Notifications.hideResultArea();
   jQuery("#button-restart").addClass('hidden');

From 270ee1809863b4197d294ce4b021b33f5553c264 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:45:52 +0100
Subject: [PATCH 071/196] updated widget.js concatenated strings to es6
 literals

---
 assets/js/widgets.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 0e1ec09..01578ef 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -34,17 +34,15 @@ TotAnswers.resetAnswers = () => {
 
 TotAnswers.appendAnswer = (myId, label, value) => {
   if (! label) {
-    label = jQuery('#' + myId + '> label').first().text();
+    label = jQuery(`#${myId} > label`).first().text();
   }
   // If the user has gone back and is changing the answer, first remove it
   TotAnswers.removeAnswer(myId);
-  jQuery('#answers-table-rows').append('<tr id="answer-row-' + myId + '"><td>'
-				       + label + '</td><td align="right">'
-				       + value  + '</td></tr>');
+  jQuery('#answers-table-rows').append(`<tr id="answer-row-${myId}><td>${label}</td><td align="right">${label}</td></tr>`);
 };
 
 TotAnswers.removeAnswer = (myId) => {
-  jQuery('#answer-row-' + myId).remove();
+  jQuery(`#answer-row-${myId}`).remove();
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -59,16 +57,12 @@ Notifications.clearAlerts = () => {
 
 Notifications.setAlert = (message) => {
   Notifications.clearAlerts();
-  jQuery('#alert-area').append('<div class="alert alert-warning" role="alert">'
-                               + message
-                               + '</div>');
+  jQuery('#alert-area').append(`<div class="alert alert-warning" role="alert">${message}</div>`);
 };
 
 Notifications.setEncouragement = (message) => {
   Notifications.clearAlerts();
-  jQuery('#alert-area').append('<div class="alert alert-success" role="alert">'
-                               + message
-                               + '</div>');
+  jQuery('#alert-area').append(`<div class="alert alert-success" role="alert">${message}</div>`);
 };
 
 Notifications.displayAnswersHint = () => {

From 08fbd28dd9342bf14244c989c89ef9163b1b1dab Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:48:35 +0100
Subject: [PATCH 072/196] renamed var Notifications to const TotNotifications

---
 assets/js/questions.js | 12 ++++++------
 assets/js/widgets.js   | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 8822a5d..804fc73 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -37,10 +37,10 @@ Questions.s1q1a = {
   input: 'year',
   pre: function () {
     Navigation.disablePrevious();
-    Notifications.displayAnswersHint();
+    TotNotifications.displayAnswersHint();
   },
   post: function () {
-    Notifications.removeAnswersHint();
+    TotNotifications.removeAnswersHint();
   }
 };
 
@@ -331,10 +331,10 @@ Questions.processAnswer = function () {
 	       || answer;
       TotAnswers.appendAnswer(question.variable, question.question, answer);
     }
-    Notifications.clearAlerts();
+    TotNotifications.clearAlerts();
     result = true;
   } else {
-    Notifications.setAlert(warnings);
+    TotNotifications.setAlert(warnings);
   }
   return result;
 };
@@ -437,7 +437,7 @@ Questions.previousQuestion = function () {
     // Go back
     ValuesStack.pop();
     Questions.transitionQuestion(Values.question_id);
-    Notifications.clearAlerts();
+    TotNotifications.clearAlerts();
     // Clear previous answer
     var previous_question = Questions[Values.question_id];
     TotAnswers.removeAnswer(previous_question.variable);
@@ -450,7 +450,7 @@ Questions.previousQuestion = function () {
 Questions.finish = function () {
   var obj = Questions.getConclusionDetails(Values.conclusion);
   Values.termination_type = obj.title;
-  Notifications.setResultAreaMessage(obj, 'panel-success');
+  TotNotifications.setResultAreaMessage(obj, 'panel-success');
   Navigation.finishQuestions();
   if (Values.conclusion_generate_pdf) {
     PDF.request();
diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 01578ef..f7b889e 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -49,39 +49,39 @@ TotAnswers.removeAnswer = (myId) => {
 // Notifications and other notices
 ////////////////////////////////////////////////////////////////////////////////
 
-var Notifications = {};
+const TotNotifications = {};
 
-Notifications.clearAlerts = () => {
+TotNotifications.clearAlerts = () => {
   jQuery('#alert-area').empty();
 };
 
-Notifications.setAlert = (message) => {
-  Notifications.clearAlerts();
+TotNotifications.setAlert = (message) => {
+  TotNotifications.clearAlerts();
   jQuery('#alert-area').append(`<div class="alert alert-warning" role="alert">${message}</div>`);
 };
 
-Notifications.setEncouragement = (message) => {
-  Notifications.clearAlerts();
+TotNotifications.setEncouragement = (message) => {
+  TotNotifications.clearAlerts();
   jQuery('#alert-area').append(`<div class="alert alert-success" role="alert">${message}</div>`);
 };
 
-Notifications.displayAnswersHint = () => {
+TotNotifications.displayAnswersHint = () => {
   jQuery('#answers-table-rows').append('<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>');
 };
 
-Notifications.removeAnswersHint = () => {
+TotNotifications.removeAnswersHint = () => {
   jQuery('#answers-table-row-placeholder').remove();
 };
 
-Notifications.displayResultArea = () => {
+TotNotifications.displayResultArea = () => {
   jQuery('#result-area').removeClass('hidden');
 };
 
-Notifications.hideResultArea = () => {
+TotNotifications.hideResultArea = () => {
   jQuery('#result-area').addClass('hidden');
 };
 
-Notifications.setResultAreaMessage = function (obj, panelClass) {
+TotNotifications.setResultAreaMessage = function (obj, panelClass) {
   jQuery('#result-area').addClass(panelClass);
   jQuery('#result-area-title').html(obj.title);
   jQuery('#result-area-message').html(obj.description);
@@ -142,13 +142,13 @@ Navigation.showAnswersTable = () => {
 
 Navigation.finishQuestions = () => {
   Navigation.hideQuestions();
-  Notifications.displayResultArea();
+  TotNotifications.displayResultArea();
   Navigation.disableNext();
   jQuery("#button-restart").removeClass('hidden');
 };
 
 Navigation.unfinishQuestions = () => {
   Navigation.showQuestions();
-  Notifications.hideResultArea();
+  TotNotifications.hideResultArea();
   jQuery("#button-restart").addClass('hidden');
 };

From b4483cef8aa7c0036974b0ea708bb52f2bc63ab6 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:49:38 +0100
Subject: [PATCH 073/196] renamed var Notifications to const TotNotifications

---
 assets/js/rules.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/rules.js b/assets/js/rules.js
index 3b897d3..91edce5 100644
--- a/assets/js/rules.js
+++ b/assets/js/rules.js
@@ -303,7 +303,7 @@ Rules.s1q1d = function () {
     if ((result != Rules.jumpToFinish)
     && Rules.beforeEndOfNoticeWindow()
     && (! Rules.hasPublicDomainFlags())) {
-    Notifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
+    TotNotifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
     }
   }
   return result;
@@ -317,7 +317,7 @@ Rules.s1q1f = function () {
   if ((result != Rules.jumpToFinish)
       && Rules.beforeEndOfNoticeWindow()
       && (! Rules.hasPublicDomainFlags())) {
-    Notifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
+    TotNotifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
   }
   return result;
 };

From 61a9ead3d37fa48ff2f49fecb0888b9e9ad462bc Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:50:56 +0100
Subject: [PATCH 074/196] updated widget.js functions to es6 arrow function

---
 assets/js/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index f7b889e..d4eab92 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -81,7 +81,7 @@ TotNotifications.hideResultArea = () => {
   jQuery('#result-area').addClass('hidden');
 };
 
-TotNotifications.setResultAreaMessage = function (obj, panelClass) {
+TotNotifications.setResultAreaMessage = (obj, panelClass) => {
   jQuery('#result-area').addClass(panelClass);
   jQuery('#result-area-title').html(obj.title);
   jQuery('#result-area-message').html(obj.description);

From 773427f6254506c7362355d08df33d1e401ab602 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:53:18 +0100
Subject: [PATCH 075/196] renamed var Questions to const TotQuestions

---
 assets/js/questions.js | 118 ++++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 804fc73..9987825 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -21,7 +21,7 @@
 // (This is slightly overloaded)
 ////////////////////////////////////////////////////////////////////////////////
 
-var Questions = {};
+const TotQuestions = {};
 
 ////////////////////////////////////////////////////////////////////////////////
 // Section One
@@ -29,7 +29,7 @@ var Questions = {};
 
 // When was the work created?
 
-Questions.s1q1a = {
+TotQuestions.s1q1a = {
   section: 1,
   question: 'When was the work created?',
   explanation:'The year in which a work was created can affect its copyright status and its treatment under U.S. copyright law. Most importantly, the tool is concerned with whether a worked was made before or after January 1, 1978, when the most recent overhaul of U.S. copyright went into effect.',   
@@ -46,7 +46,7 @@ Questions.s1q1a = {
 
 // Has the work been published?
 
-Questions.s1q1b = {
+TotQuestions.s1q1b = {
   question: 'Has the work been published?',
   explanation:'Whether a work has been published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
   variable: 'work_published',
@@ -58,7 +58,7 @@ Questions.s1q1b = {
 
 // When was the work first published?
 
-Questions.s1q1bi = {
+TotQuestions.s1q1bi = {
   variable: 'pub_year',
   question: 'When was the work first published?',
   explanation:'When a work was published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
@@ -74,7 +74,7 @@ Questions.s1q1bi = {
 
 // When was the work first published under the grant?
 
-Questions.s1q1bii =  {
+TotQuestions.s1q1bii =  {
   section: 1,
   question: 'When was the work first published under the grant?',
   explanation:'When a work was first published under the grant (which may be different than the the date the work was published for the first time) can factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date">glossary</a>.',
@@ -99,7 +99,7 @@ Questions.s1q1bii =  {
 
 // Works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?
 
-Questions.s1q1bi2 = {
+TotQuestions.s1q1bi2 = {
   question: 'Published works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?',
   explanation:'For U.S. works published in certain years, U.S. law required that they feature a "copyright notice" in order to receive federal copyright protection. Whether or not the published version featured a copyright notice can affect the copyright status of these works.',	
   variable: 'copyright_notice',
@@ -109,7 +109,7 @@ Questions.s1q1bi2 = {
 
 // Has the work been registered with the United State Copyright Office?
 
-Questions.s1q1c = {
+TotQuestions.s1q1c = {
   question: 'Has the work been registered with the United State Copyright Office?',
   explanation:'Before 1989, registration was one of the ways authors could secure federal copyright in their work. Whether a work was registered can affect copyright status and the timing of termination right.',  
   variable: 'work_registered',
@@ -119,7 +119,7 @@ Questions.s1q1c = {
 
 // When was the work registered with the United States Copyright Office?
 
-Questions.s1q1ci = {
+TotQuestions.s1q1ci = {
   question: 'When was the work registered with the United States Copyright Office?',
   explanation:'Before 1989, registration was one of the ways authors could secure federal copyright in their work. When a work was registered can affect copyright status and the timing of termination right.',  
   variable: 'reg_year',
@@ -128,7 +128,7 @@ Questions.s1q1ci = {
 
 // What is the date of the agreement or transfer? ...
 
-Questions.s1q1d = {
+TotQuestions.s1q1d = {
   question: 'What is the year of the agreement or transfer?',
   explanation:'When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work\'s copyright transfer may be eligible for termination.',
   variable: 'k_year',
@@ -153,7 +153,7 @@ Questions.s1q1d = {
 
 // Did the agreement or transfer include the right of publication?
 
-Questions.s1q1f =  {
+TotQuestions.s1q1f =  {
   // Last question in section 1, so set this if we've arrived via back button
   section: 1,
   question: 'Did the agreement or transfer include the right of publication?',
@@ -170,7 +170,7 @@ Questions.s1q1f =  {
 
 // Is the agreement or transfer you want to terminate part of a last will...
 
-Questions.s2q2a =  {
+TotQuestions.s2q2a =  {
   // First question in section 2
   section: 2,
   question: 'Is the agreement or transfer in question part of a <a href="/glossary/#will" target="_blank" title="Termination of Transfer: Glossary">last will and testament</a>?',
@@ -180,7 +180,7 @@ Questions.s2q2a =  {
 
 // Are any of the authors still alive?
 
-Questions.s2q2bi = {
+TotQuestions.s2q2bi = {
   question: 'Are <i>any</i> of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors or artists</a> still alive?',
   explanation:'The copyright term for many works is based on the life of the author.',
   variable: 'any_authors_alive',
@@ -189,7 +189,7 @@ Questions.s2q2bi = {
 
 // What is the year the last surviving author died?
 
-Questions.s2q2bi2 = {
+TotQuestions.s2q2bi2 = {
   question: 'What is the year the last surviving <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author or artist</a> died?',
   explanation:'The copyright term for many works is based on the life of the author.',
   variable: 'death',
@@ -198,7 +198,7 @@ Questions.s2q2bi2 = {
 
 // Was the work created within the scope of the author’s employment?
 
-Questions.s2q2c =  {
+TotQuestions.s2q2c =  {
   question: 'Was the work created within the <a href="/glossary/#scope_of_employment" target="_blank" title="Termination of Transfer: Glossary">scope of the author’s employment</a>?',
   variable: 'within_scope_of_employment',
   input: 'radio'
@@ -206,7 +206,7 @@ Questions.s2q2c =  {
 
 // Was there an express agreement between the author and the author's employer to not treat the work as a work made for hire?
 
-Questions.s2q2ci =  {
+TotQuestions.s2q2ci =  {
   question: 'Was there an express agreement the author and the author\'s employer to not treat the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
   variable: 'express_agreement',
   input: 'radio'
@@ -214,7 +214,7 @@ Questions.s2q2ci =  {
 
 // Was the work created in response to a special order or commission
 
-Questions.s2q2d =  {
+TotQuestions.s2q2d =  {
   question: 'Was the work created in response to a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">special order or commission</a> by some other person or company?',
   variable: 'special_order',
   input: 'radio'
@@ -222,7 +222,7 @@ Questions.s2q2d =  {
 
 // Was there a signed written agreement regarding the special order...
 
-Questions.s2q2di =  {
+TotQuestions.s2q2di =  {
   question: 'Was there a signed written agreement regarding the special order or commission which explicitly refers to the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
   variable: 'signed_written_agreement',
   input: 'radio'
@@ -230,7 +230,7 @@ Questions.s2q2di =  {
 
 // Was the work created for use as one of the following? ...
 
-Questions.s2q2dia = {
+TotQuestions.s2q2dia = {
   question: 'Was the work created for use as one of the following? — <ul><li>a contribution to a collective work; a part of a motion picture or other audiovisual work;</li> <li>a translation;</li> <li>a <a href="/glossary/#supplementary_work" title="Termination of Transfer: Glossary">supplementary work</a> (such as a foreword, afterword, table, editorial note, musical arrangement, bibliography, appendix, or index);</li> <li>a <a href="/glossary/#compilation" target="_blank" title="Termination of Transfer: Glossary">compilation</a>;</li> <li>an <a href="/glossary/#instructional_text" target="_blank" title="Termination of Transfer: Glossary">instructional text (text and/or graphics)</a>;</li> <li>a test or answer material for a test;</li> <li>or as an atlas?</li></ul?>',
   variable: 'created_as_part_of_motion_picture',
   input: 'radio',
@@ -239,7 +239,7 @@ Questions.s2q2dia = {
 
 // Has the original transfer since been renegotiated or altered?
 
-Questions.s2q2e = {
+TotQuestions.s2q2e = {
   question: 'Has the original transfer since been renegotiated or altered?',
   variable: 'renego',
   input: 'radio',
@@ -248,7 +248,7 @@ Questions.s2q2e = {
 
 // Did one or more of the authors or artists enter into the agreement...
 
-Questions.s2q2f =  {
+TotQuestions.s2q2f =  {
   question: 'Did one or more of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors</a> enter into the agreement or transfer?',
   variable: 'authors_entered_agreement',
   input: 'radio'
@@ -258,7 +258,7 @@ Questions.s2q2f =  {
 
 // Was the agreement or transfer made by a member of...
 
-Questions.s2q2fii =  {
+TotQuestions.s2q2fii =  {
   // Last question in section 2, so set section if we're going back
   section: 2,
   question: 'Was the agreement or transfer made by a member of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author\'s</a> immediate family, or by the executors?<br><i>For more information about which family members qualify, check out the FAQ.</i>',
@@ -271,9 +271,9 @@ Questions.s2q2fii =  {
 // Storing answers
 ////////////////////////////////////////////////////////////////////////////////
 
-Questions.validateAnswer = function () {
+TotQuestions.validateAnswer = function () {
   var result = false;
-  var question = Questions[Questions.current_question];
+  var question = TotQuestions[TotQuestions.current_question];
   if (question['validate']) {
     result = question.validate();
   } else if (question.type == 'year') {
@@ -289,8 +289,8 @@ Questions.validateAnswer = function () {
   return result
 };
 
-Questions.getAnswer = function () {
-  var question = Questions[Questions.current_question];
+TotQuestions.getAnswer = function () {
+  var question = TotQuestions[TotQuestions.current_question];
   var answer = undefined;
   switch (question.input) {
   case 'radio':
@@ -317,12 +317,12 @@ Questions.getAnswer = function () {
   return answer;
 };
 
-Questions.processAnswer = function () {
+TotQuestions.processAnswer = function () {
   var result = false;
-  var warnings = Questions.validateAnswer();
+  var warnings = TotQuestions.validateAnswer();
   if (warnings === false) {
-    var question = Questions[Questions.current_question];
-    var answer = Questions.getAnswer();
+    var question = TotQuestions[TotQuestions.current_question];
+    var answer = TotQuestions.getAnswer();
     Values[question.variable] = answer;
     // FIXME: handle converting radio buttons to correct store values
     //        while recording their label in the answers table
@@ -344,7 +344,7 @@ Questions.processAnswer = function () {
 // These messages are stored in a json file so we can also use them in the PDF
 ////////////////////////////////////////////////////////////////////////////////
 
-Questions.resultMap = undefined;
+TotQuestions.resultMap = undefined;
 // Asynchronous fetch of data that is accessed synchronously.
 // This data won't be used until after several questions, so this is tolerable.
 
@@ -359,7 +359,7 @@ jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/assets/js/questions
       console.log("Request Failed: " + err);
     });
 
-Questions.getConclusionDetails = function (specifier) {
+TotQuestions.getConclusionDetails = function (specifier) {
   var path = specifier.split('.');
   var result = resultMap['Conclusion'][path[0]][path[1]];
   return result;
@@ -369,29 +369,29 @@ Questions.getConclusionDetails = function (specifier) {
 // Flow of control
 ////////////////////////////////////////////////////////////////////////////////
 
-Questions.first_question = 's1q1a';
-Questions.last_question = 's2q2fii';
+TotQuestions.first_question = 's1q1a';
+TotQuestions.last_question = 's2q2fii';
 
-Questions.start = function () {
+TotQuestions.start = function () {
   jQuery('.questionnaire-section, .question-progress-buttons')
     .removeClass('hidden');
   jQuery('.no-javascript-alert').addClass('hidden');
   //Navigation.disablePrevious();
-  Rendering.transitionTo(Questions.first_question);
+  Rendering.transitionTo(TotQuestions.first_question);
 };
 
-Questions.transitionQuestion = function (next_question) {
-  var previous_question = Questions[Questions.current_question];
+TotQuestions.transitionQuestion = function (next_question) {
+  var previous_question = TotQuestions[TotQuestions.current_question];
   if (previous_question) {
     if(previous_question.post) {
       previous_question.post();
     }
   }
   if (next_question == 'finish') {
-    Questions.finish();
+    TotQuestions.finish();
   } else {
-    Questions.current_question = next_question;
-    var question = Questions[Questions.current_question];
+    TotQuestions.current_question = next_question;
+    var question = TotQuestions[TotQuestions.current_question];
     if (question['pre']) {
       question.pre();
     }
@@ -399,9 +399,9 @@ Questions.transitionQuestion = function (next_question) {
   }
 };
 
-Questions.nextQuestionID = function () {
-  var next_question = Questions.current_question;
-  var rule = Rules[Questions.current_question];
+TotQuestions.nextQuestionID = function () {
+  var next_question = TotQuestions.current_question;
+  var rule = Rules[TotQuestions.current_question];
   if (typeof rule == 'function') {
     next_question = rule();
   } else {
@@ -410,16 +410,16 @@ Questions.nextQuestionID = function () {
   return next_question;
 };
 
-Questions.nextQuestion = function () {
+TotQuestions.nextQuestion = function () {
   // If the answer was OK, move on
-  if (Questions.processAnswer()) {
+  if (TotQuestions.processAnswer()) {
     ValuesStack.push();
-    var id = Questions.nextQuestionID();
+    var id = TotQuestions.nextQuestionID();
     Values.question_id = id;
     if (id == 'finish') {
-      Questions.finish();
+      TotQuestions.finish();
     } else {
-      Questions.transitionQuestion(Values.question_id);
+      TotQuestions.transitionQuestion(Values.question_id);
       // Scroll down to make sure the input UI is visible
       jQuery('html,body').animate({
         scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
@@ -427,7 +427,7 @@ Questions.nextQuestion = function () {
   }
 };
 
-Questions.previousQuestion = function () {
+TotQuestions.previousQuestion = function () {
   // If we are going back from *after* the last question, re-enable UI
   if (Values.question_id == 'finish') {
     Navigation.unfinishQuestions();
@@ -436,10 +436,10 @@ Questions.previousQuestion = function () {
   if (ValuesStack.height() > 0) {
     // Go back
     ValuesStack.pop();
-    Questions.transitionQuestion(Values.question_id);
+    TotQuestions.transitionQuestion(Values.question_id);
     TotNotifications.clearAlerts();
     // Clear previous answer
-    var previous_question = Questions[Values.question_id];
+    var previous_question = TotQuestions[Values.question_id];
     TotAnswers.removeAnswer(previous_question.variable);
     // Scroll down to make sure the input UI is visible
     jQuery('html,body').animate({
@@ -447,8 +447,8 @@ Questions.previousQuestion = function () {
   }
 };
 
-Questions.finish = function () {
-  var obj = Questions.getConclusionDetails(Values.conclusion);
+TotQuestions.finish = function () {
+  var obj = TotQuestions.getConclusionDetails(Values.conclusion);
   Values.termination_type = obj.title;
   TotNotifications.setResultAreaMessage(obj, 'panel-success');
   Navigation.finishQuestions();
@@ -457,13 +457,13 @@ Questions.finish = function () {
   }
 };
 
-Questions.start = function () {
+TotQuestions.start = function () {
   Values.reset();
   Navigation.showQuestions();
   Navigation.showAnswersTable();
   Navigation.showNextPrevious();
-  jQuery('#button-question-next').click(Questions.nextQuestion);
-  jQuery('#button-question-back').click(Questions.previousQuestion);
+  jQuery('#button-question-next').click(TotQuestions.nextQuestion);
+  jQuery('#button-question-back').click(TotQuestions.previousQuestion);
   // When the user presses "return" in a text area, move to next question
   jQuery('#question-rendering-area').on('submit', function () {
     if (jQuery('#button-question-next').is(':enabled')) {
@@ -471,10 +471,10 @@ Questions.start = function () {
     }
     return false;
   });
-  Questions.transitionQuestion(Questions.first_question);
-  Values.question_id = Questions.first_question;
+  TotQuestions.transitionQuestion(TotQuestions.first_question);
+  Values.question_id = TotQuestions.first_question;
 };
 
 jQuery( document ).ready(function () {
-  Questions.start();
+  TotQuestions.start();
 });

From f16b857f634117753d01598a08690d25286ee38d Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 07:59:21 +0100
Subject: [PATCH 076/196] updated questions.js functions to es6 arrow function

---
 assets/js/questions.js | 44 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 9987825..ea3a334 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -35,11 +35,11 @@ TotQuestions.s1q1a = {
   explanation:'The year in which a work was created can affect its copyright status and its treatment under U.S. copyright law. Most importantly, the tool is concerned with whether a worked was made before or after January 1, 1978, when the most recent overhaul of U.S. copyright went into effect.',   
   variable: 'creation_year',
   input: 'year',
-  pre: function () {
+  pre: () =>  {
     Navigation.disablePrevious();
     TotNotifications.displayAnswersHint();
   },
-  post: function () {
+  post: () =>  {
     TotNotifications.removeAnswersHint();
   }
 };
@@ -51,7 +51,7 @@ TotQuestions.s1q1b = {
   explanation:'Whether a work has been published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
   variable: 'work_published',
   input: 'radio',
-  pre: function () {
+  pre: () =>  {
     Navigation.enablePrevious();
   }
 };
@@ -63,7 +63,7 @@ TotQuestions.s1q1bi = {
   question: 'When was the work first published?',
   explanation:'When a work was published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
   input: 'year',
-  validate: function () {
+  validate: () =>  {
     return Validation.validDate()
       || ((parseInt(jQuery('.text-question').val()) < Values.creation_year)
           ? 'The publication year cannot be earlier than the creation year.'
@@ -80,7 +80,7 @@ TotQuestions.s1q1bii =  {
   explanation:'When a work was first published under the grant (which may be different than the the date the work was published for the first time) can factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date">glossary</a>.',
   variable: 'grant_pub_year',
   input: 'year',
-  validate: function () {
+  validate: () =>  {
     var errors = Validation.validDate();
     if (errors == false) {
       var year = parseInt(jQuery('.text-question').val());
@@ -133,7 +133,7 @@ TotQuestions.s1q1d = {
   explanation:'When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work\'s copyright transfer may be eligible for termination.',
   variable: 'k_year',
   input: 'year',
-  validate: function () {
+  validate: () =>  {
     var errors = Validation.validDate();
     if (errors == false) {
         // Stash the user-entered agreement year
@@ -145,7 +145,7 @@ TotQuestions.s1q1d = {
     }
     return errors;
   },
-  answerDisplayValue: function () {
+  answerDisplayValue: () =>  {
     return "Effective: " + Values.k_year + "<br/>User entered: "
 	   + Values.user_inputted_k_year;
   }
@@ -271,7 +271,7 @@ TotQuestions.s2q2fii =  {
 // Storing answers
 ////////////////////////////////////////////////////////////////////////////////
 
-TotQuestions.validateAnswer = function () {
+TotQuestions.validateAnswer = () =>  {
   var result = false;
   var question = TotQuestions[TotQuestions.current_question];
   if (question['validate']) {
@@ -289,7 +289,7 @@ TotQuestions.validateAnswer = function () {
   return result
 };
 
-TotQuestions.getAnswer = function () {
+TotQuestions.getAnswer = () =>  {
   var question = TotQuestions[TotQuestions.current_question];
   var answer = undefined;
   switch (question.input) {
@@ -317,7 +317,7 @@ TotQuestions.getAnswer = function () {
   return answer;
 };
 
-TotQuestions.processAnswer = function () {
+TotQuestions.processAnswer = () =>  {
   var result = false;
   var warnings = TotQuestions.validateAnswer();
   if (warnings === false) {
@@ -351,15 +351,15 @@ TotQuestions.resultMap = undefined;
 jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/assets/js/questions.js']")
                .attr('src').replace(/questions\.js.*$/, '')
                + 'results.json')
-    .done(function (result) {
+    .done( (result) => {
         resultMap = result;
     })
-    .fail(function (jqxhr, textStatus, error) {
+    .fail( (jqxhr, textStatus, error) => {
       var err = textStatus + ", " + error;
       console.log("Request Failed: " + err);
     });
 
-TotQuestions.getConclusionDetails = function (specifier) {
+TotQuestions.getConclusionDetails = (specifier) => {
   var path = specifier.split('.');
   var result = resultMap['Conclusion'][path[0]][path[1]];
   return result;
@@ -372,7 +372,7 @@ TotQuestions.getConclusionDetails = function (specifier) {
 TotQuestions.first_question = 's1q1a';
 TotQuestions.last_question = 's2q2fii';
 
-TotQuestions.start = function () {
+TotQuestions.start = () =>  {
   jQuery('.questionnaire-section, .question-progress-buttons')
     .removeClass('hidden');
   jQuery('.no-javascript-alert').addClass('hidden');
@@ -380,7 +380,7 @@ TotQuestions.start = function () {
   Rendering.transitionTo(TotQuestions.first_question);
 };
 
-TotQuestions.transitionQuestion = function (next_question) {
+TotQuestions.transitionQuestion = (next_question) => {
   var previous_question = TotQuestions[TotQuestions.current_question];
   if (previous_question) {
     if(previous_question.post) {
@@ -399,7 +399,7 @@ TotQuestions.transitionQuestion = function (next_question) {
   }
 };
 
-TotQuestions.nextQuestionID = function () {
+TotQuestions.nextQuestionID = () =>  {
   var next_question = TotQuestions.current_question;
   var rule = Rules[TotQuestions.current_question];
   if (typeof rule == 'function') {
@@ -410,7 +410,7 @@ TotQuestions.nextQuestionID = function () {
   return next_question;
 };
 
-TotQuestions.nextQuestion = function () {
+TotQuestions.nextQuestion = () =>  {
   // If the answer was OK, move on
   if (TotQuestions.processAnswer()) {
     ValuesStack.push();
@@ -427,7 +427,7 @@ TotQuestions.nextQuestion = function () {
   }
 };
 
-TotQuestions.previousQuestion = function () {
+TotQuestions.previousQuestion = () =>  {
   // If we are going back from *after* the last question, re-enable UI
   if (Values.question_id == 'finish') {
     Navigation.unfinishQuestions();
@@ -447,7 +447,7 @@ TotQuestions.previousQuestion = function () {
   }
 };
 
-TotQuestions.finish = function () {
+TotQuestions.finish = () =>  {
   var obj = TotQuestions.getConclusionDetails(Values.conclusion);
   Values.termination_type = obj.title;
   TotNotifications.setResultAreaMessage(obj, 'panel-success');
@@ -457,7 +457,7 @@ TotQuestions.finish = function () {
   }
 };
 
-TotQuestions.start = function () {
+TotQuestions.start = () =>  {
   Values.reset();
   Navigation.showQuestions();
   Navigation.showAnswersTable();
@@ -465,7 +465,7 @@ TotQuestions.start = function () {
   jQuery('#button-question-next').click(TotQuestions.nextQuestion);
   jQuery('#button-question-back').click(TotQuestions.previousQuestion);
   // When the user presses "return" in a text area, move to next question
-  jQuery('#question-rendering-area').on('submit', function () {
+  jQuery('#question-rendering-area').on('submit', () =>  {
     if (jQuery('#button-question-next').is(':enabled')) {
       jQuery('#button-question-next').click();
     }
@@ -475,6 +475,6 @@ TotQuestions.start = function () {
   Values.question_id = TotQuestions.first_question;
 };
 
-jQuery( document ).ready(function () {
+jQuery( document ).ready(() =>  {
   TotQuestions.start();
 });

From 8668c1954bbbdb63b9f1bae838c075b7b3f8239c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:05:14 +0100
Subject: [PATCH 077/196] updated all functions to es6 arrow function

---
 assets/js/rendering.js  | 20 +++++++--------
 assets/js/rules.js      | 56 ++++++++++++++++++++---------------------
 assets/js/validation.js |  8 +++---
 assets/js/values.js     |  8 +++---
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 84d6159..da3eb05 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -47,11 +47,11 @@ Rendering.questionTemplate = '\
   </div>\
 </form>';
 
-Rendering.createQuestion = function () {
+Rendering.createQuestion = () =>  {
   return jQuery(Rendering.questionTemplate);
 };
 
-Rendering.common = function (config) {
+Rendering.common = (config) => {
   var question = Rendering.createQuestion();
   // If this is a question in a different section, change the section header
   // Section is 1-based, so we can use a simple logical and here.
@@ -96,7 +96,7 @@ Rendering.radio = function (config) {
     form_group.append(jQuery(radio_button));
   });
   // When the user makes a choice, go straight to the next question
-  form_group.find(':input[type="radio"]').click(function () {
+  form_group.find(':input[type="radio"]').click(() =>  {
     Navigation.enableNext();
     jQuery('#button-question-next').click();
   });
@@ -107,8 +107,8 @@ Rendering.radio = function (config) {
 // Text input
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.makeTextLengthHandler = function (element, min_length, optional) {
-  return function () {
+Rendering.makeTextLengthHandler = (element, min_length, optional) => {
+  return () =>  {
     var length = element.val().length;
     if ((optional && (length == 0))
         || (length >= min_length)) {
@@ -119,7 +119,7 @@ Rendering.makeTextLengthHandler = function (element, min_length, optional) {
   };
 };
 
-Rendering.text = function (config) {
+Rendering.text = (config) => {
   var question = Rendering.common(config);
   var form_group = question.find('.form-group');
   var name = 'input-' + config.variable;
@@ -154,7 +154,7 @@ Rendering.text = function (config) {
 // Year input (text subtype)
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.year = function (config) {
+Rendering.year = (config) => {
   var question = Rendering.text(config);
   var text_field = question.find('.text-question');
   Validation.allowOnlyNumbers(text_field);
@@ -167,7 +167,7 @@ Rendering.year = function (config) {
 // Render html UI from config specification
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.render = function (config) {
+Rendering.render = (config) => {
   var result = undefined;
   switch (config.input)  {
   case 'radio':
@@ -185,10 +185,10 @@ Rendering.render = function (config) {
   return result;
 };
 
-Rendering.transitionTo = function (config) {
+Rendering.transitionTo = (config) => {
   var question = Rendering.render(config);
   jQuery('.question-form').slideUp("fast",
-                              function () {
+                              () =>  {
                                 jQuery(this).remove();
                               });
   jQuery('#question-rendering-area').append(question);
diff --git a/assets/js/rules.js b/assets/js/rules.js
index 91edce5..f8f51b9 100644
--- a/assets/js/rules.js
+++ b/assets/js/rules.js
@@ -19,8 +19,8 @@
 
 var Rules = {};
 
-Rules.simpleYesNoRule = function (variable_id, yesValue, noValue) {
-  return function () {
+Rules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
+  return () =>  {
     var result = undefined;
     if (Values[variable_id] == 'yes') {
       result = yesValue;
@@ -33,18 +33,18 @@ Rules.simpleYesNoRule = function (variable_id, yesValue, noValue) {
 
 Rules.jumpToFinish = 'finish';
 
-Rules.conclusion = function (conclusion) {
+Rules.conclusion = (conclusion) => {
   Values.conclusion = conclusion;
   return Rules.jumpToFinish;
 };
 
-Rules.conclusionPDF = function (conclusion) {
+Rules.conclusionPDF = (conclusion) => {
   Rules.conclusion(conclusion);
   Values.conclusion_generate_pdf = true;
   return Rules.jumpToFinish;
 };
 
-Rules.addFlag = function(flag) {
+Rules.addFlag = (flag) => {
   Values.flags.push(flag);
 };
 
@@ -52,15 +52,15 @@ Rules.addFlag = function(flag) {
 // Calculated/inferred properties
 ////////////////////////////////////////////////////////////////////////////////
 
-Rules.is203 = function () {
+Rules.is203 = () =>  {
   return (Values.conclusion == "A.iii");
 };
 
-Rules.is304 = function () {
+Rules.is304 = () =>  {
   return (['A.i', 'A.ii', 'A.i-ii'].indexOf(Values.conclusion) > -1);
 };
 
-Rules.hasPublicDomainFlags = function () {
+Rules.hasPublicDomainFlags = () =>  {
   var result = false;
   for (var i = 0; i < Values.flags.length; i++) {
     if (Values.flags[i][0] == 'B') {
@@ -70,7 +70,7 @@ Rules.hasPublicDomainFlags = function () {
   return result;
 };
 
-Rules.beforeEndOfNoticeWindow = function () {
+Rules.beforeEndOfNoticeWindow = () =>  {
   return ((Values.notice_end != undefined)
       && (Values.notice_end >= Values.current_year))
     || ((Values.d_notice_end != undefined)
@@ -83,7 +83,7 @@ Rules.beforeEndOfNoticeWindow = function () {
 // Section N Analyses
 ////////////////////////////////////////////////////////////////////////////////
 
-Rules.section304Analysis = function () {
+Rules.section304Analysis = () =>  {
   // Note that this is part of the logic from the section 203 analysis
   var result = 's1q1f';
   if (Values.k_year < 1978) {
@@ -149,7 +149,7 @@ Rules.section304Analysis = function () {
   return result;
 };
 
-Rules.section203Analysis = function () {
+Rules.section203Analysis = () =>  {
   var result = 's2q2a';
   if (typeof Values.grant_pub_year !== 'undefined') {
     Rules.addFlag('F.iv');
@@ -225,7 +225,7 @@ Rules.s1q1bi = 's1q1bii';
 // after 'When was the work first published?' and *then* going on to the
 // questions about registration/notices or not.
 
-Rules.s1q1bii = function () {
+Rules.s1q1bii = () =>  {
   var result = undefined;
   if (Values.pub_year < 1923) {
     result = Rules.conclusion('B.viii');
@@ -239,7 +239,7 @@ Rules.s1q1bii = function () {
 
 // Works from 1989 and earlier usually display a copyright notice...
 
-Rules.s1q1bi2 = function () {
+Rules.s1q1bi2 = () =>  {
   var result = undefined;
   if (Values.copyright_notice == 'yes') {
     result = 's1q1c';
@@ -260,7 +260,7 @@ Rules.s1q1bi2 = function () {
 
 // Has the work been registered with the United State Copyright Office?
 
-Rules.s1q1c = function () {
+Rules.s1q1c = () =>  {
   var result = undefined;
   if (Values.work_registered == 'yes') {
     result = 's1q1ci';
@@ -275,7 +275,7 @@ Rules.s1q1c = function () {
 
 // When was the work registered with the United States Copyright Office?
 
-Rules.s1q1ci = function () {
+Rules.s1q1ci = () =>  {
   var result = undefined;
   if (Values.reg_year < 1923) {
     result = Rules.conclusion('B.viii');
@@ -288,7 +288,7 @@ Rules.s1q1ci = function () {
 // For s1q1d,
 // What is the date of the agreement or transfer? ...
 
-Rules.s1q1d = function () {
+Rules.s1q1d = () =>  {
   var result = undefined;
   if (Values.user_inputted_k_year != Values.k_year) {
     Rules.addFlag('H.i');
@@ -311,7 +311,7 @@ Rules.s1q1d = function () {
 
 // Did the agreement or transfer include the right of publication?
 
-Rules.s1q1f = function () {
+Rules.s1q1f = () =>  {
   // Intercept the result so we can add encouragement if things look good
   var result = Rules.section203Analysis();
   if ((result != Rules.jumpToFinish)
@@ -331,7 +331,7 @@ Rules.section203Analysis;
 
 // Is the agreement or transfer you want to terminate part of a last will...
 
-Rules.s2q2a = function () {
+Rules.s2q2a = () =>  {
   var result = undefined;
   if (Values.last_will == 'yes') {
     result = Rules.conclusion('B.iv');
@@ -350,7 +350,7 @@ Rules.s2q2a = function () {
 // Are any of the authors still alive?
 // It's i) because the conditional logic that starts b is included in a
 
-Rules.s2q2bi = function () {
+Rules.s2q2bi = () =>  {
   var result = undefined;
   if (Values.any_authors_alive == 'yes') {
     result = 's2q2c'
@@ -362,7 +362,7 @@ Rules.s2q2bi = function () {
 
 // What is the year the last surviving author died?
 
-Rules.s2q2bi2 = function () {
+Rules.s2q2bi2 = () =>  {
   var result = undefined;
   // creation_year is always set, pub_year may not be, death will be here
   if (Values.creation_year > 1977) {
@@ -384,7 +384,7 @@ Rules.s2q2bi2 = function () {
 
 // Was the work created within the scope of the author’s employment?
 
-Rules.s2q2c = function () {
+Rules.s2q2c = () =>  {
   var result = undefined;
   if (Values.within_scope_of_employment == 'yes') {
     if (Values.creation_year > 1977) {
@@ -400,7 +400,7 @@ Rules.s2q2c = function () {
 
 // Was there an express agreement between you...
 
-Rules.s2q2ci = function () {
+Rules.s2q2ci = () =>  {
   var result = undefined;
    if (Values.express_agreement == 'yes') {
     result = 's2q2d';
@@ -412,7 +412,7 @@ Rules.s2q2ci = function () {
 
 // Was the work created in response to a special order or commission?
 
-Rules.s2q2d = function () {
+Rules.s2q2d = () =>  {
   var result = undefined;
   if (Values.special_order == 'yes') {
     if (Values.creation_year < 1978) {
@@ -429,7 +429,7 @@ Rules.s2q2d = function () {
 
 // Was there a signed written agreement regarding the special order...
 
-Rules.s2q2di = function () {
+Rules.s2q2di = () =>  {
   var result = undefined;
   if (Values.signed_written_agreement == 'yes') {
     if (Values.creation_year < 1978) {
@@ -445,7 +445,7 @@ Rules.s2q2di = function () {
 
 // Was the work created for use as one of the following? ...
 
-Rules.s2q2dia = function () {
+Rules.s2q2dia = () =>  {
   var result = undefined;
   if (Values.created_as_part_of_motion_picture == 'yes') {
     result = Rules.conclusion('C.ii');
@@ -460,7 +460,7 @@ Rules.s2q2dia = function () {
 
 // Has the original transfer since been renegotiated or altered?
 
-Rules.s2q2e = function () {
+Rules.s2q2e = () =>  {
   var result = 's2q2f';
   if (Values.renego == 'yes') {
     Rules.addFlag('C.i');
@@ -474,7 +474,7 @@ Rules.s2q2e = function () {
 
 // Did one or more of the authors or artists enter into the agreement...
 
-Rules.s2q2f = function () {
+Rules.s2q2f = () =>  {
   var result = undefined;
   if (Values.authors_entered_agreement == 'yes') {
     if (Values.k_year < 1978) {
@@ -494,7 +494,7 @@ Rules.s2q2f = function () {
 
 // Was the agreement or transfer made by a member of...
 
-Rules.s2q2fii = function () {
+Rules.s2q2fii = () =>  {
   var result = undefined;
   if (Values.agreement_by_family_or_executor) {
     result = Rules.conclusionPDF('A.i-ii');
diff --git a/assets/js/validation.js b/assets/js/validation.js
index 67e58c2..ce6bab0 100644
--- a/assets/js/validation.js
+++ b/assets/js/validation.js
@@ -24,13 +24,13 @@ var Validation = {};
 
 // Naughty. If we're going to monkeypatch we should have a file for these
 
-String.prototype.capitalizeFirstLetter = function() {
+String.prototype.capitalizeFirstLetter = () => {
     return this.charAt(0).toUpperCase() + this.slice(1);
 }
 
-Validation.allowOnlyNumbers = function (element) {
+Validation.allowOnlyNumbers = (element) => {
   // http://stackoverflow.com/a/995193
-  element.keydown(function (e) {
+  element.keydown( (e) => {
     // Allow: backspace, delete, tab, escape, enter and .
     if (jQuery.inArray(e.keyCode, [46, 8, 9, 27, 13, 110, 190]) !== -1 ||
         // Allow: Ctrl+A, Command+A
@@ -50,7 +50,7 @@ Validation.allowOnlyNumbers = function (element) {
 
 // false here means no errors, a string means errors
 
-Validation.validDate = function () {
+Validation.validDate = () => {
   var text_field = jQuery('.text-question');
   var date = text_field.val();
   var result = false;
diff --git a/assets/js/values.js b/assets/js/values.js
index 6952c06..776c4c9 100644
--- a/assets/js/values.js
+++ b/assets/js/values.js
@@ -24,7 +24,7 @@
 
 var Values = {};
 
-Values.reset = function () {
+Values.reset = () =>  {
   var now = new Date();
   Values = {
     current_date: now,
@@ -56,11 +56,11 @@ var ValuesStack = {};
 
 ValuesStack._stack = [];
 
-ValuesStack.height = function () {
+ValuesStack.height = () =>  {
   return this._stack.length;
 };
 
-ValuesStack.push = function () {
+ValuesStack.push = () =>  {
   // Handle the date not liking being serialized.
   var now = Values.current_date;
   this._stack.push(Values);
@@ -69,6 +69,6 @@ ValuesStack.push = function () {
   Values.current_date = now;
 };
 
-ValuesStack.pop = function () {
+ValuesStack.pop = () =>  {
   Values = this._stack.pop();
 };

From 6659b2c144e936f11e8ca80e2d9e5f98ce26dce5 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:07:15 +0100
Subject: [PATCH 078/196] updated all functions to es6 arrow function

---
 assets/js/pdf.js       | 14 +++++++-------
 assets/js/rendering.js |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index dd55cc6..dedf9e0 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -27,13 +27,13 @@ PDF.url = jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
 	       .attr('src').replace(/assets\/js\/pdf\.js.*$/, '')
 	       + 'src/ResultPdf.php';
 
-PDF.appendProperty = function (details, key, value) {
+PDF.appendProperty = (details, key, value) => {
   var mapping = {key: key,
                  value: value};
   details.push(mapping);
 };
 
-PDF.append203Windows = function (details) {
+PDF.append203Windows = (details)=> {
   var notice = '';
   var termination = '';
 
@@ -55,7 +55,7 @@ PDF.append203Windows = function (details) {
   PDF.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>', termination);
 };
 
-PDF.append304Windows = function (details) {
+PDF.append304Windows = (details) => {
   PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
                      Values.notice_begin);
   PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
@@ -76,7 +76,7 @@ PDF.append304Windows = function (details) {
   }
 };
 
-PDF.appendWindows = function (details) {
+PDF.appendWindows = (details) => {
   if (Rules.is203()) {
     PDF.append203Windows(details);
   } else if (Rules.is304()) {
@@ -84,9 +84,9 @@ PDF.appendWindows = function (details) {
   }
 };
 
-PDF.details = function () {
+PDF.details = () =>  {
   var details = [];
-  Object.getOwnPropertyNames(varsToTitles).forEach(function (key) {
+  Object.getOwnPropertyNames(varsToTitles).forEach( (key) => {
     if ((Values[key] != undefined)
         && (Values[key] != '')) {
       PDF.appendProperty(details, varsToTitles[key], Values[key]);
@@ -96,7 +96,7 @@ PDF.details = function () {
   return details;
 };
 
-PDF.request = function () {
+PDF.request = () =>  {
   var data = {report_timestamp: Values.current_date.getTime()/1000,
               flags: Values.flags.sort(), // Sorts inline & returns, so OK here
               conclusion: Values.conclusion,
diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index da3eb05..9f89013 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -80,14 +80,14 @@ Rendering.common = (config) => {
 // Multiple choice questions (radio buttons)
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.radio = function (config) {
+Rendering.radio = (config) => {
   var question = Rendering.common(config);
   var form_group = question.find('.form-group');
   var name = 'input-' + config.variable;
   // If we are returning to this via the back button, get the previous value
   var existing_value = Values[config.variable];
   var radio_button_values = config.values || ['yes', 'no'];
-  radio_button_values.forEach(function (value) {
+  radio_button_values.forEach( (value) => {
     var radio_button = '<label class="radio-inline"><input type="radio" name=' + name + '" value="' + value  +'"';
     if (value == existing_value) {
       radio_button += ' checked="checked"';

From 832df122c5df0b08cb1884bcb03325d49762080c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:11:42 +0100
Subject: [PATCH 079/196] renamed var Values to const TotValues

---
 assets/js/pdf.js        |  42 ++++----
 assets/js/questions.js  |  40 ++++----
 assets/js/rendering.js  |  12 +--
 assets/js/rules.js      | 218 ++++++++++++++++++++--------------------
 assets/js/validation.js |   2 +-
 assets/js/values.js     |  16 +--
 6 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index dedf9e0..863eba4 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -37,18 +37,18 @@ PDF.append203Windows = (details)=> {
   var notice = '';
   var termination = '';
 
-  if (Values.notice_begin != undefined) {
-    notice += Values.notice_begin + '-' + Values.notice_end;
-    termination += Values.term_begin + '-' + Values.term_end
+  if (TotValues.notice_begin != undefined) {
+    notice += TotValues.notice_begin + '-' + TotValues.notice_end;
+    termination += TotValues.term_begin + '-' + TotValues.term_end
   }
 
-  if (Values.p_term_begin != undefined) {
+  if (TotValues.p_term_begin != undefined) {
     if (notice != '') {
       notice += ' or ';
       termination += ' or ';
     }
-    notice += Values.p_notice_begin + '-' + Values.p_notice_end;
-    termination += Values.p_term_begin + '-' + Values.p_term_end;
+    notice += TotValues.p_notice_begin + '-' + TotValues.p_notice_end;
+    termination += TotValues.p_term_begin + '-' + TotValues.p_term_end;
   }
 
   PDF.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>', notice);
@@ -57,22 +57,22 @@ PDF.append203Windows = (details)=> {
 
 PDF.append304Windows = (details) => {
   PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
-                     Values.notice_begin);
+                     TotValues.notice_begin);
   PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
-                     Values.notice_end);
+                     TotValues.notice_end);
   PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
-                     Values.term_begin);
+                     TotValues.term_begin);
   PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
-                     Values.term_end);
-  if (Values.d_notice_begin != undefined) {
+                     TotValues.term_end);
+  if (TotValues.d_notice_begin != undefined) {
     PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
-                       Values.d_notice_begin);
+                       TotValues.d_notice_begin);
     PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
-                       Values.d_notice_end);
+                       TotValues.d_notice_end);
     PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
-                       Values.d_term_begin);
+                       TotValues.d_term_begin);
     PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
-                       Values.d_term_end);
+                       TotValues.d_term_end);
   }
 };
 
@@ -87,9 +87,9 @@ PDF.appendWindows = (details) => {
 PDF.details = () =>  {
   var details = [];
   Object.getOwnPropertyNames(varsToTitles).forEach( (key) => {
-    if ((Values[key] != undefined)
-        && (Values[key] != '')) {
-      PDF.appendProperty(details, varsToTitles[key], Values[key]);
+    if ((TotValues[key] != undefined)
+        && (TotValues[key] != '')) {
+      PDF.appendProperty(details, varsToTitles[key], TotValues[key]);
     }
   });
   PDF.appendWindows(details);
@@ -97,9 +97,9 @@ PDF.details = () =>  {
 };
 
 PDF.request = () =>  {
-  var data = {report_timestamp: Values.current_date.getTime()/1000,
-              flags: Values.flags.sort(), // Sorts inline & returns, so OK here
-              conclusion: Values.conclusion,
+  var data = {report_timestamp: TotValues.current_date.getTime()/1000,
+              flags: TotValues.flags.sort(), // Sorts inline & returns, so OK here
+              conclusion: TotValues.conclusion,
               details: PDF.details(),
              };
   var totform = document.createElement("FORM");
diff --git a/assets/js/questions.js b/assets/js/questions.js
index ea3a334..7f17751 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -65,7 +65,7 @@ TotQuestions.s1q1bi = {
   input: 'year',
   validate: () =>  {
     return Validation.validDate()
-      || ((parseInt(jQuery('.text-question').val()) < Values.creation_year)
+      || ((parseInt(jQuery('.text-question').val()) < TotValues.creation_year)
           ? 'The publication year cannot be earlier than the creation year.'
           : false);
   }
@@ -84,11 +84,11 @@ TotQuestions.s1q1bii =  {
     var errors = Validation.validDate();
     if (errors == false) {
       var year = parseInt(jQuery('.text-question').val());
-      if (year < Values.creation_year) {
+      if (year < TotValues.creation_year) {
         errors = 'Year of publication under grant cannot be earlier than year of creation.';
-      } else if (year < Values.pub_year) {
+      } else if (year < TotValues.pub_year) {
         errors = 'Year of publication under grant cannot be earlier than year of initial publication.';
-      } /* else if (year < Values.k_year) {
+      } /* else if (year < TotValues.k_year) {
         errors = 'Year of publication under grant cannot be earlier than year of grant.';
       }*/
     }
@@ -137,17 +137,17 @@ TotQuestions.s1q1d = {
     var errors = Validation.validDate();
     if (errors == false) {
         // Stash the user-entered agreement year
-        Values.user_inputted_k_year = parseInt(jQuery('.text-question').val());
+        TotValues.user_inputted_k_year = parseInt(jQuery('.text-question').val());
         // If date is before the creation year, use the creation year instead
-        if (Values.user_inputted_k_year < Values.creation_year) {
-	  jQuery('.text-question').val(Values.creation_year);
+        if (TotValues.user_inputted_k_year < TotValues.creation_year) {
+	  jQuery('.text-question').val(TotValues.creation_year);
 	}
     }
     return errors;
   },
   answerDisplayValue: () =>  {
-    return "Effective: " + Values.k_year + "<br/>User entered: "
-	   + Values.user_inputted_k_year;
+    return "Effective: " + TotValues.k_year + "<br/>User entered: "
+	   + TotValues.user_inputted_k_year;
   }
 };
 
@@ -323,7 +323,7 @@ TotQuestions.processAnswer = () =>  {
   if (warnings === false) {
     var question = TotQuestions[TotQuestions.current_question];
     var answer = TotQuestions.getAnswer();
-    Values[question.variable] = answer;
+    TotValues[question.variable] = answer;
     // FIXME: handle converting radio buttons to correct store values
     //        while recording their label in the answers table
     if (answer) {
@@ -415,11 +415,11 @@ TotQuestions.nextQuestion = () =>  {
   if (TotQuestions.processAnswer()) {
     ValuesStack.push();
     var id = TotQuestions.nextQuestionID();
-    Values.question_id = id;
+    TotValues.question_id = id;
     if (id == 'finish') {
       TotQuestions.finish();
     } else {
-      TotQuestions.transitionQuestion(Values.question_id);
+      TotQuestions.transitionQuestion(TotValues.question_id);
       // Scroll down to make sure the input UI is visible
       jQuery('html,body').animate({
         scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
@@ -429,17 +429,17 @@ TotQuestions.nextQuestion = () =>  {
 
 TotQuestions.previousQuestion = () =>  {
   // If we are going back from *after* the last question, re-enable UI
-  if (Values.question_id == 'finish') {
+  if (TotValues.question_id == 'finish') {
     Navigation.unfinishQuestions();
   }
   // Don't pop past the very first item
   if (ValuesStack.height() > 0) {
     // Go back
     ValuesStack.pop();
-    TotQuestions.transitionQuestion(Values.question_id);
+    TotQuestions.transitionQuestion(TotValues.question_id);
     TotNotifications.clearAlerts();
     // Clear previous answer
-    var previous_question = TotQuestions[Values.question_id];
+    var previous_question = TotQuestions[TotValues.question_id];
     TotAnswers.removeAnswer(previous_question.variable);
     // Scroll down to make sure the input UI is visible
     jQuery('html,body').animate({
@@ -448,17 +448,17 @@ TotQuestions.previousQuestion = () =>  {
 };
 
 TotQuestions.finish = () =>  {
-  var obj = TotQuestions.getConclusionDetails(Values.conclusion);
-  Values.termination_type = obj.title;
+  var obj = TotQuestions.getConclusionDetails(TotValues.conclusion);
+  TotValues.termination_type = obj.title;
   TotNotifications.setResultAreaMessage(obj, 'panel-success');
   Navigation.finishQuestions();
-  if (Values.conclusion_generate_pdf) {
+  if (TotValues.conclusion_generate_pdf) {
     PDF.request();
   }
 };
 
 TotQuestions.start = () =>  {
-  Values.reset();
+  TotValues.reset();
   Navigation.showQuestions();
   Navigation.showAnswersTable();
   Navigation.showNextPrevious();
@@ -472,7 +472,7 @@ TotQuestions.start = () =>  {
     return false;
   });
   TotQuestions.transitionQuestion(TotQuestions.first_question);
-  Values.question_id = TotQuestions.first_question;
+  TotValues.question_id = TotQuestions.first_question;
 };
 
 jQuery( document ).ready(() =>  {
diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 9f89013..1a51bfc 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -67,7 +67,7 @@ Rendering.common = (config) => {
   // If we're entering this value for the first time (not via the back button)
   // and this isn't an optional value
   // don't let the user continue until they enter a value here.
-  if((Values[config.variable] === undefined)
+  if((TotValues[config.variable] === undefined)
      && (! config.optional)) {
     Navigation.disableNext();
   } else {
@@ -85,7 +85,7 @@ Rendering.radio = (config) => {
   var form_group = question.find('.form-group');
   var name = 'input-' + config.variable;
   // If we are returning to this via the back button, get the previous value
-  var existing_value = Values[config.variable];
+  var existing_value = TotValues[config.variable];
   var radio_button_values = config.values || ['yes', 'no'];
   radio_button_values.forEach( (value) => {
     var radio_button = '<label class="radio-inline"><input type="radio" name=' + name + '" value="' + value  +'"';
@@ -131,10 +131,10 @@ Rendering.text = (config) => {
   form_group.append(text_field);
   // Set the label
   var label = question.find('.question-label').prop('for', name);
-  if (Values[config.variable]) {
-    form_group.find('text-question').val(Values[config.variable]);
+  if (TotValues[config.variable]) {
+    form_group.find('text-question').val(TotValues[config.variable]);
   }
-  var existing_value = Values[config.variable];
+  var existing_value = TotValues[config.variable];
   // Ensure next isn't enabled until enough characters are entered
   var min_length = config.min_length || 4;
   var text_field_element = question.find('.text-question');
@@ -145,7 +145,7 @@ Rendering.text = (config) => {
   text_field_element.on('change', validator);
   // If we are returning to the field and the value has already been set, use it
   if (existing_value !== undefined) {
-    text_field.val(Values[config.variable]);
+    text_field.val(TotValues[config.variable]);
   }
   return question;
 };
diff --git a/assets/js/rules.js b/assets/js/rules.js
index f8f51b9..c5b1537 100644
--- a/assets/js/rules.js
+++ b/assets/js/rules.js
@@ -22,7 +22,7 @@ var Rules = {};
 Rules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
   return () =>  {
     var result = undefined;
-    if (Values[variable_id] == 'yes') {
+    if (TotValues[variable_id] == 'yes') {
       result = yesValue;
     } else {
       result = noValue;
@@ -34,18 +34,18 @@ Rules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
 Rules.jumpToFinish = 'finish';
 
 Rules.conclusion = (conclusion) => {
-  Values.conclusion = conclusion;
+  TotValues.conclusion = conclusion;
   return Rules.jumpToFinish;
 };
 
 Rules.conclusionPDF = (conclusion) => {
   Rules.conclusion(conclusion);
-  Values.conclusion_generate_pdf = true;
+  TotValues.conclusion_generate_pdf = true;
   return Rules.jumpToFinish;
 };
 
 Rules.addFlag = (flag) => {
-  Values.flags.push(flag);
+  TotValues.flags.push(flag);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -53,17 +53,17 @@ Rules.addFlag = (flag) => {
 ////////////////////////////////////////////////////////////////////////////////
 
 Rules.is203 = () =>  {
-  return (Values.conclusion == "A.iii");
+  return (TotValues.conclusion == "A.iii");
 };
 
 Rules.is304 = () =>  {
-  return (['A.i', 'A.ii', 'A.i-ii'].indexOf(Values.conclusion) > -1);
+  return (['A.i', 'A.ii', 'A.i-ii'].indexOf(TotValues.conclusion) > -1);
 };
 
 Rules.hasPublicDomainFlags = () =>  {
   var result = false;
-  for (var i = 0; i < Values.flags.length; i++) {
-    if (Values.flags[i][0] == 'B') {
+  for (var i = 0; i < TotValues.flags.length; i++) {
+    if (TotValues.flags[i][0] == 'B') {
       result = true;
     }
   }
@@ -71,12 +71,12 @@ Rules.hasPublicDomainFlags = () =>  {
 };
 
 Rules.beforeEndOfNoticeWindow = () =>  {
-  return ((Values.notice_end != undefined)
-      && (Values.notice_end >= Values.current_year))
-    || ((Values.d_notice_end != undefined)
-    && (Values.d_notice_end >= Values.current_year))
-    || ((Values.p_notice_end != undefined)
-    && (Values.p_notice_end >= Values.current_year));
+  return ((TotValues.notice_end != undefined)
+      && (TotValues.notice_end >= TotValues.current_year))
+    || ((TotValues.d_notice_end != undefined)
+    && (TotValues.d_notice_end >= TotValues.current_year))
+    || ((TotValues.p_notice_end != undefined)
+    && (TotValues.p_notice_end >= TotValues.current_year));
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -86,54 +86,54 @@ Rules.beforeEndOfNoticeWindow = () =>  {
 Rules.section304Analysis = () =>  {
   // Note that this is part of the logic from the section 203 analysis
   var result = 's1q1f';
-  if (Values.k_year < 1978) {
+  if (TotValues.k_year < 1978) {
     result = 's2q2a';
     Rules.addFlag('F.i');
-    if ((Values.pub_year > 1977) && (Values.reg_year > 1977)) {
+    if ((TotValues.pub_year > 1977) && (TotValues.reg_year > 1977)) {
       result = Rules.conclusion('B.vii');
     } else {
       // Under the 1909 Act, copyright term begins at the earlier of
       // the registration date and the publication date.
       // If the work is both registered and published use the minimum of them.
-      if ((Values.reg_year != undefined)
-          && (Values.pub_year != undefined)) {
-            Values.cright_year = Math.min(Values.pub_year,
-                                          Values.reg_year);
+      if ((TotValues.reg_year != undefined)
+          && (TotValues.pub_year != undefined)) {
+            TotValues.cright_year = Math.min(TotValues.pub_year,
+                                          TotValues.reg_year);
       }
       // Otherwise use whichever value is set. One *will* be set here, see top.
       else {
-        Values.cright_year = Values.reg_year || Values.pub_year;
+        TotValues.cright_year = TotValues.reg_year || TotValues.pub_year;
       }
-      Values.cright_year = Math.min(Values.cright_year, 1978);
-      Values.term_begin = Values.cright_year + 56;
-      Values.term_begin = Math.max(Values.term_begin, 1978);
-      Values.term_end = Values.term_begin + 5;
-      Values.notice_begin = Values.term_begin - 10;
-      Values.notice_end = Values.term_end - 2;
+      TotValues.cright_year = Math.min(TotValues.cright_year, 1978);
+      TotValues.term_begin = TotValues.cright_year + 56;
+      TotValues.term_begin = Math.max(TotValues.term_begin, 1978);
+      TotValues.term_end = TotValues.term_begin + 5;
+      TotValues.notice_begin = TotValues.term_begin - 10;
+      TotValues.notice_end = TotValues.term_end - 2;
       // If the we're presently before the 304(c) window, then we don't have to worry about 304(d)
-	if (Values.notice_begin > Values.current_year) {
+	if (TotValues.notice_begin > TotValues.current_year) {
         Rules.addFlag('A.i.a');
        // Following Copyright Office guidance, works copyrighted before 1940 may also be eligible for termination under 304d
-       } else if (Values.cright_year < 1940) {
+       } else if (TotValues.cright_year < 1940) {
           Rules.addFlag('F.ii');
-          Values.d_term_begin = Values.term_begin + 19;
-          Values.d_term_end = Values.d_term_begin + 5;
-          Values.d_notice_begin = Values.d_term_begin - 10;
-          Values.d_notice_end = Values.d_term_end - 2;
-          if (Values.cright_year > 1936) {
+          TotValues.d_term_begin = TotValues.term_begin + 19;
+          TotValues.d_term_end = TotValues.d_term_begin + 5;
+          TotValues.d_notice_begin = TotValues.d_term_begin - 10;
+          TotValues.d_notice_end = TotValues.d_term_end - 2;
+          if (TotValues.cright_year > 1936) {
             Rules.addFlag('G.i');
           }
-          if (Values.cright_year == 1939) {
+          if (TotValues.cright_year == 1939) {
             Rules.addFlag('G.ii.a');
           }
-          if (Values.d_notice_begin > Values.current_year) {
+          if (TotValues.d_notice_begin > TotValues.current_year) {
             // time traveler flag -- applies where the present day is between
             // the 304(c) and 304(d) notice windows
             Rules.addFlag('A.iii.a');
-          } else if (Values.d_notice_end < Values.current_year) {
+          } else if (TotValues.d_notice_end < TotValues.current_year) {
             Rules.addFlag('A.ii.a');
           }
-       } else if (Values.notice_end < Values.current_year) {
+       } else if (TotValues.notice_end < TotValues.current_year) {
          Rules.addFlag('A.ii.a');
        } else {
          // Here for clarity / to reflect decision tree structure
@@ -141,8 +141,8 @@ Rules.section304Analysis = () =>  {
          result = 's2q2a';
        }
     }
-    if ((Values.d_term_begin != undefined)
-        && (Values.term_begin != undefined)) {
+    if ((TotValues.d_term_begin != undefined)
+        && (TotValues.term_begin != undefined)) {
       Rules.addFlag('E.i');
     }
   }
@@ -151,51 +151,51 @@ Rules.section304Analysis = () =>  {
 
 Rules.section203Analysis = () =>  {
   var result = 's2q2a';
-  if (typeof Values.grant_pub_year !== 'undefined') {
+  if (typeof TotValues.grant_pub_year !== 'undefined') {
     Rules.addFlag('F.iv');
   }
-  Values.triggering_pub_year = Values.grant_pub_year || Values.pub_year;
-  if (Values.k_year > 1977) {
+  TotValues.triggering_pub_year = TotValues.grant_pub_year || TotValues.pub_year;
+  if (TotValues.k_year > 1977) {
     Rules.addFlag('F.iii');
-    if (Values.pub_right == 'yes' ) {
-      if (Values.triggering_pub_year != undefined) {
-        Values.term_begin = Math.min(Values.triggering_pub_year + 35 ,
-                                     Values.k_year + 40);
+    if (TotValues.pub_right == 'yes' ) {
+      if (TotValues.triggering_pub_year != undefined) {
+        TotValues.term_begin = Math.min(TotValues.triggering_pub_year + 35 ,
+                                     TotValues.k_year + 40);
       } else {
-        Values.term_begin = Values.k_year + 40;
+        TotValues.term_begin = TotValues.k_year + 40;
       }
-    } else if ((Values.triggering_pub_year != Values.k_year)
-           || (Values.pub_right == 'no'))  {
-      Values.term_begin = Values.k_year + 35;
+    } else if ((TotValues.triggering_pub_year != TotValues.k_year)
+           || (TotValues.pub_right == 'no'))  {
+      TotValues.term_begin = TotValues.k_year + 35;
     }
-    if (Values.term_begin != undefined) {
-      Values.term_end = Values.term_begin + 5;
-      Values.notice_begin = Values.term_begin - 10;
-      Values.notice_end = Values.term_end - 2;
-      if (Values.notice_begin > Values.current_year) {
+    if (TotValues.term_begin != undefined) {
+      TotValues.term_end = TotValues.term_begin + 5;
+      TotValues.notice_begin = TotValues.term_begin - 10;
+      TotValues.notice_end = TotValues.term_end - 2;
+      if (TotValues.notice_begin > TotValues.current_year) {
         Rules.addFlag('A.i.a');
-      } else if (Values.notice_end < Values.current_year) {
+      } else if (TotValues.notice_end < TotValues.current_year) {
         Rules.addFlag('A.ii.a');
       }
     }
-    if (Values.pub_right == 'maybe') {
-      Values.p_term_begin = Values.k_year + 40;
-      if (Values.triggering_pub_year != undefined) {
-        Values.p_term_begin = Math.min(Values.triggering_pub_year + 35,
-                                       Values.p_term_begin);
+    if (TotValues.pub_right == 'maybe') {
+      TotValues.p_term_begin = TotValues.k_year + 40;
+      if (TotValues.triggering_pub_year != undefined) {
+        TotValues.p_term_begin = Math.min(TotValues.triggering_pub_year + 35,
+                                       TotValues.p_term_begin);
       }
-      Values.p_term_end = Values.p_term_begin  + 5;
-      Values.p_notice_begin = Values.p_term_begin - 10;
-      Values.p_notice_end = Values.p_term_end - 2;
-      if (Values.p_notice_begin > Values.current_year) {
+      TotValues.p_term_end = TotValues.p_term_begin  + 5;
+      TotValues.p_notice_begin = TotValues.p_term_begin - 10;
+      TotValues.p_notice_end = TotValues.p_term_end - 2;
+      if (TotValues.p_notice_begin > TotValues.current_year) {
         Rules.addFlag('A.i.a');
-      } else if (Values.p_notice_end < Values.current_year) {
+      } else if (TotValues.p_notice_end < TotValues.current_year) {
         Rules.addFlag('A.ii.a');
       }
     }
   }
-  if ((Values.p_term_begin != undefined)
-      && (Values.term_begin != undefined)) {
+  if ((TotValues.p_term_begin != undefined)
+      && (TotValues.term_begin != undefined)) {
       Rules.addFlag('E.ii');
   }
   return result;
@@ -227,9 +227,9 @@ Rules.s1q1bi = 's1q1bii';
 
 Rules.s1q1bii = () =>  {
   var result = undefined;
-  if (Values.pub_year < 1923) {
+  if (TotValues.pub_year < 1923) {
     result = Rules.conclusion('B.viii');
-  } else if (Values.pub_year < 1990)
+  } else if (TotValues.pub_year < 1990)
     result = 's1q1bi2';
   else {
     result = 's1q1d';
@@ -241,12 +241,12 @@ Rules.s1q1bii = () =>  {
 
 Rules.s1q1bi2 = () =>  {
   var result = undefined;
-  if (Values.copyright_notice == 'yes') {
+  if (TotValues.copyright_notice == 'yes') {
     result = 's1q1c';
-  } else if (Values.copyright_notice == 'no') {
+  } else if (TotValues.copyright_notice == 'no') {
     // The same
     result = 's1q1c';
-    if (Values.pub_year < 1989) {
+    if (TotValues.pub_year < 1989) {
       Rules.addFlag('B.i');
     } else {
       Rules.addFlag('B.ii');
@@ -262,9 +262,9 @@ Rules.s1q1bi2 = () =>  {
 
 Rules.s1q1c = () =>  {
   var result = undefined;
-  if (Values.work_registered == 'yes') {
+  if (TotValues.work_registered == 'yes') {
     result = 's1q1ci';
-  } else if (Values.work_registered == 'no') {
+  } else if (TotValues.work_registered == 'no') {
     result = 's1q1d';
   } else /* don't know */ {
     // If someone doesn't know, continue without asking for registration number
@@ -277,7 +277,7 @@ Rules.s1q1c = () =>  {
 
 Rules.s1q1ci = () =>  {
   var result = undefined;
-  if (Values.reg_year < 1923) {
+  if (TotValues.reg_year < 1923) {
     result = Rules.conclusion('B.viii');
   } else {
     result = 's1q1d';
@@ -290,12 +290,12 @@ Rules.s1q1ci = () =>  {
 
 Rules.s1q1d = () =>  {
   var result = undefined;
-  if (Values.user_inputted_k_year != Values.k_year) {
+  if (TotValues.user_inputted_k_year != TotValues.k_year) {
     Rules.addFlag('H.i');
   }
-  if ((Values.k_year < 1978)
-      && ((Values.pub_year == undefined)
-      && (Values.reg_year == undefined))) {
+  if ((TotValues.k_year < 1978)
+      && ((TotValues.pub_year == undefined)
+      && (TotValues.reg_year == undefined))) {
       result = Rules.conclusion('B.vii');
   } else {
     // Intercept the result so we can add encouragement if things look good
@@ -333,12 +333,12 @@ Rules.section203Analysis;
 
 Rules.s2q2a = () =>  {
   var result = undefined;
-  if (Values.last_will == 'yes') {
+  if (TotValues.last_will == 'yes') {
     result = Rules.conclusion('B.iv');
   } else {
-    if ((Values.creation_year > 1977)
-    || (((Values.pub_year == undefined) || (Values.pub_year > 1977))
-        && ((Values.reg_year == undefined) || (Values.reg_year > 1977)))) {
+    if ((TotValues.creation_year > 1977)
+    || (((TotValues.pub_year == undefined) || (TotValues.pub_year > 1977))
+        && ((TotValues.reg_year == undefined) || (TotValues.reg_year > 1977)))) {
       result = 's2q2bi';
     } else {
       result = 's2q2c';
@@ -352,7 +352,7 @@ Rules.s2q2a = () =>  {
 
 Rules.s2q2bi = () =>  {
   var result = undefined;
-  if (Values.any_authors_alive == 'yes') {
+  if (TotValues.any_authors_alive == 'yes') {
     result = 's2q2c'
   } else {
     result = 's2q2bi2';
@@ -365,16 +365,16 @@ Rules.s2q2bi = () =>  {
 Rules.s2q2bi2 = () =>  {
   var result = undefined;
   // creation_year is always set, pub_year may not be, death will be here
-  if (Values.creation_year > 1977) {
-    Values.pd = Values.death + 71;
-  } else if ((Values.pub_year != undefined)
-     && (Values.pub_year < 2003)) {
-    Values.pd = Math.max((Values.death + 71), 2048);
+  if (TotValues.creation_year > 1977) {
+    TotValues.pd = TotValues.death + 71;
+  } else if ((TotValues.pub_year != undefined)
+     && (TotValues.pub_year < 2003)) {
+    TotValues.pd = Math.max((TotValues.death + 71), 2048);
   } else {
-    Values.pd = Math.max((Values.death + 71), 2003);
+    TotValues.pd = Math.max((TotValues.death + 71), 2003);
   }
   // pd *will* have been set in the if/else block
-  if (Values.current_year > Values.pd) {
+  if (TotValues.current_year > TotValues.pd) {
     result = Rules.conclusion('B.viii');
   } else {
     result = 's2q2c';
@@ -386,8 +386,8 @@ Rules.s2q2bi2 = () =>  {
 
 Rules.s2q2c = () =>  {
   var result = undefined;
-  if (Values.within_scope_of_employment == 'yes') {
-    if (Values.creation_year > 1977) {
+  if (TotValues.within_scope_of_employment == 'yes') {
+    if (TotValues.creation_year > 1977) {
       result = 's2q2ci';
     } else {
       result = Rules.conclusion('B.i');
@@ -402,7 +402,7 @@ Rules.s2q2c = () =>  {
 
 Rules.s2q2ci = () =>  {
   var result = undefined;
-   if (Values.express_agreement == 'yes') {
+   if (TotValues.express_agreement == 'yes') {
     result = 's2q2d';
    } else {
      result = Rules.conclusion('B.i');
@@ -414,8 +414,8 @@ Rules.s2q2ci = () =>  {
 
 Rules.s2q2d = () =>  {
   var result = undefined;
-  if (Values.special_order == 'yes') {
-    if (Values.creation_year < 1978) {
+  if (TotValues.special_order == 'yes') {
+    if (TotValues.creation_year < 1978) {
       Rules.addFlag('D.i');
       result = 's2q2e';
     } else {
@@ -431,8 +431,8 @@ Rules.s2q2d = () =>  {
 
 Rules.s2q2di = () =>  {
   var result = undefined;
-  if (Values.signed_written_agreement == 'yes') {
-    if (Values.creation_year < 1978) {
+  if (TotValues.signed_written_agreement == 'yes') {
+    if (TotValues.creation_year < 1978) {
       result = Rules.conclusion('B.iii');
     } else {
       result = 's2q2dia';
@@ -447,9 +447,9 @@ Rules.s2q2di = () =>  {
 
 Rules.s2q2dia = () =>  {
   var result = undefined;
-  if (Values.created_as_part_of_motion_picture == 'yes') {
+  if (TotValues.created_as_part_of_motion_picture == 'yes') {
     result = Rules.conclusion('C.ii');
-  } else if (Values.created_as_part_of_motion_picture == 'no') {
+  } else if (TotValues.created_as_part_of_motion_picture == 'no') {
     result = 's2q2e';
   } else /* don't know */ {
     Rules.addFlag('D.ii');
@@ -462,9 +462,9 @@ Rules.s2q2dia = () =>  {
 
 Rules.s2q2e = () =>  {
   var result = 's2q2f';
-  if (Values.renego == 'yes') {
+  if (TotValues.renego == 'yes') {
     Rules.addFlag('C.i');
-  } else if (Values.renego == 'no') {
+  } else if (TotValues.renego == 'no') {
     // Continue
   } else /* don't know */ {
     Rules.addFlag('C.ii');
@@ -476,16 +476,16 @@ Rules.s2q2e = () =>  {
 
 Rules.s2q2f = () =>  {
   var result = undefined;
-  if (Values.authors_entered_agreement == 'yes') {
-    if (Values.k_year < 1978) {
+  if (TotValues.authors_entered_agreement == 'yes') {
+    if (TotValues.k_year < 1978) {
       result = Rules.conclusionPDF('A.i-ii');
     } else /*if (k_year > 1977)*/ {
       result = Rules.conclusionPDF('A.iii');
     }
   } else {
-    if (Values.k_year < 1978) {
+    if (TotValues.k_year < 1978) {
       result = 's2q2fii';
-    } else /*if (Values.k_year > 1977)*/ {
+    } else /*if (TotValues.k_year > 1977)*/ {
       result = Rules.conclusion('B.vi');
     }
   }
@@ -496,7 +496,7 @@ Rules.s2q2f = () =>  {
 
 Rules.s2q2fii = () =>  {
   var result = undefined;
-  if (Values.agreement_by_family_or_executor) {
+  if (TotValues.agreement_by_family_or_executor) {
     result = Rules.conclusionPDF('A.i-ii');
   } else {
     result = Rules.conclusion('B.v');
diff --git a/assets/js/validation.js b/assets/js/validation.js
index ce6bab0..bc6dcfb 100644
--- a/assets/js/validation.js
+++ b/assets/js/validation.js
@@ -58,7 +58,7 @@ Validation.validDate = () => {
   if (! date.match(/[0-9]{4}/)) {
     errors.push("date must be four digits");
   }
-  if (parseInt(date) > Values.current_year) {
+  if (parseInt(date) > TotValues.current_year) {
     errors.push("date must be in the past");
   }
   if (errors.length != 0) {
diff --git a/assets/js/values.js b/assets/js/values.js
index 776c4c9..6386b83 100644
--- a/assets/js/values.js
+++ b/assets/js/values.js
@@ -22,11 +22,11 @@
 // Rules consult these values and add their own.
 ////////////////////////////////////////////////////////////////////////////////
 
-var Values = {};
+const TotValues = {};
 
-Values.reset = () =>  {
+TotValues.reset = () =>  {
   var now = new Date();
-  Values = {
+  TotValues = {
     current_date: now,
     current_year: now.getFullYear(),
     flags: []
@@ -62,13 +62,13 @@ ValuesStack.height = () =>  {
 
 ValuesStack.push = () =>  {
   // Handle the date not liking being serialized.
-  var now = Values.current_date;
-  this._stack.push(Values);
+  var now = TotValues.current_date;
+  this._stack.push(TotValues);
   // Deep clone
-  Values = JSON.parse(JSON.stringify(Values));
-  Values.current_date = now;
+  TotValues = JSON.parse(JSON.stringify(TotValues));
+  TotValues.current_date = now;
 };
 
 ValuesStack.pop = () =>  {
-  Values = this._stack.pop();
+  TotValues = this._stack.pop();
 };

From b9bbe36eb034250579f866416a997dd4af1bce9d Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:13:59 +0100
Subject: [PATCH 080/196] used double quote

---
 assets/js/values.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/assets/js/values.js b/assets/js/values.js
index 6386b83..9aac370 100644
--- a/assets/js/values.js
+++ b/assets/js/values.js
@@ -24,31 +24,31 @@
 
 const TotValues = {};
 
-TotValues.reset = () =>  {
+TotValues.reset = () => {
   var now = new Date();
   TotValues = {
     current_date: now,
     current_year: now.getFullYear(),
-    flags: []
+    flags: [],
   };
 };
 
 //FIXME: Hello namespace pollution
 
 var varsToTitles = {
-  work_authors: 'Author',
-  work_title: 'Title of Work',
-  creation_year: 'Creation Year',
-  pub_year: 'Publication Year',
-  grant_pub_year: 'Publication Year Under Grant',
-  triggering_pub_year: 'Triggering Publication Date',
-  k_year: 'Effective Grant Year',
-  user_inputted_k_year: 'User Entered Grant Year',
-  reg_year: 'Copyright Registration Year',
-  work_copyright_reg_num: 'Registration Number',
-  termination_type: 'Termination Type',
-  work_agreement_type: 'Agreement or Transfer Type',
-  work_agreement_desc: 'Agreement or Transfer Description',
+  work_authors: "Author",
+  work_title: "Title of Work",
+  creation_year: "Creation Year",
+  pub_year: "Publication Year",
+  grant_pub_year: "Publication Year Under Grant",
+  triggering_pub_year: "Triggering Publication Date",
+  k_year: "Effective Grant Year",
+  user_inputted_k_year: "User Entered Grant Year",
+  reg_year: "Copyright Registration Year",
+  work_copyright_reg_num: "Registration Number",
+  termination_type: "Termination Type",
+  work_agreement_type: "Agreement or Transfer Type",
+  work_agreement_desc: "Agreement or Transfer Description",
   //'': 'Grantor',
 };
 
@@ -56,11 +56,11 @@ var ValuesStack = {};
 
 ValuesStack._stack = [];
 
-ValuesStack.height = () =>  {
+ValuesStack.height = () => {
   return this._stack.length;
 };
 
-ValuesStack.push = () =>  {
+ValuesStack.push = () => {
   // Handle the date not liking being serialized.
   var now = TotValues.current_date;
   this._stack.push(TotValues);
@@ -69,6 +69,6 @@ ValuesStack.push = () =>  {
   TotValues.current_date = now;
 };
 
-ValuesStack.pop = () =>  {
+ValuesStack.pop = () => {
   TotValues = this._stack.pop();
 };

From c6677177ba79a7bcf6fcff30680e9dcc89fd40e6 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:14:52 +0100
Subject: [PATCH 081/196] used double quote

---
 assets/js/widgets.js | 61 ++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index d4eab92..14d16ab 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -29,16 +29,18 @@
 const TotAnswers = {};
 
 TotAnswers.resetAnswers = () => {
-  jQuery('#answers-table-rows').empty();
+  jQuery("#answers-table-rows").empty();
 };
 
 TotAnswers.appendAnswer = (myId, label, value) => {
-  if (! label) {
+  if (!label) {
     label = jQuery(`#${myId} > label`).first().text();
   }
   // If the user has gone back and is changing the answer, first remove it
   TotAnswers.removeAnswer(myId);
-  jQuery('#answers-table-rows').append(`<tr id="answer-row-${myId}><td>${label}</td><td align="right">${label}</td></tr>`);
+  jQuery("#answers-table-rows").append(
+    `<tr id="answer-row-${myId}><td>${label}</td><td align="right">${label}</td></tr>`
+  );
 };
 
 TotAnswers.removeAnswer = (myId) => {
@@ -52,39 +54,45 @@ TotAnswers.removeAnswer = (myId) => {
 const TotNotifications = {};
 
 TotNotifications.clearAlerts = () => {
-  jQuery('#alert-area').empty();
+  jQuery("#alert-area").empty();
 };
 
 TotNotifications.setAlert = (message) => {
   TotNotifications.clearAlerts();
-  jQuery('#alert-area').append(`<div class="alert alert-warning" role="alert">${message}</div>`);
+  jQuery("#alert-area").append(
+    `<div class="alert alert-warning" role="alert">${message}</div>`
+  );
 };
 
 TotNotifications.setEncouragement = (message) => {
   TotNotifications.clearAlerts();
-  jQuery('#alert-area').append(`<div class="alert alert-success" role="alert">${message}</div>`);
+  jQuery("#alert-area").append(
+    `<div class="alert alert-success" role="alert">${message}</div>`
+  );
 };
 
 TotNotifications.displayAnswersHint = () => {
-  jQuery('#answers-table-rows').append('<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>');
+  jQuery("#answers-table-rows").append(
+    '<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>'
+  );
 };
 
 TotNotifications.removeAnswersHint = () => {
-  jQuery('#answers-table-row-placeholder').remove();
+  jQuery("#answers-table-row-placeholder").remove();
 };
 
 TotNotifications.displayResultArea = () => {
-  jQuery('#result-area').removeClass('hidden');
+  jQuery("#result-area").removeClass("hidden");
 };
 
 TotNotifications.hideResultArea = () => {
-  jQuery('#result-area').addClass('hidden');
+  jQuery("#result-area").addClass("hidden");
 };
 
 TotNotifications.setResultAreaMessage = (obj, panelClass) => {
-  jQuery('#result-area').addClass(panelClass);
-  jQuery('#result-area-title').html(obj.title);
-  jQuery('#result-area-message').html(obj.description);
+  jQuery("#result-area").addClass(panelClass);
+  jQuery("#result-area-title").html(obj.title);
+  jQuery("#result-area-message").html(obj.description);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -98,44 +106,43 @@ Navigation.progressStack = [];
 // These return true so we can use them as "handlers" in simpleNextQuestion
 
 Navigation.disableNext = () => {
-  jQuery('#button-question-next').prop("disabled", true);
+  jQuery("#button-question-next").prop("disabled", true);
   return true;
 };
 
 Navigation.disablePrevious = () => {
-  jQuery('#button-question-back').prop("disabled", true);
+  jQuery("#button-question-back").prop("disabled", true);
   return true;
 };
 
 Navigation.enableNext = () => {
-  jQuery('#button-question-next').prop("disabled", false);
+  jQuery("#button-question-next").prop("disabled", false);
   return true;
 };
 
 Navigation.enablePrevious = () => {
-  jQuery('#button-question-back').prop("disabled", false);
+  jQuery("#button-question-back").prop("disabled", false);
   return true;
 };
 
 Navigation.showNextPrevious = () => {
-  jQuery("#question-progress-buttons").removeClass('hidden');
+  jQuery("#question-progress-buttons").removeClass("hidden");
 };
 
 Navigation.hideQuestions = () => {
-  jQuery('#questionnaire-section').addClass('hidden');
-  jQuery('.form-group').addClass('hidden');
+  jQuery("#questionnaire-section").addClass("hidden");
+  jQuery(".form-group").addClass("hidden");
 };
 
 Navigation.showQuestions = () => {
-  jQuery('#questionnaire-section').removeClass('hidden');
-  jQuery('.form-group').removeClass('hidden');
+  jQuery("#questionnaire-section").removeClass("hidden");
+  jQuery(".form-group").removeClass("hidden");
 };
 
-Navigation.hideNoJSWarning = () => {
-};
+Navigation.hideNoJSWarning = () => {};
 
 Navigation.showAnswersTable = () => {
-  jQuery("#answers-table").removeClass('hidden');
+  jQuery("#answers-table").removeClass("hidden");
 };
 
 // After this, do not restart the questionnaire, reload the page to restart
@@ -144,11 +151,11 @@ Navigation.finishQuestions = () => {
   Navigation.hideQuestions();
   TotNotifications.displayResultArea();
   Navigation.disableNext();
-  jQuery("#button-restart").removeClass('hidden');
+  jQuery("#button-restart").removeClass("hidden");
 };
 
 Navigation.unfinishQuestions = () => {
   Navigation.showQuestions();
   TotNotifications.hideResultArea();
-  jQuery("#button-restart").addClass('hidden');
+  jQuery("#button-restart").addClass("hidden");
 };

From a5fef0b9af82e351b6a028ff6a226d9bbecd7c4f Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:22:04 +0100
Subject: [PATCH 082/196] renamed var varsToTiles  to const totVarsToTiles

---
 assets/js/pdf.js    | 4 ++--
 assets/js/values.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index 863eba4..aa71e2e 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -86,10 +86,10 @@ PDF.appendWindows = (details) => {
 
 PDF.details = () =>  {
   var details = [];
-  Object.getOwnPropertyNames(varsToTitles).forEach( (key) => {
+  Object.getOwnPropertyNames(totVarsToTitles).forEach( (key) => {
     if ((TotValues[key] != undefined)
         && (TotValues[key] != '')) {
-      PDF.appendProperty(details, varsToTitles[key], TotValues[key]);
+      PDF.appendProperty(details, totVarsToTitles[key], TotValues[key]);
     }
   });
   PDF.appendWindows(details);
diff --git a/assets/js/values.js b/assets/js/values.js
index 9aac370..52eef08 100644
--- a/assets/js/values.js
+++ b/assets/js/values.js
@@ -35,7 +35,7 @@ TotValues.reset = () => {
 
 //FIXME: Hello namespace pollution
 
-var varsToTitles = {
+const totVarsToTitles = {
   work_authors: "Author",
   work_title: "Title of Work",
   creation_year: "Creation Year",

From de52298f697ab3805a8487c1bdb4d344c894795b Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:23:22 +0100
Subject: [PATCH 083/196] updated var to let

---
 assets/js/values.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/values.js b/assets/js/values.js
index 52eef08..656cbad 100644
--- a/assets/js/values.js
+++ b/assets/js/values.js
@@ -25,7 +25,7 @@
 const TotValues = {};
 
 TotValues.reset = () => {
-  var now = new Date();
+  let now = new Date();
   TotValues = {
     current_date: now,
     current_year: now.getFullYear(),
@@ -52,7 +52,7 @@ const totVarsToTitles = {
   //'': 'Grantor',
 };
 
-var ValuesStack = {};
+let ValuesStack = {};
 
 ValuesStack._stack = [];
 
@@ -62,7 +62,7 @@ ValuesStack.height = () => {
 
 ValuesStack.push = () => {
   // Handle the date not liking being serialized.
-  var now = TotValues.current_date;
+  let now = TotValues.current_date;
   this._stack.push(TotValues);
   // Deep clone
   TotValues = JSON.parse(JSON.stringify(TotValues));

From 13cca9b3648c21acd05c00a553401d1cbbb033d8 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:25:34 +0100
Subject: [PATCH 084/196] renamed var Validation to TotValidation

---
 assets/js/questions.js  | 8 ++++----
 assets/js/rendering.js  | 2 +-
 assets/js/validation.js | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 7f17751..31d2419 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -64,7 +64,7 @@ TotQuestions.s1q1bi = {
   explanation:'When a work was published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
   input: 'year',
   validate: () =>  {
-    return Validation.validDate()
+    return TotValidation.validDate()
       || ((parseInt(jQuery('.text-question').val()) < TotValues.creation_year)
           ? 'The publication year cannot be earlier than the creation year.'
           : false);
@@ -81,7 +81,7 @@ TotQuestions.s1q1bii =  {
   variable: 'grant_pub_year',
   input: 'year',
   validate: () =>  {
-    var errors = Validation.validDate();
+    var errors = TotValidation.validDate();
     if (errors == false) {
       var year = parseInt(jQuery('.text-question').val());
       if (year < TotValues.creation_year) {
@@ -134,7 +134,7 @@ TotQuestions.s1q1d = {
   variable: 'k_year',
   input: 'year',
   validate: () =>  {
-    var errors = Validation.validDate();
+    var errors = TotValidation.validDate();
     if (errors == false) {
         // Stash the user-entered agreement year
         TotValues.user_inputted_k_year = parseInt(jQuery('.text-question').val());
@@ -277,7 +277,7 @@ TotQuestions.validateAnswer = () =>  {
   if (question['validate']) {
     result = question.validate();
   } else if (question.type == 'year') {
-    result = Validation.validDate();
+    result = TotValidation.validDate();
   } else if (question.type == 'text') {
     // If the text has a minimum length, check it
     if (jQuery('.text-question').val().length < question.min_chars) {
diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 1a51bfc..f2c2dd2 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -157,7 +157,7 @@ Rendering.text = (config) => {
 Rendering.year = (config) => {
   var question = Rendering.text(config);
   var text_field = question.find('.text-question');
-  Validation.allowOnlyNumbers(text_field);
+  TotValidation.allowOnlyNumbers(text_field);
   text_field.prop('maxlength', 4);
   text_field.prop('placeholder', '1977');
   return question;
diff --git a/assets/js/validation.js b/assets/js/validation.js
index bc6dcfb..885e457 100644
--- a/assets/js/validation.js
+++ b/assets/js/validation.js
@@ -17,10 +17,10 @@
 */
 
 ////////////////////////////////////////////////////////////////////////////////
-// Validation of values and of UI state
+// TotValidation of values and of UI state
 ////////////////////////////////////////////////////////////////////////////////
 
-var Validation = {};
+const TotValidation = {};
 
 // Naughty. If we're going to monkeypatch we should have a file for these
 
@@ -28,7 +28,7 @@ String.prototype.capitalizeFirstLetter = () => {
     return this.charAt(0).toUpperCase() + this.slice(1);
 }
 
-Validation.allowOnlyNumbers = (element) => {
+TotValidation.allowOnlyNumbers = (element) => {
   // http://stackoverflow.com/a/995193
   element.keydown( (e) => {
     // Allow: backspace, delete, tab, escape, enter and .
@@ -50,7 +50,7 @@ Validation.allowOnlyNumbers = (element) => {
 
 // false here means no errors, a string means errors
 
-Validation.validDate = () => {
+TotValidation.validDate = () => {
   var text_field = jQuery('.text-question');
   var date = text_field.val();
   var result = false;

From d92a77e4704ebac0ba31d31915cedf5a59a93168 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:27:19 +0100
Subject: [PATCH 085/196] updated validation.js concatenated strings to es6
 literals

---
 assets/js/validation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/validation.js b/assets/js/validation.js
index 885e457..b1a9bc8 100644
--- a/assets/js/validation.js
+++ b/assets/js/validation.js
@@ -62,7 +62,7 @@ TotValidation.validDate = () => {
     errors.push("date must be in the past");
   }
   if (errors.length != 0) {
-    result = errors.join().capitalizeFirstLetter() + '.';
+    result =  `${errors.join().capitalizeFirstLetter()}.`;
   }
   return result;
 };

From dfec407a51373cd2faf92c8807cb1d396a98cc0c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:28:00 +0100
Subject: [PATCH 086/196] used double quote

---
 assets/js/validation.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/assets/js/validation.js b/assets/js/validation.js
index b1a9bc8..8d14d23 100644
--- a/assets/js/validation.js
+++ b/assets/js/validation.js
@@ -25,24 +25,28 @@ const TotValidation = {};
 // Naughty. If we're going to monkeypatch we should have a file for these
 
 String.prototype.capitalizeFirstLetter = () => {
-    return this.charAt(0).toUpperCase() + this.slice(1);
-}
+  return this.charAt(0).toUpperCase() + this.slice(1);
+};
 
 TotValidation.allowOnlyNumbers = (element) => {
   // http://stackoverflow.com/a/995193
-  element.keydown( (e) => {
+  element.keydown((e) => {
     // Allow: backspace, delete, tab, escape, enter and .
-    if (jQuery.inArray(e.keyCode, [46, 8, 9, 27, 13, 110, 190]) !== -1 ||
-        // Allow: Ctrl+A, Command+A
-        (e.keyCode == 65 && ( e.ctrlKey === true || e.metaKey === true ) ) ||
-        // Allow: home, end, left, right, down, up
-        (e.keyCode >= 35 && e.keyCode <= 40)) {
+    if (
+      jQuery.inArray(e.keyCode, [46, 8, 9, 27, 13, 110, 190]) !== -1 ||
+      // Allow: Ctrl+A, Command+A
+      (e.keyCode == 65 && (e.ctrlKey === true || e.metaKey === true)) ||
+      // Allow: home, end, left, right, down, up
+      (e.keyCode >= 35 && e.keyCode <= 40)
+    ) {
       // let it happen, don't do anything
       return;
     }
     // Ensure that it is a number and stop the keypress
-    if ((e.shiftKey || (e.keyCode < 48 || e.keyCode > 57))
-        && (e.keyCode < 96 || e.keyCode > 105)) {
+    if (
+      (e.shiftKey || e.keyCode < 48 || e.keyCode > 57) &&
+      (e.keyCode < 96 || e.keyCode > 105)
+    ) {
       e.preventDefault();
     }
   });
@@ -51,18 +55,18 @@ TotValidation.allowOnlyNumbers = (element) => {
 // false here means no errors, a string means errors
 
 TotValidation.validDate = () => {
-  var text_field = jQuery('.text-question');
+  var text_field = jQuery(".text-question");
   var date = text_field.val();
   var result = false;
   var errors = [];
-  if (! date.match(/[0-9]{4}/)) {
+  if (!date.match(/[0-9]{4}/)) {
     errors.push("date must be four digits");
   }
   if (parseInt(date) > TotValues.current_year) {
     errors.push("date must be in the past");
   }
   if (errors.length != 0) {
-    result =  `${errors.join().capitalizeFirstLetter()}.`;
+    result = `${errors.join().capitalizeFirstLetter()}.`;
   }
   return result;
 };

From cfa828a395130e70579250260bacdeece3218565 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:29:54 +0100
Subject: [PATCH 087/196] renamed var Rules to const TotRules

---
 assets/js/pdf.js       |   4 +-
 assets/js/questions.js |   2 +-
 assets/js/rules.js     | 166 ++++++++++++++++++++---------------------
 3 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index aa71e2e..af650b2 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -77,9 +77,9 @@ PDF.append304Windows = (details) => {
 };
 
 PDF.appendWindows = (details) => {
-  if (Rules.is203()) {
+  if (TotRules.is203()) {
     PDF.append203Windows(details);
-  } else if (Rules.is304()) {
+  } else if (TotRules.is304()) {
     PDF.append304Windows(details);
   }
 };
diff --git a/assets/js/questions.js b/assets/js/questions.js
index 31d2419..abaacfd 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -401,7 +401,7 @@ TotQuestions.transitionQuestion = (next_question) => {
 
 TotQuestions.nextQuestionID = () =>  {
   var next_question = TotQuestions.current_question;
-  var rule = Rules[TotQuestions.current_question];
+  var rule = TotRules[TotQuestions.current_question];
   if (typeof rule == 'function') {
     next_question = rule();
   } else {
diff --git a/assets/js/rules.js b/assets/js/rules.js
index c5b1537..68f4cc6 100644
--- a/assets/js/rules.js
+++ b/assets/js/rules.js
@@ -17,9 +17,9 @@
 */
 
 
-var Rules = {};
+const TotRules = {};
 
-Rules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
+TotRules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
   return () =>  {
     var result = undefined;
     if (TotValues[variable_id] == 'yes') {
@@ -31,20 +31,20 @@ Rules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
   };
 };
 
-Rules.jumpToFinish = 'finish';
+TotRules.jumpToFinish = 'finish';
 
-Rules.conclusion = (conclusion) => {
+TotRules.conclusion = (conclusion) => {
   TotValues.conclusion = conclusion;
-  return Rules.jumpToFinish;
+  return TotRules.jumpToFinish;
 };
 
-Rules.conclusionPDF = (conclusion) => {
-  Rules.conclusion(conclusion);
+TotRules.conclusionPDF = (conclusion) => {
+  TotRules.conclusion(conclusion);
   TotValues.conclusion_generate_pdf = true;
-  return Rules.jumpToFinish;
+  return TotRules.jumpToFinish;
 };
 
-Rules.addFlag = (flag) => {
+TotRules.addFlag = (flag) => {
   TotValues.flags.push(flag);
 };
 
@@ -52,15 +52,15 @@ Rules.addFlag = (flag) => {
 // Calculated/inferred properties
 ////////////////////////////////////////////////////////////////////////////////
 
-Rules.is203 = () =>  {
+TotRules.is203 = () =>  {
   return (TotValues.conclusion == "A.iii");
 };
 
-Rules.is304 = () =>  {
+TotRules.is304 = () =>  {
   return (['A.i', 'A.ii', 'A.i-ii'].indexOf(TotValues.conclusion) > -1);
 };
 
-Rules.hasPublicDomainFlags = () =>  {
+TotRules.hasPublicDomainFlags = () =>  {
   var result = false;
   for (var i = 0; i < TotValues.flags.length; i++) {
     if (TotValues.flags[i][0] == 'B') {
@@ -70,7 +70,7 @@ Rules.hasPublicDomainFlags = () =>  {
   return result;
 };
 
-Rules.beforeEndOfNoticeWindow = () =>  {
+TotRules.beforeEndOfNoticeWindow = () =>  {
   return ((TotValues.notice_end != undefined)
       && (TotValues.notice_end >= TotValues.current_year))
     || ((TotValues.d_notice_end != undefined)
@@ -83,14 +83,14 @@ Rules.beforeEndOfNoticeWindow = () =>  {
 // Section N Analyses
 ////////////////////////////////////////////////////////////////////////////////
 
-Rules.section304Analysis = () =>  {
+TotRules.section304Analysis = () =>  {
   // Note that this is part of the logic from the section 203 analysis
   var result = 's1q1f';
   if (TotValues.k_year < 1978) {
     result = 's2q2a';
-    Rules.addFlag('F.i');
+    TotRules.addFlag('F.i');
     if ((TotValues.pub_year > 1977) && (TotValues.reg_year > 1977)) {
-      result = Rules.conclusion('B.vii');
+      result = TotRules.conclusion('B.vii');
     } else {
       // Under the 1909 Act, copyright term begins at the earlier of
       // the registration date and the publication date.
@@ -112,29 +112,29 @@ Rules.section304Analysis = () =>  {
       TotValues.notice_end = TotValues.term_end - 2;
       // If the we're presently before the 304(c) window, then we don't have to worry about 304(d)
 	if (TotValues.notice_begin > TotValues.current_year) {
-        Rules.addFlag('A.i.a');
+        TotRules.addFlag('A.i.a');
        // Following Copyright Office guidance, works copyrighted before 1940 may also be eligible for termination under 304d
        } else if (TotValues.cright_year < 1940) {
-          Rules.addFlag('F.ii');
+          TotRules.addFlag('F.ii');
           TotValues.d_term_begin = TotValues.term_begin + 19;
           TotValues.d_term_end = TotValues.d_term_begin + 5;
           TotValues.d_notice_begin = TotValues.d_term_begin - 10;
           TotValues.d_notice_end = TotValues.d_term_end - 2;
           if (TotValues.cright_year > 1936) {
-            Rules.addFlag('G.i');
+            TotRules.addFlag('G.i');
           }
           if (TotValues.cright_year == 1939) {
-            Rules.addFlag('G.ii.a');
+            TotRules.addFlag('G.ii.a');
           }
           if (TotValues.d_notice_begin > TotValues.current_year) {
             // time traveler flag -- applies where the present day is between
             // the 304(c) and 304(d) notice windows
-            Rules.addFlag('A.iii.a');
+            TotRules.addFlag('A.iii.a');
           } else if (TotValues.d_notice_end < TotValues.current_year) {
-            Rules.addFlag('A.ii.a');
+            TotRules.addFlag('A.ii.a');
           }
        } else if (TotValues.notice_end < TotValues.current_year) {
-         Rules.addFlag('A.ii.a');
+         TotRules.addFlag('A.ii.a');
        } else {
          // Here for clarity / to reflect decision tree structure
          // But note that we set it as the result above.
@@ -143,20 +143,20 @@ Rules.section304Analysis = () =>  {
     }
     if ((TotValues.d_term_begin != undefined)
         && (TotValues.term_begin != undefined)) {
-      Rules.addFlag('E.i');
+      TotRules.addFlag('E.i');
     }
   }
   return result;
 };
 
-Rules.section203Analysis = () =>  {
+TotRules.section203Analysis = () =>  {
   var result = 's2q2a';
   if (typeof TotValues.grant_pub_year !== 'undefined') {
-    Rules.addFlag('F.iv');
+    TotRules.addFlag('F.iv');
   }
   TotValues.triggering_pub_year = TotValues.grant_pub_year || TotValues.pub_year;
   if (TotValues.k_year > 1977) {
-    Rules.addFlag('F.iii');
+    TotRules.addFlag('F.iii');
     if (TotValues.pub_right == 'yes' ) {
       if (TotValues.triggering_pub_year != undefined) {
         TotValues.term_begin = Math.min(TotValues.triggering_pub_year + 35 ,
@@ -173,9 +173,9 @@ Rules.section203Analysis = () =>  {
       TotValues.notice_begin = TotValues.term_begin - 10;
       TotValues.notice_end = TotValues.term_end - 2;
       if (TotValues.notice_begin > TotValues.current_year) {
-        Rules.addFlag('A.i.a');
+        TotRules.addFlag('A.i.a');
       } else if (TotValues.notice_end < TotValues.current_year) {
-        Rules.addFlag('A.ii.a');
+        TotRules.addFlag('A.ii.a');
       }
     }
     if (TotValues.pub_right == 'maybe') {
@@ -188,15 +188,15 @@ Rules.section203Analysis = () =>  {
       TotValues.p_notice_begin = TotValues.p_term_begin - 10;
       TotValues.p_notice_end = TotValues.p_term_end - 2;
       if (TotValues.p_notice_begin > TotValues.current_year) {
-        Rules.addFlag('A.i.a');
+        TotRules.addFlag('A.i.a');
       } else if (TotValues.p_notice_end < TotValues.current_year) {
-        Rules.addFlag('A.ii.a');
+        TotRules.addFlag('A.ii.a');
       }
     }
   }
   if ((TotValues.p_term_begin != undefined)
       && (TotValues.term_begin != undefined)) {
-      Rules.addFlag('E.ii');
+      TotRules.addFlag('E.ii');
   }
   return result;
 };
@@ -208,27 +208,27 @@ Rules.section203Analysis = () =>  {
 
 // When was the work created?
 
-Rules.s1q1a = 's1q1b';
+TotRules.s1q1a = 's1q1b';
 
 // Has the work been published?
 
-Rules.s1q1b = Rules.simpleYesNoRule('work_published',
+TotRules.s1q1b = TotRules.simpleYesNoRule('work_published',
                                     's1q1bi',
                                     's1q1c');
 
 // When was the work first published?
 
-Rules.s1q1bi = 's1q1bii';
+TotRules.s1q1bi = 's1q1bii';
 
 // When was the work first published under the grant?
 // Note that the condition is based on s1q1b, we are inserting this question
 // after 'When was the work first published?' and *then* going on to the
 // questions about registration/notices or not.
 
-Rules.s1q1bii = () =>  {
+TotRules.s1q1bii = () =>  {
   var result = undefined;
   if (TotValues.pub_year < 1923) {
-    result = Rules.conclusion('B.viii');
+    result = TotRules.conclusion('B.viii');
   } else if (TotValues.pub_year < 1990)
     result = 's1q1bi2';
   else {
@@ -239,7 +239,7 @@ Rules.s1q1bii = () =>  {
 
 // Works from 1989 and earlier usually display a copyright notice...
 
-Rules.s1q1bi2 = () =>  {
+TotRules.s1q1bi2 = () =>  {
   var result = undefined;
   if (TotValues.copyright_notice == 'yes') {
     result = 's1q1c';
@@ -247,20 +247,20 @@ Rules.s1q1bi2 = () =>  {
     // The same
     result = 's1q1c';
     if (TotValues.pub_year < 1989) {
-      Rules.addFlag('B.i');
+      TotRules.addFlag('B.i');
     } else {
-      Rules.addFlag('B.ii');
+      TotRules.addFlag('B.ii');
     }
   } else /* maybe */ {
     result = 's1q1c';
-    Rules.addFlag('B.iii');
+    TotRules.addFlag('B.iii');
   }
   return result;
 };
 
 // Has the work been registered with the United State Copyright Office?
 
-Rules.s1q1c = () =>  {
+TotRules.s1q1c = () =>  {
   var result = undefined;
   if (TotValues.work_registered == 'yes') {
     result = 's1q1ci';
@@ -275,10 +275,10 @@ Rules.s1q1c = () =>  {
 
 // When was the work registered with the United States Copyright Office?
 
-Rules.s1q1ci = () =>  {
+TotRules.s1q1ci = () =>  {
   var result = undefined;
   if (TotValues.reg_year < 1923) {
-    result = Rules.conclusion('B.viii');
+    result = TotRules.conclusion('B.viii');
   } else {
     result = 's1q1d';
   }
@@ -288,21 +288,21 @@ Rules.s1q1ci = () =>  {
 // For s1q1d,
 // What is the date of the agreement or transfer? ...
 
-Rules.s1q1d = () =>  {
+TotRules.s1q1d = () =>  {
   var result = undefined;
   if (TotValues.user_inputted_k_year != TotValues.k_year) {
-    Rules.addFlag('H.i');
+    TotRules.addFlag('H.i');
   }
   if ((TotValues.k_year < 1978)
       && ((TotValues.pub_year == undefined)
       && (TotValues.reg_year == undefined))) {
-      result = Rules.conclusion('B.vii');
+      result = TotRules.conclusion('B.vii');
   } else {
     // Intercept the result so we can add encouragement if things look good
-    result = Rules.section304Analysis();
-    if ((result != Rules.jumpToFinish)
-    && Rules.beforeEndOfNoticeWindow()
-    && (! Rules.hasPublicDomainFlags())) {
+    result = TotRules.section304Analysis();
+    if ((result != TotRules.jumpToFinish)
+    && TotRules.beforeEndOfNoticeWindow()
+    && (! TotRules.hasPublicDomainFlags())) {
     TotNotifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
     }
   }
@@ -311,19 +311,19 @@ Rules.s1q1d = () =>  {
 
 // Did the agreement or transfer include the right of publication?
 
-Rules.s1q1f = () =>  {
+TotRules.s1q1f = () =>  {
   // Intercept the result so we can add encouragement if things look good
-  var result = Rules.section203Analysis();
-  if ((result != Rules.jumpToFinish)
-      && Rules.beforeEndOfNoticeWindow()
-      && (! Rules.hasPublicDomainFlags())) {
+  var result = TotRules.section203Analysis();
+  if ((result != TotRules.jumpToFinish)
+      && TotRules.beforeEndOfNoticeWindow()
+      && (! TotRules.hasPublicDomainFlags())) {
     TotNotifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
   }
   return result;
 };
 
 
-Rules.section203Analysis;
+TotRules.section203Analysis;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Section 2
@@ -331,10 +331,10 @@ Rules.section203Analysis;
 
 // Is the agreement or transfer you want to terminate part of a last will...
 
-Rules.s2q2a = () =>  {
+TotRules.s2q2a = () =>  {
   var result = undefined;
   if (TotValues.last_will == 'yes') {
-    result = Rules.conclusion('B.iv');
+    result = TotRules.conclusion('B.iv');
   } else {
     if ((TotValues.creation_year > 1977)
     || (((TotValues.pub_year == undefined) || (TotValues.pub_year > 1977))
@@ -350,7 +350,7 @@ Rules.s2q2a = () =>  {
 // Are any of the authors still alive?
 // It's i) because the conditional logic that starts b is included in a
 
-Rules.s2q2bi = () =>  {
+TotRules.s2q2bi = () =>  {
   var result = undefined;
   if (TotValues.any_authors_alive == 'yes') {
     result = 's2q2c'
@@ -362,7 +362,7 @@ Rules.s2q2bi = () =>  {
 
 // What is the year the last surviving author died?
 
-Rules.s2q2bi2 = () =>  {
+TotRules.s2q2bi2 = () =>  {
   var result = undefined;
   // creation_year is always set, pub_year may not be, death will be here
   if (TotValues.creation_year > 1977) {
@@ -375,7 +375,7 @@ Rules.s2q2bi2 = () =>  {
   }
   // pd *will* have been set in the if/else block
   if (TotValues.current_year > TotValues.pd) {
-    result = Rules.conclusion('B.viii');
+    result = TotRules.conclusion('B.viii');
   } else {
     result = 's2q2c';
   }
@@ -384,13 +384,13 @@ Rules.s2q2bi2 = () =>  {
 
 // Was the work created within the scope of the author’s employment?
 
-Rules.s2q2c = () =>  {
+TotRules.s2q2c = () =>  {
   var result = undefined;
   if (TotValues.within_scope_of_employment == 'yes') {
     if (TotValues.creation_year > 1977) {
       result = 's2q2ci';
     } else {
-      result = Rules.conclusion('B.i');
+      result = TotRules.conclusion('B.i');
     }
   } else {
     result = 's2q2d';
@@ -400,23 +400,23 @@ Rules.s2q2c = () =>  {
 
 // Was there an express agreement between you...
 
-Rules.s2q2ci = () =>  {
+TotRules.s2q2ci = () =>  {
   var result = undefined;
    if (TotValues.express_agreement == 'yes') {
     result = 's2q2d';
    } else {
-     result = Rules.conclusion('B.i');
+     result = TotRules.conclusion('B.i');
   }
   return result;
 };
 
 // Was the work created in response to a special order or commission?
 
-Rules.s2q2d = () =>  {
+TotRules.s2q2d = () =>  {
   var result = undefined;
   if (TotValues.special_order == 'yes') {
     if (TotValues.creation_year < 1978) {
-      Rules.addFlag('D.i');
+      TotRules.addFlag('D.i');
       result = 's2q2e';
     } else {
       result = 's2q2di';
@@ -429,11 +429,11 @@ Rules.s2q2d = () =>  {
 
 // Was there a signed written agreement regarding the special order...
 
-Rules.s2q2di = () =>  {
+TotRules.s2q2di = () =>  {
   var result = undefined;
   if (TotValues.signed_written_agreement == 'yes') {
     if (TotValues.creation_year < 1978) {
-      result = Rules.conclusion('B.iii');
+      result = TotRules.conclusion('B.iii');
     } else {
       result = 's2q2dia';
     }
@@ -445,14 +445,14 @@ Rules.s2q2di = () =>  {
 
 // Was the work created for use as one of the following? ...
 
-Rules.s2q2dia = () =>  {
+TotRules.s2q2dia = () =>  {
   var result = undefined;
   if (TotValues.created_as_part_of_motion_picture == 'yes') {
-    result = Rules.conclusion('C.ii');
+    result = TotRules.conclusion('C.ii');
   } else if (TotValues.created_as_part_of_motion_picture == 'no') {
     result = 's2q2e';
   } else /* don't know */ {
-    Rules.addFlag('D.ii');
+    TotRules.addFlag('D.ii');
     result = 's2q2e';
   }
   return result;
@@ -460,33 +460,33 @@ Rules.s2q2dia = () =>  {
 
 // Has the original transfer since been renegotiated or altered?
 
-Rules.s2q2e = () =>  {
+TotRules.s2q2e = () =>  {
   var result = 's2q2f';
   if (TotValues.renego == 'yes') {
-    Rules.addFlag('C.i');
+    TotRules.addFlag('C.i');
   } else if (TotValues.renego == 'no') {
     // Continue
   } else /* don't know */ {
-    Rules.addFlag('C.ii');
+    TotRules.addFlag('C.ii');
   }
   return result;
 };
 
 // Did one or more of the authors or artists enter into the agreement...
 
-Rules.s2q2f = () =>  {
+TotRules.s2q2f = () =>  {
   var result = undefined;
   if (TotValues.authors_entered_agreement == 'yes') {
     if (TotValues.k_year < 1978) {
-      result = Rules.conclusionPDF('A.i-ii');
+      result = TotRules.conclusionPDF('A.i-ii');
     } else /*if (k_year > 1977)*/ {
-      result = Rules.conclusionPDF('A.iii');
+      result = TotRules.conclusionPDF('A.iii');
     }
   } else {
     if (TotValues.k_year < 1978) {
       result = 's2q2fii';
     } else /*if (TotValues.k_year > 1977)*/ {
-      result = Rules.conclusion('B.vi');
+      result = TotRules.conclusion('B.vi');
     }
   }
   return result;
@@ -494,12 +494,12 @@ Rules.s2q2f = () =>  {
 
 // Was the agreement or transfer made by a member of...
 
-Rules.s2q2fii = () =>  {
+TotRules.s2q2fii = () =>  {
   var result = undefined;
   if (TotValues.agreement_by_family_or_executor) {
-    result = Rules.conclusionPDF('A.i-ii');
+    result = TotRules.conclusionPDF('A.i-ii');
   } else {
-    result = Rules.conclusion('B.v');
+    result = TotRules.conclusion('B.v');
   }
   return result
  };

From b06e7a60d810a5a5a4d0717067798845204923dd Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:31:17 +0100
Subject: [PATCH 088/196] used double quote

---
 assets/js/rules.js | 417 ++++++++++++++++++++++++---------------------
 1 file changed, 218 insertions(+), 199 deletions(-)

diff --git a/assets/js/rules.js b/assets/js/rules.js
index 68f4cc6..a53931c 100644
--- a/assets/js/rules.js
+++ b/assets/js/rules.js
@@ -16,13 +16,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 const TotRules = {};
 
 TotRules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
-  return () =>  {
+  return () => {
     var result = undefined;
-    if (TotValues[variable_id] == 'yes') {
+    if (TotValues[variable_id] == "yes") {
       result = yesValue;
     } else {
       result = noValue;
@@ -31,7 +30,7 @@ TotRules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
   };
 };
 
-TotRules.jumpToFinish = 'finish';
+TotRules.jumpToFinish = "finish";
 
 TotRules.conclusion = (conclusion) => {
   TotValues.conclusion = conclusion;
@@ -52,53 +51,56 @@ TotRules.addFlag = (flag) => {
 // Calculated/inferred properties
 ////////////////////////////////////////////////////////////////////////////////
 
-TotRules.is203 = () =>  {
-  return (TotValues.conclusion == "A.iii");
+TotRules.is203 = () => {
+  return TotValues.conclusion == "A.iii";
 };
 
-TotRules.is304 = () =>  {
-  return (['A.i', 'A.ii', 'A.i-ii'].indexOf(TotValues.conclusion) > -1);
+TotRules.is304 = () => {
+  return ["A.i", "A.ii", "A.i-ii"].indexOf(TotValues.conclusion) > -1;
 };
 
-TotRules.hasPublicDomainFlags = () =>  {
+TotRules.hasPublicDomainFlags = () => {
   var result = false;
   for (var i = 0; i < TotValues.flags.length; i++) {
-    if (TotValues.flags[i][0] == 'B') {
+    if (TotValues.flags[i][0] == "B") {
       result = true;
     }
   }
   return result;
 };
 
-TotRules.beforeEndOfNoticeWindow = () =>  {
-  return ((TotValues.notice_end != undefined)
-      && (TotValues.notice_end >= TotValues.current_year))
-    || ((TotValues.d_notice_end != undefined)
-    && (TotValues.d_notice_end >= TotValues.current_year))
-    || ((TotValues.p_notice_end != undefined)
-    && (TotValues.p_notice_end >= TotValues.current_year));
+TotRules.beforeEndOfNoticeWindow = () => {
+  return (
+    (TotValues.notice_end != undefined &&
+      TotValues.notice_end >= TotValues.current_year) ||
+    (TotValues.d_notice_end != undefined &&
+      TotValues.d_notice_end >= TotValues.current_year) ||
+    (TotValues.p_notice_end != undefined &&
+      TotValues.p_notice_end >= TotValues.current_year)
+  );
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Section N Analyses
 ////////////////////////////////////////////////////////////////////////////////
 
-TotRules.section304Analysis = () =>  {
+TotRules.section304Analysis = () => {
   // Note that this is part of the logic from the section 203 analysis
-  var result = 's1q1f';
+  var result = "s1q1f";
   if (TotValues.k_year < 1978) {
-    result = 's2q2a';
-    TotRules.addFlag('F.i');
-    if ((TotValues.pub_year > 1977) && (TotValues.reg_year > 1977)) {
-      result = TotRules.conclusion('B.vii');
+    result = "s2q2a";
+    TotRules.addFlag("F.i");
+    if (TotValues.pub_year > 1977 && TotValues.reg_year > 1977) {
+      result = TotRules.conclusion("B.vii");
     } else {
       // Under the 1909 Act, copyright term begins at the earlier of
       // the registration date and the publication date.
       // If the work is both registered and published use the minimum of them.
-      if ((TotValues.reg_year != undefined)
-          && (TotValues.pub_year != undefined)) {
-            TotValues.cright_year = Math.min(TotValues.pub_year,
-                                          TotValues.reg_year);
+      if (TotValues.reg_year != undefined && TotValues.pub_year != undefined) {
+        TotValues.cright_year = Math.min(
+          TotValues.pub_year,
+          TotValues.reg_year
+        );
       }
       // Otherwise use whichever value is set. One *will* be set here, see top.
       else {
@@ -111,61 +113,68 @@ TotRules.section304Analysis = () =>  {
       TotValues.notice_begin = TotValues.term_begin - 10;
       TotValues.notice_end = TotValues.term_end - 2;
       // If the we're presently before the 304(c) window, then we don't have to worry about 304(d)
-	if (TotValues.notice_begin > TotValues.current_year) {
-        TotRules.addFlag('A.i.a');
-       // Following Copyright Office guidance, works copyrighted before 1940 may also be eligible for termination under 304d
-       } else if (TotValues.cright_year < 1940) {
-          TotRules.addFlag('F.ii');
-          TotValues.d_term_begin = TotValues.term_begin + 19;
-          TotValues.d_term_end = TotValues.d_term_begin + 5;
-          TotValues.d_notice_begin = TotValues.d_term_begin - 10;
-          TotValues.d_notice_end = TotValues.d_term_end - 2;
-          if (TotValues.cright_year > 1936) {
-            TotRules.addFlag('G.i');
-          }
-          if (TotValues.cright_year == 1939) {
-            TotRules.addFlag('G.ii.a');
-          }
-          if (TotValues.d_notice_begin > TotValues.current_year) {
-            // time traveler flag -- applies where the present day is between
-            // the 304(c) and 304(d) notice windows
-            TotRules.addFlag('A.iii.a');
-          } else if (TotValues.d_notice_end < TotValues.current_year) {
-            TotRules.addFlag('A.ii.a');
-          }
-       } else if (TotValues.notice_end < TotValues.current_year) {
-         TotRules.addFlag('A.ii.a');
-       } else {
-         // Here for clarity / to reflect decision tree structure
-         // But note that we set it as the result above.
-         result = 's2q2a';
-       }
+      if (TotValues.notice_begin > TotValues.current_year) {
+        TotRules.addFlag("A.i.a");
+        // Following Copyright Office guidance, works copyrighted before 1940 may also be eligible for termination under 304d
+      } else if (TotValues.cright_year < 1940) {
+        TotRules.addFlag("F.ii");
+        TotValues.d_term_begin = TotValues.term_begin + 19;
+        TotValues.d_term_end = TotValues.d_term_begin + 5;
+        TotValues.d_notice_begin = TotValues.d_term_begin - 10;
+        TotValues.d_notice_end = TotValues.d_term_end - 2;
+        if (TotValues.cright_year > 1936) {
+          TotRules.addFlag("G.i");
+        }
+        if (TotValues.cright_year == 1939) {
+          TotRules.addFlag("G.ii.a");
+        }
+        if (TotValues.d_notice_begin > TotValues.current_year) {
+          // time traveler flag -- applies where the present day is between
+          // the 304(c) and 304(d) notice windows
+          TotRules.addFlag("A.iii.a");
+        } else if (TotValues.d_notice_end < TotValues.current_year) {
+          TotRules.addFlag("A.ii.a");
+        }
+      } else if (TotValues.notice_end < TotValues.current_year) {
+        TotRules.addFlag("A.ii.a");
+      } else {
+        // Here for clarity / to reflect decision tree structure
+        // But note that we set it as the result above.
+        result = "s2q2a";
+      }
     }
-    if ((TotValues.d_term_begin != undefined)
-        && (TotValues.term_begin != undefined)) {
-      TotRules.addFlag('E.i');
+    if (
+      TotValues.d_term_begin != undefined &&
+      TotValues.term_begin != undefined
+    ) {
+      TotRules.addFlag("E.i");
     }
   }
   return result;
 };
 
-TotRules.section203Analysis = () =>  {
-  var result = 's2q2a';
-  if (typeof TotValues.grant_pub_year !== 'undefined') {
-    TotRules.addFlag('F.iv');
+TotRules.section203Analysis = () => {
+  var result = "s2q2a";
+  if (typeof TotValues.grant_pub_year !== "undefined") {
+    TotRules.addFlag("F.iv");
   }
-  TotValues.triggering_pub_year = TotValues.grant_pub_year || TotValues.pub_year;
+  TotValues.triggering_pub_year =
+    TotValues.grant_pub_year || TotValues.pub_year;
   if (TotValues.k_year > 1977) {
-    TotRules.addFlag('F.iii');
-    if (TotValues.pub_right == 'yes' ) {
+    TotRules.addFlag("F.iii");
+    if (TotValues.pub_right == "yes") {
       if (TotValues.triggering_pub_year != undefined) {
-        TotValues.term_begin = Math.min(TotValues.triggering_pub_year + 35 ,
-                                     TotValues.k_year + 40);
+        TotValues.term_begin = Math.min(
+          TotValues.triggering_pub_year + 35,
+          TotValues.k_year + 40
+        );
       } else {
         TotValues.term_begin = TotValues.k_year + 40;
       }
-    } else if ((TotValues.triggering_pub_year != TotValues.k_year)
-           || (TotValues.pub_right == 'no'))  {
+    } else if (
+      TotValues.triggering_pub_year != TotValues.k_year ||
+      TotValues.pub_right == "no"
+    ) {
       TotValues.term_begin = TotValues.k_year + 35;
     }
     if (TotValues.term_begin != undefined) {
@@ -173,114 +182,114 @@ TotRules.section203Analysis = () =>  {
       TotValues.notice_begin = TotValues.term_begin - 10;
       TotValues.notice_end = TotValues.term_end - 2;
       if (TotValues.notice_begin > TotValues.current_year) {
-        TotRules.addFlag('A.i.a');
+        TotRules.addFlag("A.i.a");
       } else if (TotValues.notice_end < TotValues.current_year) {
-        TotRules.addFlag('A.ii.a');
+        TotRules.addFlag("A.ii.a");
       }
     }
-    if (TotValues.pub_right == 'maybe') {
+    if (TotValues.pub_right == "maybe") {
       TotValues.p_term_begin = TotValues.k_year + 40;
       if (TotValues.triggering_pub_year != undefined) {
-        TotValues.p_term_begin = Math.min(TotValues.triggering_pub_year + 35,
-                                       TotValues.p_term_begin);
+        TotValues.p_term_begin = Math.min(
+          TotValues.triggering_pub_year + 35,
+          TotValues.p_term_begin
+        );
       }
-      TotValues.p_term_end = TotValues.p_term_begin  + 5;
+      TotValues.p_term_end = TotValues.p_term_begin + 5;
       TotValues.p_notice_begin = TotValues.p_term_begin - 10;
       TotValues.p_notice_end = TotValues.p_term_end - 2;
       if (TotValues.p_notice_begin > TotValues.current_year) {
-        TotRules.addFlag('A.i.a');
+        TotRules.addFlag("A.i.a");
       } else if (TotValues.p_notice_end < TotValues.current_year) {
-        TotRules.addFlag('A.ii.a');
+        TotRules.addFlag("A.ii.a");
       }
     }
   }
-  if ((TotValues.p_term_begin != undefined)
-      && (TotValues.term_begin != undefined)) {
-      TotRules.addFlag('E.ii');
+  if (
+    TotValues.p_term_begin != undefined &&
+    TotValues.term_begin != undefined
+  ) {
+    TotRules.addFlag("E.ii");
   }
   return result;
 };
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // Section 1
 ////////////////////////////////////////////////////////////////////////////////
 
 // When was the work created?
 
-TotRules.s1q1a = 's1q1b';
+TotRules.s1q1a = "s1q1b";
 
 // Has the work been published?
 
-TotRules.s1q1b = TotRules.simpleYesNoRule('work_published',
-                                    's1q1bi',
-                                    's1q1c');
+TotRules.s1q1b = TotRules.simpleYesNoRule("work_published", "s1q1bi", "s1q1c");
 
 // When was the work first published?
 
-TotRules.s1q1bi = 's1q1bii';
+TotRules.s1q1bi = "s1q1bii";
 
 // When was the work first published under the grant?
 // Note that the condition is based on s1q1b, we are inserting this question
 // after 'When was the work first published?' and *then* going on to the
 // questions about registration/notices or not.
 
-TotRules.s1q1bii = () =>  {
+TotRules.s1q1bii = () => {
   var result = undefined;
   if (TotValues.pub_year < 1923) {
-    result = TotRules.conclusion('B.viii');
-  } else if (TotValues.pub_year < 1990)
-    result = 's1q1bi2';
+    result = TotRules.conclusion("B.viii");
+  } else if (TotValues.pub_year < 1990) result = "s1q1bi2";
   else {
-    result = 's1q1d';
+    result = "s1q1d";
   }
   return result;
 };
 
 // Works from 1989 and earlier usually display a copyright notice...
 
-TotRules.s1q1bi2 = () =>  {
+TotRules.s1q1bi2 = () => {
   var result = undefined;
-  if (TotValues.copyright_notice == 'yes') {
-    result = 's1q1c';
-  } else if (TotValues.copyright_notice == 'no') {
+  if (TotValues.copyright_notice == "yes") {
+    result = "s1q1c";
+  } else if (TotValues.copyright_notice == "no") {
     // The same
-    result = 's1q1c';
+    result = "s1q1c";
     if (TotValues.pub_year < 1989) {
-      TotRules.addFlag('B.i');
+      TotRules.addFlag("B.i");
     } else {
-      TotRules.addFlag('B.ii');
+      TotRules.addFlag("B.ii");
     }
-  } else /* maybe */ {
-    result = 's1q1c';
-    TotRules.addFlag('B.iii');
+  } /* maybe */ else {
+    result = "s1q1c";
+    TotRules.addFlag("B.iii");
   }
   return result;
 };
 
 // Has the work been registered with the United State Copyright Office?
 
-TotRules.s1q1c = () =>  {
+TotRules.s1q1c = () => {
   var result = undefined;
-  if (TotValues.work_registered == 'yes') {
-    result = 's1q1ci';
-  } else if (TotValues.work_registered == 'no') {
-    result = 's1q1d';
-  } else /* don't know */ {
+  if (TotValues.work_registered == "yes") {
+    result = "s1q1ci";
+  } else if (TotValues.work_registered == "no") {
+    result = "s1q1d";
+  } /* don't know */ else {
     // If someone doesn't know, continue without asking for registration number
-    result = 's1q1d';
+    result = "s1q1d";
   }
   return result;
 };
 
 // When was the work registered with the United States Copyright Office?
 
-TotRules.s1q1ci = () =>  {
+TotRules.s1q1ci = () => {
   var result = undefined;
   if (TotValues.reg_year < 1923) {
-    result = TotRules.conclusion('B.viii');
+    result = TotRules.conclusion("B.viii");
   } else {
-    result = 's1q1d';
+    result = "s1q1d";
   }
   return result;
 };
@@ -288,22 +297,28 @@ TotRules.s1q1ci = () =>  {
 // For s1q1d,
 // What is the date of the agreement or transfer? ...
 
-TotRules.s1q1d = () =>  {
+TotRules.s1q1d = () => {
   var result = undefined;
   if (TotValues.user_inputted_k_year != TotValues.k_year) {
-    TotRules.addFlag('H.i');
+    TotRules.addFlag("H.i");
   }
-  if ((TotValues.k_year < 1978)
-      && ((TotValues.pub_year == undefined)
-      && (TotValues.reg_year == undefined))) {
-      result = TotRules.conclusion('B.vii');
+  if (
+    TotValues.k_year < 1978 &&
+    TotValues.pub_year == undefined &&
+    TotValues.reg_year == undefined
+  ) {
+    result = TotRules.conclusion("B.vii");
   } else {
     // Intercept the result so we can add encouragement if things look good
     result = TotRules.section304Analysis();
-    if ((result != TotRules.jumpToFinish)
-    && TotRules.beforeEndOfNoticeWindow()
-    && (! TotRules.hasPublicDomainFlags())) {
-    TotNotifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
+    if (
+      result != TotRules.jumpToFinish &&
+      TotRules.beforeEndOfNoticeWindow() &&
+      !TotRules.hasPublicDomainFlags()
+    ) {
+      TotNotifications.setEncouragement(
+        "Both notice window and copyright status look good, let's get some more details!"
+      );
     }
   }
   return result;
@@ -311,18 +326,21 @@ TotRules.s1q1d = () =>  {
 
 // Did the agreement or transfer include the right of publication?
 
-TotRules.s1q1f = () =>  {
+TotRules.s1q1f = () => {
   // Intercept the result so we can add encouragement if things look good
   var result = TotRules.section203Analysis();
-  if ((result != TotRules.jumpToFinish)
-      && TotRules.beforeEndOfNoticeWindow()
-      && (! TotRules.hasPublicDomainFlags())) {
-    TotNotifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
+  if (
+    result != TotRules.jumpToFinish &&
+    TotRules.beforeEndOfNoticeWindow() &&
+    !TotRules.hasPublicDomainFlags()
+  ) {
+    TotNotifications.setEncouragement(
+      "Both notice window and copyright status look good, let's get some more details!"
+    );
   }
   return result;
 };
 
-
 TotRules.section203Analysis;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -331,17 +349,19 @@ TotRules.section203Analysis;
 
 // Is the agreement or transfer you want to terminate part of a last will...
 
-TotRules.s2q2a = () =>  {
+TotRules.s2q2a = () => {
   var result = undefined;
-  if (TotValues.last_will == 'yes') {
-    result = TotRules.conclusion('B.iv');
+  if (TotValues.last_will == "yes") {
+    result = TotRules.conclusion("B.iv");
   } else {
-    if ((TotValues.creation_year > 1977)
-    || (((TotValues.pub_year == undefined) || (TotValues.pub_year > 1977))
-        && ((TotValues.reg_year == undefined) || (TotValues.reg_year > 1977)))) {
-      result = 's2q2bi';
+    if (
+      TotValues.creation_year > 1977 ||
+      ((TotValues.pub_year == undefined || TotValues.pub_year > 1977) &&
+        (TotValues.reg_year == undefined || TotValues.reg_year > 1977))
+    ) {
+      result = "s2q2bi";
     } else {
-      result = 's2q2c';
+      result = "s2q2c";
     }
   }
   return result;
@@ -350,143 +370,142 @@ TotRules.s2q2a = () =>  {
 // Are any of the authors still alive?
 // It's i) because the conditional logic that starts b is included in a
 
-TotRules.s2q2bi = () =>  {
+TotRules.s2q2bi = () => {
   var result = undefined;
-  if (TotValues.any_authors_alive == 'yes') {
-    result = 's2q2c'
+  if (TotValues.any_authors_alive == "yes") {
+    result = "s2q2c";
   } else {
-    result = 's2q2bi2';
+    result = "s2q2bi2";
   }
   return result;
 };
 
 // What is the year the last surviving author died?
 
-TotRules.s2q2bi2 = () =>  {
+TotRules.s2q2bi2 = () => {
   var result = undefined;
   // creation_year is always set, pub_year may not be, death will be here
   if (TotValues.creation_year > 1977) {
     TotValues.pd = TotValues.death + 71;
-  } else if ((TotValues.pub_year != undefined)
-     && (TotValues.pub_year < 2003)) {
-    TotValues.pd = Math.max((TotValues.death + 71), 2048);
+  } else if (TotValues.pub_year != undefined && TotValues.pub_year < 2003) {
+    TotValues.pd = Math.max(TotValues.death + 71, 2048);
   } else {
-    TotValues.pd = Math.max((TotValues.death + 71), 2003);
+    TotValues.pd = Math.max(TotValues.death + 71, 2003);
   }
   // pd *will* have been set in the if/else block
   if (TotValues.current_year > TotValues.pd) {
-    result = TotRules.conclusion('B.viii');
+    result = TotRules.conclusion("B.viii");
   } else {
-    result = 's2q2c';
+    result = "s2q2c";
   }
   return result;
 };
 
 // Was the work created within the scope of the author’s employment?
 
-TotRules.s2q2c = () =>  {
+TotRules.s2q2c = () => {
   var result = undefined;
-  if (TotValues.within_scope_of_employment == 'yes') {
+  if (TotValues.within_scope_of_employment == "yes") {
     if (TotValues.creation_year > 1977) {
-      result = 's2q2ci';
+      result = "s2q2ci";
     } else {
-      result = TotRules.conclusion('B.i');
+      result = TotRules.conclusion("B.i");
     }
   } else {
-    result = 's2q2d';
+    result = "s2q2d";
   }
-  return result
+  return result;
 };
 
 // Was there an express agreement between you...
 
-TotRules.s2q2ci = () =>  {
+TotRules.s2q2ci = () => {
   var result = undefined;
-   if (TotValues.express_agreement == 'yes') {
-    result = 's2q2d';
-   } else {
-     result = TotRules.conclusion('B.i');
+  if (TotValues.express_agreement == "yes") {
+    result = "s2q2d";
+  } else {
+    result = TotRules.conclusion("B.i");
   }
   return result;
 };
 
 // Was the work created in response to a special order or commission?
 
-TotRules.s2q2d = () =>  {
+TotRules.s2q2d = () => {
   var result = undefined;
-  if (TotValues.special_order == 'yes') {
+  if (TotValues.special_order == "yes") {
     if (TotValues.creation_year < 1978) {
-      TotRules.addFlag('D.i');
-      result = 's2q2e';
+      TotRules.addFlag("D.i");
+      result = "s2q2e";
     } else {
-      result = 's2q2di';
+      result = "s2q2di";
     }
   } else {
-    result = 's2q2e';
+    result = "s2q2e";
   }
-  return result
+  return result;
 };
 
 // Was there a signed written agreement regarding the special order...
 
-TotRules.s2q2di = () =>  {
+TotRules.s2q2di = () => {
   var result = undefined;
-  if (TotValues.signed_written_agreement == 'yes') {
+  if (TotValues.signed_written_agreement == "yes") {
     if (TotValues.creation_year < 1978) {
-      result = TotRules.conclusion('B.iii');
+      result = TotRules.conclusion("B.iii");
     } else {
-      result = 's2q2dia';
+      result = "s2q2dia";
     }
   } else {
-    result = 's2q2e';
+    result = "s2q2e";
   }
-  return result
+  return result;
 };
 
 // Was the work created for use as one of the following? ...
 
-TotRules.s2q2dia = () =>  {
+TotRules.s2q2dia = () => {
   var result = undefined;
-  if (TotValues.created_as_part_of_motion_picture == 'yes') {
-    result = TotRules.conclusion('C.ii');
-  } else if (TotValues.created_as_part_of_motion_picture == 'no') {
-    result = 's2q2e';
-  } else /* don't know */ {
-    TotRules.addFlag('D.ii');
-    result = 's2q2e';
+  if (TotValues.created_as_part_of_motion_picture == "yes") {
+    result = TotRules.conclusion("C.ii");
+  } else if (TotValues.created_as_part_of_motion_picture == "no") {
+    result = "s2q2e";
+  } /* don't know */ else {
+    TotRules.addFlag("D.ii");
+    result = "s2q2e";
   }
   return result;
 };
 
 // Has the original transfer since been renegotiated or altered?
 
-TotRules.s2q2e = () =>  {
-  var result = 's2q2f';
-  if (TotValues.renego == 'yes') {
-    TotRules.addFlag('C.i');
-  } else if (TotValues.renego == 'no') {
+TotRules.s2q2e = () => {
+  var result = "s2q2f";
+  if (TotValues.renego == "yes") {
+    TotRules.addFlag("C.i");
+  } else if (TotValues.renego == "no") {
     // Continue
-  } else /* don't know */ {
-    TotRules.addFlag('C.ii');
+  } /* don't know */ else {
+    TotRules.addFlag("C.ii");
   }
   return result;
 };
 
 // Did one or more of the authors or artists enter into the agreement...
 
-TotRules.s2q2f = () =>  {
+TotRules.s2q2f = () => {
   var result = undefined;
-  if (TotValues.authors_entered_agreement == 'yes') {
+  if (TotValues.authors_entered_agreement == "yes") {
     if (TotValues.k_year < 1978) {
-      result = TotRules.conclusionPDF('A.i-ii');
-    } else /*if (k_year > 1977)*/ {
-      result = TotRules.conclusionPDF('A.iii');
+      result = TotRules.conclusionPDF("A.i-ii");
+    } /*if (k_year > 1977)*/ else {
+      result = TotRules.conclusionPDF("A.iii");
     }
   } else {
     if (TotValues.k_year < 1978) {
-      result = 's2q2fii';
-    } else /*if (TotValues.k_year > 1977)*/ {
-      result = TotRules.conclusion('B.vi');
+      result = "s2q2fii";
+    } /*if (TotValues.k_year > 1977)*/ else {
+      result = TotRules.conclusion("B.vi");
     }
   }
   return result;
@@ -494,12 +513,12 @@ TotRules.s2q2f = () =>  {
 
 // Was the agreement or transfer made by a member of...
 
-TotRules.s2q2fii = () =>  {
+TotRules.s2q2fii = () => {
   var result = undefined;
   if (TotValues.agreement_by_family_or_executor) {
-    result = TotRules.conclusionPDF('A.i-ii');
+    result = TotRules.conclusionPDF("A.i-ii");
   } else {
-    result = TotRules.conclusion('B.v');
+    result = TotRules.conclusion("B.v");
   }
-  return result
- };
+  return result;
+};

From 65c54da6399b96a3aa45ca12632e01432db332c7 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:34:04 +0100
Subject: [PATCH 089/196] updated var to let

---
 assets/js/rules.js | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/assets/js/rules.js b/assets/js/rules.js
index a53931c..05a139c 100644
--- a/assets/js/rules.js
+++ b/assets/js/rules.js
@@ -20,7 +20,7 @@ const TotRules = {};
 
 TotRules.simpleYesNoRule = (variable_id, yesValue, noValue) => {
   return () => {
-    var result = undefined;
+    let result = undefined;
     if (TotValues[variable_id] == "yes") {
       result = yesValue;
     } else {
@@ -60,8 +60,8 @@ TotRules.is304 = () => {
 };
 
 TotRules.hasPublicDomainFlags = () => {
-  var result = false;
-  for (var i = 0; i < TotValues.flags.length; i++) {
+  let result = false;
+  for (let i = 0; i < TotValues.flags.length; i++) {
     if (TotValues.flags[i][0] == "B") {
       result = true;
     }
@@ -86,7 +86,7 @@ TotRules.beforeEndOfNoticeWindow = () => {
 
 TotRules.section304Analysis = () => {
   // Note that this is part of the logic from the section 203 analysis
-  var result = "s1q1f";
+  let result = "s1q1f";
   if (TotValues.k_year < 1978) {
     result = "s2q2a";
     TotRules.addFlag("F.i");
@@ -154,7 +154,7 @@ TotRules.section304Analysis = () => {
 };
 
 TotRules.section203Analysis = () => {
-  var result = "s2q2a";
+  let result = "s2q2a";
   if (typeof TotValues.grant_pub_year !== "undefined") {
     TotRules.addFlag("F.iv");
   }
@@ -236,7 +236,7 @@ TotRules.s1q1bi = "s1q1bii";
 // questions about registration/notices or not.
 
 TotRules.s1q1bii = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.pub_year < 1923) {
     result = TotRules.conclusion("B.viii");
   } else if (TotValues.pub_year < 1990) result = "s1q1bi2";
@@ -249,7 +249,7 @@ TotRules.s1q1bii = () => {
 // Works from 1989 and earlier usually display a copyright notice...
 
 TotRules.s1q1bi2 = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.copyright_notice == "yes") {
     result = "s1q1c";
   } else if (TotValues.copyright_notice == "no") {
@@ -270,7 +270,7 @@ TotRules.s1q1bi2 = () => {
 // Has the work been registered with the United State Copyright Office?
 
 TotRules.s1q1c = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.work_registered == "yes") {
     result = "s1q1ci";
   } else if (TotValues.work_registered == "no") {
@@ -285,7 +285,7 @@ TotRules.s1q1c = () => {
 // When was the work registered with the United States Copyright Office?
 
 TotRules.s1q1ci = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.reg_year < 1923) {
     result = TotRules.conclusion("B.viii");
   } else {
@@ -298,7 +298,7 @@ TotRules.s1q1ci = () => {
 // What is the date of the agreement or transfer? ...
 
 TotRules.s1q1d = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.user_inputted_k_year != TotValues.k_year) {
     TotRules.addFlag("H.i");
   }
@@ -328,7 +328,7 @@ TotRules.s1q1d = () => {
 
 TotRules.s1q1f = () => {
   // Intercept the result so we can add encouragement if things look good
-  var result = TotRules.section203Analysis();
+  let result = TotRules.section203Analysis();
   if (
     result != TotRules.jumpToFinish &&
     TotRules.beforeEndOfNoticeWindow() &&
@@ -350,7 +350,7 @@ TotRules.section203Analysis;
 // Is the agreement or transfer you want to terminate part of a last will...
 
 TotRules.s2q2a = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.last_will == "yes") {
     result = TotRules.conclusion("B.iv");
   } else {
@@ -371,7 +371,7 @@ TotRules.s2q2a = () => {
 // It's i) because the conditional logic that starts b is included in a
 
 TotRules.s2q2bi = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.any_authors_alive == "yes") {
     result = "s2q2c";
   } else {
@@ -383,7 +383,7 @@ TotRules.s2q2bi = () => {
 // What is the year the last surviving author died?
 
 TotRules.s2q2bi2 = () => {
-  var result = undefined;
+  let result = undefined;
   // creation_year is always set, pub_year may not be, death will be here
   if (TotValues.creation_year > 1977) {
     TotValues.pd = TotValues.death + 71;
@@ -404,7 +404,7 @@ TotRules.s2q2bi2 = () => {
 // Was the work created within the scope of the author’s employment?
 
 TotRules.s2q2c = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.within_scope_of_employment == "yes") {
     if (TotValues.creation_year > 1977) {
       result = "s2q2ci";
@@ -420,7 +420,7 @@ TotRules.s2q2c = () => {
 // Was there an express agreement between you...
 
 TotRules.s2q2ci = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.express_agreement == "yes") {
     result = "s2q2d";
   } else {
@@ -432,7 +432,7 @@ TotRules.s2q2ci = () => {
 // Was the work created in response to a special order or commission?
 
 TotRules.s2q2d = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.special_order == "yes") {
     if (TotValues.creation_year < 1978) {
       TotRules.addFlag("D.i");
@@ -449,7 +449,7 @@ TotRules.s2q2d = () => {
 // Was there a signed written agreement regarding the special order...
 
 TotRules.s2q2di = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.signed_written_agreement == "yes") {
     if (TotValues.creation_year < 1978) {
       result = TotRules.conclusion("B.iii");
@@ -465,7 +465,7 @@ TotRules.s2q2di = () => {
 // Was the work created for use as one of the following? ...
 
 TotRules.s2q2dia = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.created_as_part_of_motion_picture == "yes") {
     result = TotRules.conclusion("C.ii");
   } else if (TotValues.created_as_part_of_motion_picture == "no") {
@@ -480,7 +480,7 @@ TotRules.s2q2dia = () => {
 // Has the original transfer since been renegotiated or altered?
 
 TotRules.s2q2e = () => {
-  var result = "s2q2f";
+  let result = "s2q2f";
   if (TotValues.renego == "yes") {
     TotRules.addFlag("C.i");
   } else if (TotValues.renego == "no") {
@@ -494,7 +494,7 @@ TotRules.s2q2e = () => {
 // Did one or more of the authors or artists enter into the agreement...
 
 TotRules.s2q2f = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.authors_entered_agreement == "yes") {
     if (TotValues.k_year < 1978) {
       result = TotRules.conclusionPDF("A.i-ii");
@@ -514,7 +514,7 @@ TotRules.s2q2f = () => {
 // Was the agreement or transfer made by a member of...
 
 TotRules.s2q2fii = () => {
-  var result = undefined;
+  let result = undefined;
   if (TotValues.agreement_by_family_or_executor) {
     result = TotRules.conclusionPDF("A.i-ii");
   } else {

From 7053bd668ddcbd8bcf6f46f0745452e9b76f65cd Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:35:43 +0100
Subject: [PATCH 090/196] updated var to let

---
 assets/js/rendering.js | 44 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index f2c2dd2..5fcc7ed 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -20,7 +20,7 @@
 // Rendering UI elements for input
 ////////////////////////////////////////////////////////////////////////////////
 
-var Rendering = {};
+let Rendering = {};
 
 ////////////////////////////////////////////////////////////////////////////////
 // Sections
@@ -52,7 +52,7 @@ Rendering.createQuestion = () =>  {
 };
 
 Rendering.common = (config) => {
-  var question = Rendering.createQuestion();
+  let question = Rendering.createQuestion();
   // If this is a question in a different section, change the section header
   // Section is 1-based, so we can use a simple logical and here.
   if (config.section
@@ -81,14 +81,14 @@ Rendering.common = (config) => {
 ////////////////////////////////////////////////////////////////////////////////
 
 Rendering.radio = (config) => {
-  var question = Rendering.common(config);
-  var form_group = question.find('.form-group');
-  var name = 'input-' + config.variable;
+  let question = Rendering.common(config);
+  let form_group = question.find('.form-group');
+  let name = 'input-' + config.variable;
   // If we are returning to this via the back button, get the previous value
-  var existing_value = TotValues[config.variable];
-  var radio_button_values = config.values || ['yes', 'no'];
+  let existing_value = TotValues[config.variable];
+  let radio_button_values = config.values || ['yes', 'no'];
   radio_button_values.forEach( (value) => {
-    var radio_button = '<label class="radio-inline"><input type="radio" name=' + name + '" value="' + value  +'"';
+    let radio_button = '<label class="radio-inline"><input type="radio" name=' + name + '" value="' + value  +'"';
     if (value == existing_value) {
       radio_button += ' checked="checked"';
     }
@@ -109,7 +109,7 @@ Rendering.radio = (config) => {
 
 Rendering.makeTextLengthHandler = (element, min_length, optional) => {
   return () =>  {
-    var length = element.val().length;
+    let length = element.val().length;
     if ((optional && (length == 0))
         || (length >= min_length)) {
       Navigation.enableNext();
@@ -120,25 +120,25 @@ Rendering.makeTextLengthHandler = (element, min_length, optional) => {
 };
 
 Rendering.text = (config) => {
-  var question = Rendering.common(config);
-  var form_group = question.find('.form-group');
-  var name = 'input-' + config.variable;
-  var text_field = jQuery('<input type="text" class="form-control text-question" id="'
+  let question = Rendering.common(config);
+  let form_group = question.find('.form-group');
+  let name = 'input-' + config.variable;
+  let text_field = jQuery('<input type="text" class="form-control text-question" id="'
                      + config.variable +
                      '" placeholder="'
                      + (config.placeholder || '')
                      + '">');
   form_group.append(text_field);
   // Set the label
-  var label = question.find('.question-label').prop('for', name);
+  let label = question.find('.question-label').prop('for', name);
   if (TotValues[config.variable]) {
     form_group.find('text-question').val(TotValues[config.variable]);
   }
-  var existing_value = TotValues[config.variable];
+  let existing_value = TotValues[config.variable];
   // Ensure next isn't enabled until enough characters are entered
-  var min_length = config.min_length || 4;
-  var text_field_element = question.find('.text-question');
-  var validator = Rendering.makeTextLengthHandler(text_field_element,
+  let min_length = config.min_length || 4;
+  let text_field_element = question.find('.text-question');
+  let validator = Rendering.makeTextLengthHandler(text_field_element,
                                                   min_length,
                                                   config.optional);
   text_field_element.on('keyup', validator);
@@ -155,8 +155,8 @@ Rendering.text = (config) => {
 ////////////////////////////////////////////////////////////////////////////////
 
 Rendering.year = (config) => {
-  var question = Rendering.text(config);
-  var text_field = question.find('.text-question');
+  let question = Rendering.text(config);
+  let text_field = question.find('.text-question');
   TotValidation.allowOnlyNumbers(text_field);
   text_field.prop('maxlength', 4);
   text_field.prop('placeholder', '1977');
@@ -168,7 +168,7 @@ Rendering.year = (config) => {
 ////////////////////////////////////////////////////////////////////////////////
 
 Rendering.render = (config) => {
-  var result = undefined;
+  let result = undefined;
   switch (config.input)  {
   case 'radio':
     result = Rendering.radio(config);
@@ -186,7 +186,7 @@ Rendering.render = (config) => {
 };
 
 Rendering.transitionTo = (config) => {
-  var question = Rendering.render(config);
+  let question = Rendering.render(config);
   jQuery('.question-form').slideUp("fast",
                               () =>  {
                                 jQuery(this).remove();

From edbe53dba0dc130b611b0c5bff6007deb10dce72 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:36:43 +0100
Subject: [PATCH 091/196] used double quote

---
 assets/js/rendering.js | 122 +++++++++++++++++++++--------------------
 1 file changed, 64 insertions(+), 58 deletions(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 5fcc7ed..c55d425 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -27,10 +27,10 @@ let Rendering = {};
 ////////////////////////////////////////////////////////////////////////////////
 
 Rendering.sections = [
-  '',
-  'First tell us a few things about the work',
-  'Now, let’s find out whether the work is eligible for termination',
-  'Information about the work'
+  "",
+  "First tell us a few things about the work",
+  "Now, let’s find out whether the work is eligible for termination",
+  "Information about the work",
 ];
 
 Rendering.currentSection = 0;
@@ -39,7 +39,8 @@ Rendering.currentSection = 0;
 // Template basics
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.questionTemplate = '\
+Rendering.questionTemplate =
+  '\
 <form class="question-form">\
   <div class="form-group">\
     <label class="question-label"></label><br>\
@@ -47,7 +48,7 @@ Rendering.questionTemplate = '\
   </div>\
 </form>';
 
-Rendering.createQuestion = () =>  {
+Rendering.createQuestion = () => {
   return jQuery(Rendering.questionTemplate);
 };
 
@@ -55,20 +56,18 @@ Rendering.common = (config) => {
   let question = Rendering.createQuestion();
   // If this is a question in a different section, change the section header
   // Section is 1-based, so we can use a simple logical and here.
-  if (config.section
-      && (config.section != Rendering.currentSection)) {
-    jQuery('#section-title').html(Rendering.sections[config.section]).fadeIn();
+  if (config.section && config.section != Rendering.currentSection) {
+    jQuery("#section-title").html(Rendering.sections[config.section]).fadeIn();
   }
-  question.find('.question-label').html(config.question);
+  question.find(".question-label").html(config.question);
   if (config.explanation) {
-    question.find('.help-block').html(config.explanation);
+    question.find(".help-block").html(config.explanation);
   }
   question.css("display", "none");
   // If we're entering this value for the first time (not via the back button)
   // and this isn't an optional value
   // don't let the user continue until they enter a value here.
-  if((TotValues[config.variable] === undefined)
-     && (! config.optional)) {
+  if (TotValues[config.variable] === undefined && !config.optional) {
     Navigation.disableNext();
   } else {
     Navigation.enableNext();
@@ -82,23 +81,28 @@ Rendering.common = (config) => {
 
 Rendering.radio = (config) => {
   let question = Rendering.common(config);
-  let form_group = question.find('.form-group');
-  let name = 'input-' + config.variable;
+  let form_group = question.find(".form-group");
+  let name = "input-" + config.variable;
   // If we are returning to this via the back button, get the previous value
   let existing_value = TotValues[config.variable];
-  let radio_button_values = config.values || ['yes', 'no'];
-  radio_button_values.forEach( (value) => {
-    let radio_button = '<label class="radio-inline"><input type="radio" name=' + name + '" value="' + value  +'"';
+  let radio_button_values = config.values || ["yes", "no"];
+  radio_button_values.forEach((value) => {
+    let radio_button =
+      '<label class="radio-inline"><input type="radio" name=' +
+      name +
+      '" value="' +
+      value +
+      '"';
     if (value == existing_value) {
       radio_button += ' checked="checked"';
     }
-    radio_button += '>' + value +'</label>';
+    radio_button += ">" + value + "</label>";
     form_group.append(jQuery(radio_button));
   });
   // When the user makes a choice, go straight to the next question
-  form_group.find(':input[type="radio"]').click(() =>  {
+  form_group.find(':input[type="radio"]').click(() => {
     Navigation.enableNext();
-    jQuery('#button-question-next').click();
+    jQuery("#button-question-next").click();
   });
   return question;
 };
@@ -108,10 +112,9 @@ Rendering.radio = (config) => {
 ////////////////////////////////////////////////////////////////////////////////
 
 Rendering.makeTextLengthHandler = (element, min_length, optional) => {
-  return () =>  {
+  return () => {
     let length = element.val().length;
-    if ((optional && (length == 0))
-        || (length >= min_length)) {
+    if ((optional && length == 0) || length >= min_length) {
       Navigation.enableNext();
     } else {
       Navigation.disableNext();
@@ -121,28 +124,32 @@ Rendering.makeTextLengthHandler = (element, min_length, optional) => {
 
 Rendering.text = (config) => {
   let question = Rendering.common(config);
-  let form_group = question.find('.form-group');
-  let name = 'input-' + config.variable;
-  let text_field = jQuery('<input type="text" class="form-control text-question" id="'
-                     + config.variable +
-                     '" placeholder="'
-                     + (config.placeholder || '')
-                     + '">');
+  let form_group = question.find(".form-group");
+  let name = "input-" + config.variable;
+  let text_field = jQuery(
+    '<input type="text" class="form-control text-question" id="' +
+      config.variable +
+      '" placeholder="' +
+      (config.placeholder || "") +
+      '">'
+  );
   form_group.append(text_field);
   // Set the label
-  let label = question.find('.question-label').prop('for', name);
+  let label = question.find(".question-label").prop("for", name);
   if (TotValues[config.variable]) {
-    form_group.find('text-question').val(TotValues[config.variable]);
+    form_group.find("text-question").val(TotValues[config.variable]);
   }
   let existing_value = TotValues[config.variable];
   // Ensure next isn't enabled until enough characters are entered
   let min_length = config.min_length || 4;
-  let text_field_element = question.find('.text-question');
-  let validator = Rendering.makeTextLengthHandler(text_field_element,
-                                                  min_length,
-                                                  config.optional);
-  text_field_element.on('keyup', validator);
-  text_field_element.on('change', validator);
+  let text_field_element = question.find(".text-question");
+  let validator = Rendering.makeTextLengthHandler(
+    text_field_element,
+    min_length,
+    config.optional
+  );
+  text_field_element.on("keyup", validator);
+  text_field_element.on("change", validator);
   // If we are returning to the field and the value has already been set, use it
   if (existing_value !== undefined) {
     text_field.val(TotValues[config.variable]);
@@ -156,10 +163,10 @@ Rendering.text = (config) => {
 
 Rendering.year = (config) => {
   let question = Rendering.text(config);
-  let text_field = question.find('.text-question');
+  let text_field = question.find(".text-question");
   TotValidation.allowOnlyNumbers(text_field);
-  text_field.prop('maxlength', 4);
-  text_field.prop('placeholder', '1977');
+  text_field.prop("maxlength", 4);
+  text_field.prop("placeholder", "1977");
   return question;
 };
 
@@ -169,28 +176,27 @@ Rendering.year = (config) => {
 
 Rendering.render = (config) => {
   let result = undefined;
-  switch (config.input)  {
-  case 'radio':
-    result = Rendering.radio(config);
-    break;
-  case 'year':
-    result = Rendering.year(config);
-    break;
-  case 'text':
+  switch (config.input) {
+    case "radio":
+      result = Rendering.radio(config);
+      break;
+    case "year":
+      result = Rendering.year(config);
+      break;
+    case "text":
     // Fall through to default
-  default:
-    result = Rendering.text(config);
-    break;
+    default:
+      result = Rendering.text(config);
+      break;
   }
   return result;
 };
 
 Rendering.transitionTo = (config) => {
   let question = Rendering.render(config);
-  jQuery('.question-form').slideUp("fast",
-                              () =>  {
-                                jQuery(this).remove();
-                              });
-  jQuery('#question-rendering-area').append(question);
+  jQuery(".question-form").slideUp("fast", () => {
+    jQuery(this).remove();
+  });
+  jQuery("#question-rendering-area").append(question);
   question.slideDown("fast");
 };

From 7cb70bc4754f645db33f780c74e119869b487f25 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:47:57 +0100
Subject: [PATCH 092/196] updated rendering.js concatenated strings to es6
 literals

---
 assets/js/rendering.js | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index c55d425..a865af7 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -82,21 +82,17 @@ Rendering.common = (config) => {
 Rendering.radio = (config) => {
   let question = Rendering.common(config);
   let form_group = question.find(".form-group");
-  let name = "input-" + config.variable;
+  let name = `input ${config.variable}`;
   // If we are returning to this via the back button, get the previous value
   let existing_value = TotValues[config.variable];
   let radio_button_values = config.values || ["yes", "no"];
   radio_button_values.forEach((value) => {
-    let radio_button =
-      '<label class="radio-inline"><input type="radio" name=' +
-      name +
-      '" value="' +
-      value +
-      '"';
+    let checked = false
     if (value == existing_value) {
-      radio_button += ' checked="checked"';
+      checked = 'checked';
     }
-    radio_button += ">" + value + "</label>";
+    let radio_button = `<label class="radio-inline"><input type="radio" name=${name} checked="${checked}" value="${value}">${value}</label>`
+
     form_group.append(jQuery(radio_button));
   });
   // When the user makes a choice, go straight to the next question
@@ -126,12 +122,7 @@ Rendering.text = (config) => {
   let question = Rendering.common(config);
   let form_group = question.find(".form-group");
   let name = "input-" + config.variable;
-  let text_field = jQuery(
-    '<input type="text" class="form-control text-question" id="' +
-      config.variable +
-      '" placeholder="' +
-      (config.placeholder || "") +
-      '">'
+  let text_field = jQuery(`<input type="text" class="form-control text-question" id="${config.variable}" placeholder="${config.placeholder || ""}" >`
   );
   form_group.append(text_field);
   // Set the label

From 8c9e1c3f70d8ce09252876ab5cec386e93eb4e88 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:50:13 +0100
Subject: [PATCH 093/196] renamed var Rendering to const TotRendering

---
 assets/js/questions.js |  4 ++--
 assets/js/rendering.js | 48 +++++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index abaacfd..a6161c0 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -377,7 +377,7 @@ TotQuestions.start = () =>  {
     .removeClass('hidden');
   jQuery('.no-javascript-alert').addClass('hidden');
   //Navigation.disablePrevious();
-  Rendering.transitionTo(TotQuestions.first_question);
+  TotRendering.transitionTo(TotQuestions.first_question);
 };
 
 TotQuestions.transitionQuestion = (next_question) => {
@@ -395,7 +395,7 @@ TotQuestions.transitionQuestion = (next_question) => {
     if (question['pre']) {
       question.pre();
     }
-    Rendering.transitionTo(question);
+    TotRendering.transitionTo(question);
   }
 };
 
diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index a865af7..6bfbcaa 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -20,26 +20,26 @@
 // Rendering UI elements for input
 ////////////////////////////////////////////////////////////////////////////////
 
-let Rendering = {};
+const TotRendering = {};
 
 ////////////////////////////////////////////////////////////////////////////////
 // Sections
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.sections = [
+TotRendering.sections = [
   "",
   "First tell us a few things about the work",
   "Now, let’s find out whether the work is eligible for termination",
   "Information about the work",
 ];
 
-Rendering.currentSection = 0;
+TotRendering.currentSection = 0;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Template basics
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.questionTemplate =
+TotRendering.questionTemplate =
   '\
 <form class="question-form">\
   <div class="form-group">\
@@ -48,16 +48,16 @@ Rendering.questionTemplate =
   </div>\
 </form>';
 
-Rendering.createQuestion = () => {
-  return jQuery(Rendering.questionTemplate);
+TotRendering.createQuestion = () => {
+  return jQuery(TotRendering.questionTemplate);
 };
 
-Rendering.common = (config) => {
-  let question = Rendering.createQuestion();
+TotRendering.common = (config) => {
+  let question = TotRendering.createQuestion();
   // If this is a question in a different section, change the section header
   // Section is 1-based, so we can use a simple logical and here.
-  if (config.section && config.section != Rendering.currentSection) {
-    jQuery("#section-title").html(Rendering.sections[config.section]).fadeIn();
+  if (config.section && config.section != TotRendering.currentSection) {
+    jQuery("#section-title").html(TotRendering.sections[config.section]).fadeIn();
   }
   question.find(".question-label").html(config.question);
   if (config.explanation) {
@@ -79,8 +79,8 @@ Rendering.common = (config) => {
 // Multiple choice questions (radio buttons)
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.radio = (config) => {
-  let question = Rendering.common(config);
+TotRendering.radio = (config) => {
+  let question = TotRendering.common(config);
   let form_group = question.find(".form-group");
   let name = `input ${config.variable}`;
   // If we are returning to this via the back button, get the previous value
@@ -107,7 +107,7 @@ Rendering.radio = (config) => {
 // Text input
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.makeTextLengthHandler = (element, min_length, optional) => {
+TotRendering.makeTextLengthHandler = (element, min_length, optional) => {
   return () => {
     let length = element.val().length;
     if ((optional && length == 0) || length >= min_length) {
@@ -118,8 +118,8 @@ Rendering.makeTextLengthHandler = (element, min_length, optional) => {
   };
 };
 
-Rendering.text = (config) => {
-  let question = Rendering.common(config);
+TotRendering.text = (config) => {
+  let question = TotRendering.common(config);
   let form_group = question.find(".form-group");
   let name = "input-" + config.variable;
   let text_field = jQuery(`<input type="text" class="form-control text-question" id="${config.variable}" placeholder="${config.placeholder || ""}" >`
@@ -134,7 +134,7 @@ Rendering.text = (config) => {
   // Ensure next isn't enabled until enough characters are entered
   let min_length = config.min_length || 4;
   let text_field_element = question.find(".text-question");
-  let validator = Rendering.makeTextLengthHandler(
+  let validator = TotRendering.makeTextLengthHandler(
     text_field_element,
     min_length,
     config.optional
@@ -152,8 +152,8 @@ Rendering.text = (config) => {
 // Year input (text subtype)
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.year = (config) => {
-  let question = Rendering.text(config);
+TotRendering.year = (config) => {
+  let question = TotRendering.text(config);
   let text_field = question.find(".text-question");
   TotValidation.allowOnlyNumbers(text_field);
   text_field.prop("maxlength", 4);
@@ -165,26 +165,26 @@ Rendering.year = (config) => {
 // Render html UI from config specification
 ////////////////////////////////////////////////////////////////////////////////
 
-Rendering.render = (config) => {
+TotRendering.render = (config) => {
   let result = undefined;
   switch (config.input) {
     case "radio":
-      result = Rendering.radio(config);
+      result = TotRendering.radio(config);
       break;
     case "year":
-      result = Rendering.year(config);
+      result = TotRendering.year(config);
       break;
     case "text":
     // Fall through to default
     default:
-      result = Rendering.text(config);
+      result = TotRendering.text(config);
       break;
   }
   return result;
 };
 
-Rendering.transitionTo = (config) => {
-  let question = Rendering.render(config);
+TotRendering.transitionTo = (config) => {
+  let question = TotRendering.render(config);
   jQuery(".question-form").slideUp("fast", () => {
     jQuery(this).remove();
   });

From 36247b150eb75ff54fcfba42f4b5dc0da5bc4075 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:55:27 +0100
Subject: [PATCH 094/196] updated questions.js concatenated strings to es6
 literals

---
 assets/js/questions.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index a6161c0..b9565ae 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -146,8 +146,7 @@ TotQuestions.s1q1d = {
     return errors;
   },
   answerDisplayValue: () =>  {
-    return "Effective: " + TotValues.k_year + "<br/>User entered: "
-	   + TotValues.user_inputted_k_year;
+    return `Effective: ${TotValues.k_year} <br/>User entered:  ${TotValues.user_inputted_k_year}`;
   }
 };
 
@@ -281,8 +280,7 @@ TotQuestions.validateAnswer = () =>  {
   } else if (question.type == 'text') {
     // If the text has a minimum length, check it
     if (jQuery('.text-question').val().length < question.min_chars) {
-      result = 'Answer is too short, it must be at least '
-        + question.min_chars + 'characters';
+      result = `Answer is too short, it must be at least ${question.min_chars} characters`;
     }
   }
   // We don't worry about radio buttons

From f4417b0b15bc0de7aa1593b609ba20347bcf4058 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 08:56:01 +0100
Subject: [PATCH 095/196] used double quote

---
 assets/js/questions.js | 404 ++++++++++++++++++++++-------------------
 1 file changed, 221 insertions(+), 183 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index b9565ae..95f5db1 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -31,291 +31,316 @@ const TotQuestions = {};
 
 TotQuestions.s1q1a = {
   section: 1,
-  question: 'When was the work created?',
-  explanation:'The year in which a work was created can affect its copyright status and its treatment under U.S. copyright law. Most importantly, the tool is concerned with whether a worked was made before or after January 1, 1978, when the most recent overhaul of U.S. copyright went into effect.',   
-  variable: 'creation_year',
-  input: 'year',
-  pre: () =>  {
+  question: "When was the work created?",
+  explanation:
+    "The year in which a work was created can affect its copyright status and its treatment under U.S. copyright law. Most importantly, the tool is concerned with whether a worked was made before or after January 1, 1978, when the most recent overhaul of U.S. copyright went into effect.",
+  variable: "creation_year",
+  input: "year",
+  pre: () => {
     Navigation.disablePrevious();
     TotNotifications.displayAnswersHint();
   },
-  post: () =>  {
+  post: () => {
     TotNotifications.removeAnswersHint();
-  }
+  },
 };
 
 // Has the work been published?
 
 TotQuestions.s1q1b = {
-  question: 'Has the work been published?',
-  explanation:'Whether a work has been published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
-  variable: 'work_published',
-  input: 'radio',
-  pre: () =>  {
+  question: "Has the work been published?",
+  explanation:
+    'Whether a work has been published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
+  variable: "work_published",
+  input: "radio",
+  pre: () => {
     Navigation.enablePrevious();
-  }
+  },
 };
 
 // When was the work first published?
 
 TotQuestions.s1q1bi = {
-  variable: 'pub_year',
-  question: 'When was the work first published?',
-  explanation:'When a work was published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
-  input: 'year',
-  validate: () =>  {
-    return TotValidation.validDate()
-      || ((parseInt(jQuery('.text-question').val()) < TotValues.creation_year)
-          ? 'The publication year cannot be earlier than the creation year.'
-          : false);
-  }
-
+  variable: "pub_year",
+  question: "When was the work first published?",
+  explanation:
+    'When a work was published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
+  input: "year",
+  validate: () => {
+    return (
+      TotValidation.validDate() ||
+      (parseInt(jQuery(".text-question").val()) < TotValues.creation_year
+        ? "The publication year cannot be earlier than the creation year."
+        : false)
+    );
+  },
 };
 
 // When was the work first published under the grant?
 
-TotQuestions.s1q1bii =  {
+TotQuestions.s1q1bii = {
   section: 1,
-  question: 'When was the work first published under the grant?',
-  explanation:'When a work was first published under the grant (which may be different than the the date the work was published for the first time) can factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date">glossary</a>.',
-  variable: 'grant_pub_year',
-  input: 'year',
-  validate: () =>  {
+  question: "When was the work first published under the grant?",
+  explanation:
+    'When a work was first published under the grant (which may be different than the the date the work was published for the first time) can factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date">glossary</a>.',
+  variable: "grant_pub_year",
+  input: "year",
+  validate: () => {
     var errors = TotValidation.validDate();
     if (errors == false) {
-      var year = parseInt(jQuery('.text-question').val());
+      var year = parseInt(jQuery(".text-question").val());
       if (year < TotValues.creation_year) {
-        errors = 'Year of publication under grant cannot be earlier than year of creation.';
+        errors =
+          "Year of publication under grant cannot be earlier than year of creation.";
       } else if (year < TotValues.pub_year) {
-        errors = 'Year of publication under grant cannot be earlier than year of initial publication.';
+        errors =
+          "Year of publication under grant cannot be earlier than year of initial publication.";
       } /* else if (year < TotValues.k_year) {
         errors = 'Year of publication under grant cannot be earlier than year of grant.';
       }*/
     }
     return errors;
-  }
+  },
 };
 
-
 // Works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?
 
 TotQuestions.s1q1bi2 = {
-  question: 'Published works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?',
-  explanation:'For U.S. works published in certain years, U.S. law required that they feature a "copyright notice" in order to receive federal copyright protection. Whether or not the published version featured a copyright notice can affect the copyright status of these works.',	
-  variable: 'copyright_notice',
-  input: 'radio',
-  values: ['yes', 'no', 'maybe']
+  question:
+    "Published works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?",
+  explanation:
+    'For U.S. works published in certain years, U.S. law required that they feature a "copyright notice" in order to receive federal copyright protection. Whether or not the published version featured a copyright notice can affect the copyright status of these works.',
+  variable: "copyright_notice",
+  input: "radio",
+  values: ["yes", "no", "maybe"],
 };
 
 // Has the work been registered with the United State Copyright Office?
 
 TotQuestions.s1q1c = {
-  question: 'Has the work been registered with the United State Copyright Office?',
-  explanation:'Before 1989, registration was one of the ways authors could secure federal copyright in their work. Whether a work was registered can affect copyright status and the timing of termination right.',  
-  variable: 'work_registered',
-  input: 'radio',
-  values: ['yes', 'no'] //, "don't know"] GitHub issue #33
+  question:
+    "Has the work been registered with the United State Copyright Office?",
+  explanation:
+    "Before 1989, registration was one of the ways authors could secure federal copyright in their work. Whether a work was registered can affect copyright status and the timing of termination right.",
+  variable: "work_registered",
+  input: "radio",
+  values: ["yes", "no"], //, "don't know"] GitHub issue #33
 };
 
 // When was the work registered with the United States Copyright Office?
 
 TotQuestions.s1q1ci = {
-  question: 'When was the work registered with the United States Copyright Office?',
-  explanation:'Before 1989, registration was one of the ways authors could secure federal copyright in their work. When a work was registered can affect copyright status and the timing of termination right.',  
-  variable: 'reg_year',
-  input: 'year'
+  question:
+    "When was the work registered with the United States Copyright Office?",
+  explanation:
+    "Before 1989, registration was one of the ways authors could secure federal copyright in their work. When a work was registered can affect copyright status and the timing of termination right.",
+  variable: "reg_year",
+  input: "year",
 };
 
 // What is the date of the agreement or transfer? ...
 
 TotQuestions.s1q1d = {
-  question: 'What is the year of the agreement or transfer?',
-  explanation:'When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work\'s copyright transfer may be eligible for termination.',
-  variable: 'k_year',
-  input: 'year',
-  validate: () =>  {
+  question: "What is the year of the agreement or transfer?",
+  explanation:
+    "When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work's copyright transfer may be eligible for termination.",
+  variable: "k_year",
+  input: "year",
+  validate: () => {
     var errors = TotValidation.validDate();
     if (errors == false) {
-        // Stash the user-entered agreement year
-        TotValues.user_inputted_k_year = parseInt(jQuery('.text-question').val());
-        // If date is before the creation year, use the creation year instead
-        if (TotValues.user_inputted_k_year < TotValues.creation_year) {
-	  jQuery('.text-question').val(TotValues.creation_year);
-	}
+      // Stash the user-entered agreement year
+      TotValues.user_inputted_k_year = parseInt(jQuery(".text-question").val());
+      // If date is before the creation year, use the creation year instead
+      if (TotValues.user_inputted_k_year < TotValues.creation_year) {
+        jQuery(".text-question").val(TotValues.creation_year);
+      }
     }
     return errors;
   },
-  answerDisplayValue: () =>  {
+  answerDisplayValue: () => {
     return `Effective: ${TotValues.k_year} <br/>User entered:  ${TotValues.user_inputted_k_year}`;
-  }
+  },
 };
 
 // Did the agreement or transfer include the right of publication?
 
-TotQuestions.s1q1f =  {
+TotQuestions.s1q1f = {
   // Last question in section 1, so set this if we've arrived via back button
   section: 1,
-  question: 'Did the agreement or transfer include the right of publication?',
-  explanation:'If a <a href="/glossary/#agreement" target="_blank" title="Termination of Transfer: Glossary">transfer</a> from 1978 or later includes the right of <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">publication</a>, there is a different set of rules for determining when the transfer is eligible for termination.',	
-  variable: 'pub_right',
-  input: 'radio',
-  values: ['yes', 'no', 'maybe']
+  question: "Did the agreement or transfer include the right of publication?",
+  explanation:
+    'If a <a href="/glossary/#agreement" target="_blank" title="Termination of Transfer: Glossary">transfer</a> from 1978 or later includes the right of <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">publication</a>, there is a different set of rules for determining when the transfer is eligible for termination.',
+  variable: "pub_right",
+  input: "radio",
+  values: ["yes", "no", "maybe"],
 };
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // Section Two
 ////////////////////////////////////////////////////////////////////////////////
 
 // Is the agreement or transfer you want to terminate part of a last will...
 
-TotQuestions.s2q2a =  {
+TotQuestions.s2q2a = {
   // First question in section 2
   section: 2,
-  question: 'Is the agreement or transfer in question part of a <a href="/glossary/#will" target="_blank" title="Termination of Transfer: Glossary">last will and testament</a>?',
-  variable: 'last_will',
-  input: 'radio'
+  question:
+    'Is the agreement or transfer in question part of a <a href="/glossary/#will" target="_blank" title="Termination of Transfer: Glossary">last will and testament</a>?',
+  variable: "last_will",
+  input: "radio",
 };
 
 // Are any of the authors still alive?
 
 TotQuestions.s2q2bi = {
-  question: 'Are <i>any</i> of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors or artists</a> still alive?',
-  explanation:'The copyright term for many works is based on the life of the author.',
-  variable: 'any_authors_alive',
-  input: 'radio'
+  question:
+    'Are <i>any</i> of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors or artists</a> still alive?',
+  explanation:
+    "The copyright term for many works is based on the life of the author.",
+  variable: "any_authors_alive",
+  input: "radio",
 };
 
 // What is the year the last surviving author died?
 
 TotQuestions.s2q2bi2 = {
-  question: 'What is the year the last surviving <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author or artist</a> died?',
-  explanation:'The copyright term for many works is based on the life of the author.',
-  variable: 'death',
-  input: 'year'
+  question:
+    'What is the year the last surviving <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author or artist</a> died?',
+  explanation:
+    "The copyright term for many works is based on the life of the author.",
+  variable: "death",
+  input: "year",
 };
 
 // Was the work created within the scope of the author’s employment?
 
-TotQuestions.s2q2c =  {
-  question: 'Was the work created within the <a href="/glossary/#scope_of_employment" target="_blank" title="Termination of Transfer: Glossary">scope of the author’s employment</a>?',
-  variable: 'within_scope_of_employment',
-  input: 'radio'
+TotQuestions.s2q2c = {
+  question:
+    'Was the work created within the <a href="/glossary/#scope_of_employment" target="_blank" title="Termination of Transfer: Glossary">scope of the author’s employment</a>?',
+  variable: "within_scope_of_employment",
+  input: "radio",
 };
 
 // Was there an express agreement between the author and the author's employer to not treat the work as a work made for hire?
 
-TotQuestions.s2q2ci =  {
-  question: 'Was there an express agreement the author and the author\'s employer to not treat the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
-  variable: 'express_agreement',
-  input: 'radio'
+TotQuestions.s2q2ci = {
+  question:
+    'Was there an express agreement the author and the author\'s employer to not treat the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
+  variable: "express_agreement",
+  input: "radio",
 };
 
 // Was the work created in response to a special order or commission
 
-TotQuestions.s2q2d =  {
-  question: 'Was the work created in response to a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">special order or commission</a> by some other person or company?',
-  variable: 'special_order',
-  input: 'radio'
+TotQuestions.s2q2d = {
+  question:
+    'Was the work created in response to a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">special order or commission</a> by some other person or company?',
+  variable: "special_order",
+  input: "radio",
 };
 
 // Was there a signed written agreement regarding the special order...
 
-TotQuestions.s2q2di =  {
-  question: 'Was there a signed written agreement regarding the special order or commission which explicitly refers to the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
-  variable: 'signed_written_agreement',
-  input: 'radio'
+TotQuestions.s2q2di = {
+  question:
+    'Was there a signed written agreement regarding the special order or commission which explicitly refers to the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
+  variable: "signed_written_agreement",
+  input: "radio",
 };
 
 // Was the work created for use as one of the following? ...
 
 TotQuestions.s2q2dia = {
-  question: 'Was the work created for use as one of the following? — <ul><li>a contribution to a collective work; a part of a motion picture or other audiovisual work;</li> <li>a translation;</li> <li>a <a href="/glossary/#supplementary_work" title="Termination of Transfer: Glossary">supplementary work</a> (such as a foreword, afterword, table, editorial note, musical arrangement, bibliography, appendix, or index);</li> <li>a <a href="/glossary/#compilation" target="_blank" title="Termination of Transfer: Glossary">compilation</a>;</li> <li>an <a href="/glossary/#instructional_text" target="_blank" title="Termination of Transfer: Glossary">instructional text (text and/or graphics)</a>;</li> <li>a test or answer material for a test;</li> <li>or as an atlas?</li></ul?>',
-  variable: 'created_as_part_of_motion_picture',
-  input: 'radio',
-  values: ["yes", "no", "don't know"]
+  question:
+    'Was the work created for use as one of the following? — <ul><li>a contribution to a collective work; a part of a motion picture or other audiovisual work;</li> <li>a translation;</li> <li>a <a href="/glossary/#supplementary_work" title="Termination of Transfer: Glossary">supplementary work</a> (such as a foreword, afterword, table, editorial note, musical arrangement, bibliography, appendix, or index);</li> <li>a <a href="/glossary/#compilation" target="_blank" title="Termination of Transfer: Glossary">compilation</a>;</li> <li>an <a href="/glossary/#instructional_text" target="_blank" title="Termination of Transfer: Glossary">instructional text (text and/or graphics)</a>;</li> <li>a test or answer material for a test;</li> <li>or as an atlas?</li></ul?>',
+  variable: "created_as_part_of_motion_picture",
+  input: "radio",
+  values: ["yes", "no", "don't know"],
 };
 
 // Has the original transfer since been renegotiated or altered?
 
 TotQuestions.s2q2e = {
-  question: 'Has the original transfer since been renegotiated or altered?',
-  variable: 'renego',
-  input: 'radio',
-  values: ["yes", "no", "don't know"]
+  question: "Has the original transfer since been renegotiated or altered?",
+  variable: "renego",
+  input: "radio",
+  values: ["yes", "no", "don't know"],
 };
 
 // Did one or more of the authors or artists enter into the agreement...
 
-TotQuestions.s2q2f =  {
-  question: 'Did one or more of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors</a> enter into the agreement or transfer?',
-  variable: 'authors_entered_agreement',
-  input: 'radio'
+TotQuestions.s2q2f = {
+  question:
+    'Did one or more of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors</a> enter into the agreement or transfer?',
+  variable: "authors_entered_agreement",
+  input: "radio",
 };
 
 // s2q2fii is part of the rule for s2q2f
 
 // Was the agreement or transfer made by a member of...
 
-TotQuestions.s2q2fii =  {
+TotQuestions.s2q2fii = {
   // Last question in section 2, so set section if we're going back
   section: 2,
-  question: 'Was the agreement or transfer made by a member of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author\'s</a> immediate family, or by the executors?<br><i>For more information about which family members qualify, check out the FAQ.</i>',
-  variable: 'agreement_by_family_or_executor',
-  input: 'radio'
+  question:
+    'Was the agreement or transfer made by a member of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author\'s</a> immediate family, or by the executors?<br><i>For more information about which family members qualify, check out the FAQ.</i>',
+  variable: "agreement_by_family_or_executor",
+  input: "radio",
 };
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // Storing answers
 ////////////////////////////////////////////////////////////////////////////////
 
-TotQuestions.validateAnswer = () =>  {
+TotQuestions.validateAnswer = () => {
   var result = false;
   var question = TotQuestions[TotQuestions.current_question];
-  if (question['validate']) {
+  if (question["validate"]) {
     result = question.validate();
-  } else if (question.type == 'year') {
+  } else if (question.type == "year") {
     result = TotValidation.validDate();
-  } else if (question.type == 'text') {
+  } else if (question.type == "text") {
     // If the text has a minimum length, check it
-    if (jQuery('.text-question').val().length < question.min_chars) {
+    if (jQuery(".text-question").val().length < question.min_chars) {
       result = `Answer is too short, it must be at least ${question.min_chars} characters`;
     }
   }
   // We don't worry about radio buttons
-  return result
+  return result;
 };
 
-TotQuestions.getAnswer = () =>  {
+TotQuestions.getAnswer = () => {
   var question = TotQuestions[TotQuestions.current_question];
   var answer = undefined;
   switch (question.input) {
-  case 'radio':
-    answer = jQuery(':input[type="radio"]:checked').val();
-    break;
-  case 'year':
-    if ((question.optional != true)
-        || ((question.optional == true)
-	    && jQuery('.text-question').val() != '')) {
-      answer = parseInt(jQuery('.text-question').val());
-    }
-    break;
-  case 'year_or_empty':
-    if (jQuery('.text-question').val() != '') {
-      answer = parseInt(jQuery('.text-question').val());
-    }
-    break;
-  case 'text':
+    case "radio":
+      answer = jQuery(':input[type="radio"]:checked').val();
+      break;
+    case "year":
+      if (
+        question.optional != true ||
+        (question.optional == true && jQuery(".text-question").val() != "")
+      ) {
+        answer = parseInt(jQuery(".text-question").val());
+      }
+      break;
+    case "year_or_empty":
+      if (jQuery(".text-question").val() != "") {
+        answer = parseInt(jQuery(".text-question").val());
+      }
+      break;
+    case "text":
     // Fall through to default
-  default:
-    answer = jQuery('.text-question').val();
-    break;
+    default:
+      answer = jQuery(".text-question").val();
+      break;
   }
   return answer;
 };
 
-TotQuestions.processAnswer = () =>  {
+TotQuestions.processAnswer = () => {
   var result = false;
   var warnings = TotQuestions.validateAnswer();
   if (warnings === false) {
@@ -325,8 +350,9 @@ TotQuestions.processAnswer = () =>  {
     // FIXME: handle converting radio buttons to correct store values
     //        while recording their label in the answers table
     if (answer) {
-      answer = (question.answerDisplayValue && question.answerDisplayValue())
-	       || answer;
+      answer =
+        (question.answerDisplayValue && question.answerDisplayValue()) ||
+        answer;
       TotAnswers.appendAnswer(question.variable, question.question, answer);
     }
     TotNotifications.clearAlerts();
@@ -346,20 +372,23 @@ TotQuestions.resultMap = undefined;
 // Asynchronous fetch of data that is accessed synchronously.
 // This data won't be used until after several questions, so this is tolerable.
 
-jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/assets/js/questions.js']")
-               .attr('src').replace(/questions\.js.*$/, '')
-               + 'results.json')
-    .done( (result) => {
-        resultMap = result;
-    })
-    .fail( (jqxhr, textStatus, error) => {
-      var err = textStatus + ", " + error;
-      console.log("Request Failed: " + err);
-    });
+jQuery
+  .getJSON(
+    jQuery("script[src*='/termination-of-transfer/assets/js/questions.js']")
+      .attr("src")
+      .replace(/questions\.js.*$/, "") + "results.json"
+  )
+  .done((result) => {
+    resultMap = result;
+  })
+  .fail((jqxhr, textStatus, error) => {
+    var err = textStatus + ", " + error;
+    console.log("Request Failed: " + err);
+  });
 
 TotQuestions.getConclusionDetails = (specifier) => {
-  var path = specifier.split('.');
-  var result = resultMap['Conclusion'][path[0]][path[1]];
+  var path = specifier.split(".");
+  var result = resultMap["Conclusion"][path[0]][path[1]];
   return result;
 };
 
@@ -367,13 +396,14 @@ TotQuestions.getConclusionDetails = (specifier) => {
 // Flow of control
 ////////////////////////////////////////////////////////////////////////////////
 
-TotQuestions.first_question = 's1q1a';
-TotQuestions.last_question = 's2q2fii';
+TotQuestions.first_question = "s1q1a";
+TotQuestions.last_question = "s2q2fii";
 
-TotQuestions.start = () =>  {
-  jQuery('.questionnaire-section, .question-progress-buttons')
-    .removeClass('hidden');
-  jQuery('.no-javascript-alert').addClass('hidden');
+TotQuestions.start = () => {
+  jQuery(".questionnaire-section, .question-progress-buttons").removeClass(
+    "hidden"
+  );
+  jQuery(".no-javascript-alert").addClass("hidden");
   //Navigation.disablePrevious();
   TotRendering.transitionTo(TotQuestions.first_question);
 };
@@ -381,26 +411,26 @@ TotQuestions.start = () =>  {
 TotQuestions.transitionQuestion = (next_question) => {
   var previous_question = TotQuestions[TotQuestions.current_question];
   if (previous_question) {
-    if(previous_question.post) {
+    if (previous_question.post) {
       previous_question.post();
     }
   }
-  if (next_question == 'finish') {
+  if (next_question == "finish") {
     TotQuestions.finish();
   } else {
     TotQuestions.current_question = next_question;
     var question = TotQuestions[TotQuestions.current_question];
-    if (question['pre']) {
+    if (question["pre"]) {
       question.pre();
     }
     TotRendering.transitionTo(question);
   }
 };
 
-TotQuestions.nextQuestionID = () =>  {
+TotQuestions.nextQuestionID = () => {
   var next_question = TotQuestions.current_question;
   var rule = TotRules[TotQuestions.current_question];
-  if (typeof rule == 'function') {
+  if (typeof rule == "function") {
     next_question = rule();
   } else {
     next_question = rule;
@@ -408,26 +438,30 @@ TotQuestions.nextQuestionID = () =>  {
   return next_question;
 };
 
-TotQuestions.nextQuestion = () =>  {
+TotQuestions.nextQuestion = () => {
   // If the answer was OK, move on
   if (TotQuestions.processAnswer()) {
     ValuesStack.push();
     var id = TotQuestions.nextQuestionID();
     TotValues.question_id = id;
-    if (id == 'finish') {
+    if (id == "finish") {
       TotQuestions.finish();
     } else {
       TotQuestions.transitionQuestion(TotValues.question_id);
       // Scroll down to make sure the input UI is visible
-      jQuery('html,body').animate({
-        scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
+      jQuery("html,body").animate(
+        {
+          scrollTop: jQuery("#button-question-next").offset().top,
+        },
+        "slow"
+      );
     }
   }
 };
 
-TotQuestions.previousQuestion = () =>  {
+TotQuestions.previousQuestion = () => {
   // If we are going back from *after* the last question, re-enable UI
-  if (TotValues.question_id == 'finish') {
+  if (TotValues.question_id == "finish") {
     Navigation.unfinishQuestions();
   }
   // Don't pop past the very first item
@@ -440,32 +474,36 @@ TotQuestions.previousQuestion = () =>  {
     var previous_question = TotQuestions[TotValues.question_id];
     TotAnswers.removeAnswer(previous_question.variable);
     // Scroll down to make sure the input UI is visible
-    jQuery('html,body').animate({
-      scrollTop: jQuery('#button-question-next').offset().top}, 'slow');
+    jQuery("html,body").animate(
+      {
+        scrollTop: jQuery("#button-question-next").offset().top,
+      },
+      "slow"
+    );
   }
 };
 
-TotQuestions.finish = () =>  {
+TotQuestions.finish = () => {
   var obj = TotQuestions.getConclusionDetails(TotValues.conclusion);
   TotValues.termination_type = obj.title;
-  TotNotifications.setResultAreaMessage(obj, 'panel-success');
+  TotNotifications.setResultAreaMessage(obj, "panel-success");
   Navigation.finishQuestions();
   if (TotValues.conclusion_generate_pdf) {
     PDF.request();
   }
 };
 
-TotQuestions.start = () =>  {
+TotQuestions.start = () => {
   TotValues.reset();
   Navigation.showQuestions();
   Navigation.showAnswersTable();
   Navigation.showNextPrevious();
-  jQuery('#button-question-next').click(TotQuestions.nextQuestion);
-  jQuery('#button-question-back').click(TotQuestions.previousQuestion);
+  jQuery("#button-question-next").click(TotQuestions.nextQuestion);
+  jQuery("#button-question-back").click(TotQuestions.previousQuestion);
   // When the user presses "return" in a text area, move to next question
-  jQuery('#question-rendering-area').on('submit', () =>  {
-    if (jQuery('#button-question-next').is(':enabled')) {
-      jQuery('#button-question-next').click();
+  jQuery("#question-rendering-area").on("submit", () => {
+    if (jQuery("#button-question-next").is(":enabled")) {
+      jQuery("#button-question-next").click();
     }
     return false;
   });
@@ -473,6 +511,6 @@ TotQuestions.start = () =>  {
   TotValues.question_id = TotQuestions.first_question;
 };
 
-jQuery( document ).ready(() =>  {
+jQuery(document).ready(() => {
   TotQuestions.start();
 });

From 9688f9929f190f1c61efe66bf52e8b01ee840d8f Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:01:26 +0100
Subject: [PATCH 096/196] renamed var PDF to const TotPdf

---
 assets/js/pdf.js       | 48 +++++++++++++++++++++---------------------
 assets/js/questions.js |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index af650b2..6932ad9 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -21,19 +21,19 @@
 // (browser-side data preparation and call to server)
 ////////////////////////////////////////////////////////////////////////////////
 
-var PDF = {};
+const TotPdf = {};
 
-PDF.url = jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
+TotPdf.url = jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
 	       .attr('src').replace(/assets\/js\/pdf\.js.*$/, '')
 	       + 'src/ResultPdf.php';
 
-PDF.appendProperty = (details, key, value) => {
+TotPdf.appendProperty = (details, key, value) => {
   var mapping = {key: key,
                  value: value};
   details.push(mapping);
 };
 
-PDF.append203Windows = (details)=> {
+TotPdf.append203Windows = (details)=> {
   var notice = '';
   var termination = '';
 
@@ -51,59 +51,59 @@ PDF.append203Windows = (details)=> {
     termination += TotValues.p_term_begin + '-' + TotValues.p_term_end;
   }
 
-  PDF.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>', notice);
-  PDF.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>', termination);
+  TotPdf.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>', notice);
+  TotPdf.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>', termination);
 };
 
-PDF.append304Windows = (details) => {
-  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
+TotPdf.append304Windows = (details) => {
+  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
                      TotValues.notice_begin);
-  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
+  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
                      TotValues.notice_end);
-  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
+  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
                      TotValues.term_begin);
-  PDF.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
+  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
                      TotValues.term_end);
   if (TotValues.d_notice_begin != undefined) {
-    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
+    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
                        TotValues.d_notice_begin);
-    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
+    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
                        TotValues.d_notice_end);
-    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
+    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
                        TotValues.d_term_begin);
-    PDF.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
+    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
                        TotValues.d_term_end);
   }
 };
 
-PDF.appendWindows = (details) => {
+TotPdf.appendWindows = (details) => {
   if (TotRules.is203()) {
-    PDF.append203Windows(details);
+    TotPdf.append203Windows(details);
   } else if (TotRules.is304()) {
-    PDF.append304Windows(details);
+    TotPdf.append304Windows(details);
   }
 };
 
-PDF.details = () =>  {
+TotPdf.details = () =>  {
   var details = [];
   Object.getOwnPropertyNames(totVarsToTitles).forEach( (key) => {
     if ((TotValues[key] != undefined)
         && (TotValues[key] != '')) {
-      PDF.appendProperty(details, totVarsToTitles[key], TotValues[key]);
+      TotPdf.appendProperty(details, totVarsToTitles[key], TotValues[key]);
     }
   });
-  PDF.appendWindows(details);
+  TotPdf.appendWindows(details);
   return details;
 };
 
-PDF.request = () =>  {
+TotPdf.request = () =>  {
   var data = {report_timestamp: TotValues.current_date.getTime()/1000,
               flags: TotValues.flags.sort(), // Sorts inline & returns, so OK here
               conclusion: TotValues.conclusion,
-              details: PDF.details(),
+              details: TotPdf.details(),
              };
   var totform = document.createElement("FORM");
-  totform.setAttribute("action", PDF.url);
+  totform.setAttribute("action", TotPdf.url);
   totform.setAttribute("method", "post");
   totform.setAttribute("enctype", "multipart/form-data");
   totform.setAttribute("target", "_blank");
diff --git a/assets/js/questions.js b/assets/js/questions.js
index 95f5db1..f12c6f0 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -489,7 +489,7 @@ TotQuestions.finish = () => {
   TotNotifications.setResultAreaMessage(obj, "panel-success");
   Navigation.finishQuestions();
   if (TotValues.conclusion_generate_pdf) {
-    PDF.request();
+    TotPdf.request();
   }
 };
 

From b5f43f0324dedff11063dd494ba9dc065de7b142 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:07:35 +0100
Subject: [PATCH 097/196] updated pdf.js concatenated strings to es6 literals

---
 assets/js/pdf.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index 6932ad9..5773fe3 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -23,9 +23,8 @@
 
 const TotPdf = {};
 
-TotPdf.url = jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
-	       .attr('src').replace(/assets\/js\/pdf\.js.*$/, '')
-	       + 'src/ResultPdf.php';
+TotPdf.url = `${jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
+.attr('src').replace(/assets\/js\/pdf\.js.*$/, '')}src/ResultPdf.php`;
 
 TotPdf.appendProperty = (details, key, value) => {
   var mapping = {key: key,
@@ -38,8 +37,8 @@ TotPdf.append203Windows = (details)=> {
   var termination = '';
 
   if (TotValues.notice_begin != undefined) {
-    notice += TotValues.notice_begin + '-' + TotValues.notice_end;
-    termination += TotValues.term_begin + '-' + TotValues.term_end
+    notice += `${TotValues.notice_begin}-${TotValues.notice_end}`;
+    termination += `${TotValues.term_begin}-${TotValues.term_end}`
   }
 
   if (TotValues.p_term_begin != undefined) {
@@ -47,8 +46,8 @@ TotPdf.append203Windows = (details)=> {
       notice += ' or ';
       termination += ' or ';
     }
-    notice += TotValues.p_notice_begin + '-' + TotValues.p_notice_end;
-    termination += TotValues.p_term_begin + '-' + TotValues.p_term_end;
+    notice += `${TotValues.p_notice_begin}-${TotValues.p_notice_end}`;
+    termination += `${TotValues.p_term_begin}-${TotValues.p_term_end}`;
   }
 
   TotPdf.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>', notice);

From e028d8f4f7806ed1c677803f55aa50d482dee2b1 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:08:31 +0100
Subject: [PATCH 098/196] updated var to let

---
 assets/js/pdf.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index 5773fe3..6fb8d6c 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -27,14 +27,14 @@ TotPdf.url = `${jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']
 .attr('src').replace(/assets\/js\/pdf\.js.*$/, '')}src/ResultPdf.php`;
 
 TotPdf.appendProperty = (details, key, value) => {
-  var mapping = {key: key,
+  let mapping = {key: key,
                  value: value};
   details.push(mapping);
 };
 
 TotPdf.append203Windows = (details)=> {
-  var notice = '';
-  var termination = '';
+  let notice = '';
+  let termination = '';
 
   if (TotValues.notice_begin != undefined) {
     notice += `${TotValues.notice_begin}-${TotValues.notice_end}`;
@@ -84,7 +84,7 @@ TotPdf.appendWindows = (details) => {
 };
 
 TotPdf.details = () =>  {
-  var details = [];
+  let details = [];
   Object.getOwnPropertyNames(totVarsToTitles).forEach( (key) => {
     if ((TotValues[key] != undefined)
         && (TotValues[key] != '')) {
@@ -96,17 +96,17 @@ TotPdf.details = () =>  {
 };
 
 TotPdf.request = () =>  {
-  var data = {report_timestamp: TotValues.current_date.getTime()/1000,
+  let data = {report_timestamp: TotValues.current_date.getTime()/1000,
               flags: TotValues.flags.sort(), // Sorts inline & returns, so OK here
               conclusion: TotValues.conclusion,
               details: TotPdf.details(),
              };
-  var totform = document.createElement("FORM");
+  let totform = document.createElement("FORM");
   totform.setAttribute("action", TotPdf.url);
   totform.setAttribute("method", "post");
   totform.setAttribute("enctype", "multipart/form-data");
   totform.setAttribute("target", "_blank");
-  var data_field = document.createElement("INPUT");
+  let data_field = document.createElement("INPUT");
   data_field.setAttribute("type", "hidden");
   data_field.setAttribute("name", "data");
   data_field.setAttribute("value", JSON.stringify(data));

From 250866b871e2e26350ce8fdae07b22777ceb1239 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:08:51 +0100
Subject: [PATCH 099/196] used double quote

---
 assets/js/pdf.js | 114 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 74 insertions(+), 40 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index 6fb8d6c..a39ada0 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -23,55 +23,89 @@
 
 const TotPdf = {};
 
-TotPdf.url = `${jQuery("script[src*='/termination-of-transfer/assets/js/pdf.js']")
-.attr('src').replace(/assets\/js\/pdf\.js.*$/, '')}src/ResultPdf.php`;
+TotPdf.url = `${jQuery(
+  "script[src*='/termination-of-transfer/assets/js/pdf.js']"
+)
+  .attr("src")
+  .replace(/assets\/js\/pdf\.js.*$/, "")}src/ResultPdf.php`;
 
 TotPdf.appendProperty = (details, key, value) => {
-  let mapping = {key: key,
-                 value: value};
+  let mapping = { key: key, value: value };
   details.push(mapping);
 };
 
-TotPdf.append203Windows = (details)=> {
-  let notice = '';
-  let termination = '';
+TotPdf.append203Windows = (details) => {
+  let notice = "";
+  let termination = "";
 
   if (TotValues.notice_begin != undefined) {
     notice += `${TotValues.notice_begin}-${TotValues.notice_end}`;
-    termination += `${TotValues.term_begin}-${TotValues.term_end}`
+    termination += `${TotValues.term_begin}-${TotValues.term_end}`;
   }
 
   if (TotValues.p_term_begin != undefined) {
-    if (notice != '') {
-      notice += ' or ';
-      termination += ' or ';
+    if (notice != "") {
+      notice += " or ";
+      termination += " or ";
     }
     notice += `${TotValues.p_notice_begin}-${TotValues.p_notice_end}`;
     termination += `${TotValues.p_term_begin}-${TotValues.p_term_end}`;
   }
 
-  TotPdf.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>', notice);
-  TotPdf.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>', termination);
+  TotPdf.appendProperty(
+    details,
+    '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>',
+    notice
+  );
+  TotPdf.appendProperty(
+    details,
+    '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>',
+    termination
+  );
 };
 
 TotPdf.append304Windows = (details) => {
-  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
-                     TotValues.notice_begin);
-  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
-                     TotValues.notice_end);
-  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
-                     TotValues.term_begin);
-  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
-                     TotValues.term_end);
+  TotPdf.appendProperty(
+    details,
+    '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
+    TotValues.notice_begin
+  );
+  TotPdf.appendProperty(
+    details,
+    '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
+    TotValues.notice_end
+  );
+  TotPdf.appendProperty(
+    details,
+    '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
+    TotValues.term_begin
+  );
+  TotPdf.appendProperty(
+    details,
+    '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
+    TotValues.term_end
+  );
   if (TotValues.d_notice_begin != undefined) {
-    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
-                       TotValues.d_notice_begin);
-    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
-                       TotValues.d_notice_end);
-    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
-                       TotValues.d_term_begin);
-    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
-                       TotValues.d_term_end);
+    TotPdf.appendProperty(
+      details,
+      '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
+      TotValues.d_notice_begin
+    );
+    TotPdf.appendProperty(
+      details,
+      '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
+      TotValues.d_notice_end
+    );
+    TotPdf.appendProperty(
+      details,
+      '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
+      TotValues.d_term_begin
+    );
+    TotPdf.appendProperty(
+      details,
+      '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
+      TotValues.d_term_end
+    );
   }
 };
 
@@ -83,11 +117,10 @@ TotPdf.appendWindows = (details) => {
   }
 };
 
-TotPdf.details = () =>  {
+TotPdf.details = () => {
   let details = [];
-  Object.getOwnPropertyNames(totVarsToTitles).forEach( (key) => {
-    if ((TotValues[key] != undefined)
-        && (TotValues[key] != '')) {
+  Object.getOwnPropertyNames(totVarsToTitles).forEach((key) => {
+    if (TotValues[key] != undefined && TotValues[key] != "") {
       TotPdf.appendProperty(details, totVarsToTitles[key], TotValues[key]);
     }
   });
@@ -95,12 +128,13 @@ TotPdf.details = () =>  {
   return details;
 };
 
-TotPdf.request = () =>  {
-  let data = {report_timestamp: TotValues.current_date.getTime()/1000,
-              flags: TotValues.flags.sort(), // Sorts inline & returns, so OK here
-              conclusion: TotValues.conclusion,
-              details: TotPdf.details(),
-             };
+TotPdf.request = () => {
+  let data = {
+    report_timestamp: TotValues.current_date.getTime() / 1000,
+    flags: TotValues.flags.sort(), // Sorts inline & returns, so OK here
+    conclusion: TotValues.conclusion,
+    details: TotPdf.details(),
+  };
   let totform = document.createElement("FORM");
   totform.setAttribute("action", TotPdf.url);
   totform.setAttribute("method", "post");
@@ -111,6 +145,6 @@ TotPdf.request = () =>  {
   data_field.setAttribute("name", "data");
   data_field.setAttribute("value", JSON.stringify(data));
   totform.appendChild(data_field);
-  jQuery('body').append(totform);
+  jQuery("body").append(totform);
   totform.submit();
 };

From dff5a49164ae690f5b16b2c413d6a69ed3d96986 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:14:31 +0100
Subject: [PATCH 100/196] renamedconst TotValues to let TotValue to enable
 reassingment in reset method

---
 assets/js/values.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/values.js b/assets/js/values.js
index 656cbad..182b469 100644
--- a/assets/js/values.js
+++ b/assets/js/values.js
@@ -22,7 +22,7 @@
 // Rules consult these values and add their own.
 ////////////////////////////////////////////////////////////////////////////////
 
-const TotValues = {};
+let TotValues = {};
 
 TotValues.reset = () => {
   let now = new Date();

From 24f88ca8b78e500152dc4f227735692e597475a6 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:22:21 +0100
Subject: [PATCH 101/196] fixed undefined this by changing it ti ValueStack
 since it is called in an arrow function

---
 assets/js/values.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/values.js b/assets/js/values.js
index 182b469..485b3aa 100644
--- a/assets/js/values.js
+++ b/assets/js/values.js
@@ -57,18 +57,18 @@ let ValuesStack = {};
 ValuesStack._stack = [];
 
 ValuesStack.height = () => {
-  return this._stack.length;
+  return ValuesStack._stack.length;
 };
 
 ValuesStack.push = () => {
   // Handle the date not liking being serialized.
   let now = TotValues.current_date;
-  this._stack.push(TotValues);
+  ValuesStack._stack.push(TotValues);
   // Deep clone
   TotValues = JSON.parse(JSON.stringify(TotValues));
   TotValues.current_date = now;
 };
 
 ValuesStack.pop = () => {
-  TotValues = this._stack.pop();
+  TotValues = ValuesStack._stack.pop();
 };

From a045b64028c8fdfec110446729f72511ed1ec2e5 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:31:19 +0100
Subject: [PATCH 102/196] updated rendering option

---
 assets/js/rendering.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 6bfbcaa..e897f69 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -87,11 +87,10 @@ TotRendering.radio = (config) => {
   let existing_value = TotValues[config.variable];
   let radio_button_values = config.values || ["yes", "no"];
   radio_button_values.forEach((value) => {
-    let checked = false
+    let radio_button = `<label class="radio-inline"><input type="radio" name=${name} value="${value}">${value}</label>`
     if (value == existing_value) {
-      checked = 'checked';
+      radio_button = `<label class="radio-inline"><input type="radio" name=${name} checked="${checked}" value="${value}">${value}</label>`
     }
-    let radio_button = `<label class="radio-inline"><input type="radio" name=${name} checked="${checked}" value="${value}">${value}</label>`
 
     form_group.append(jQuery(radio_button));
   });

From 1ac9d4235a140f3a722e72734d4cd53fb362b98a Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:33:35 +0100
Subject: [PATCH 103/196] fixed rendering  undefined check

---
 assets/js/rendering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index e897f69..897d9c8 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -89,7 +89,7 @@ TotRendering.radio = (config) => {
   radio_button_values.forEach((value) => {
     let radio_button = `<label class="radio-inline"><input type="radio" name=${name} value="${value}">${value}</label>`
     if (value == existing_value) {
-      radio_button = `<label class="radio-inline"><input type="radio" name=${name} checked="${checked}" value="${value}">${value}</label>`
+      radio_button = `<label class="radio-inline"><input type="radio" name=${name} checked="checked" value="${value}">${value}</label>`
     }
 
     form_group.append(jQuery(radio_button));

From 4a375dae9f93d33c6ab1ea47f5d15d952bb4e47d Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:39:35 +0100
Subject: [PATCH 104/196] renamed var Navigation to const TotNavigation

---
 assets/js/questions.js | 16 ++++++++--------
 assets/js/rendering.js | 10 +++++-----
 assets/js/widgets.js   | 32 ++++++++++++++++----------------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index f12c6f0..18fff1f 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -37,7 +37,7 @@ TotQuestions.s1q1a = {
   variable: "creation_year",
   input: "year",
   pre: () => {
-    Navigation.disablePrevious();
+    TotNavigation.disablePrevious();
     TotNotifications.displayAnswersHint();
   },
   post: () => {
@@ -54,7 +54,7 @@ TotQuestions.s1q1b = {
   variable: "work_published",
   input: "radio",
   pre: () => {
-    Navigation.enablePrevious();
+    TotNavigation.enablePrevious();
   },
 };
 
@@ -404,7 +404,7 @@ TotQuestions.start = () => {
     "hidden"
   );
   jQuery(".no-javascript-alert").addClass("hidden");
-  //Navigation.disablePrevious();
+  //TotNavigation.disablePrevious();
   TotRendering.transitionTo(TotQuestions.first_question);
 };
 
@@ -462,7 +462,7 @@ TotQuestions.nextQuestion = () => {
 TotQuestions.previousQuestion = () => {
   // If we are going back from *after* the last question, re-enable UI
   if (TotValues.question_id == "finish") {
-    Navigation.unfinishQuestions();
+    TotNavigation.unfinishQuestions();
   }
   // Don't pop past the very first item
   if (ValuesStack.height() > 0) {
@@ -487,7 +487,7 @@ TotQuestions.finish = () => {
   var obj = TotQuestions.getConclusionDetails(TotValues.conclusion);
   TotValues.termination_type = obj.title;
   TotNotifications.setResultAreaMessage(obj, "panel-success");
-  Navigation.finishQuestions();
+  TotNavigation.finishQuestions();
   if (TotValues.conclusion_generate_pdf) {
     TotPdf.request();
   }
@@ -495,9 +495,9 @@ TotQuestions.finish = () => {
 
 TotQuestions.start = () => {
   TotValues.reset();
-  Navigation.showQuestions();
-  Navigation.showAnswersTable();
-  Navigation.showNextPrevious();
+  TotNavigation.showQuestions();
+  TotNavigation.showAnswersTable();
+  TotNavigation.showNextPrevious();
   jQuery("#button-question-next").click(TotQuestions.nextQuestion);
   jQuery("#button-question-back").click(TotQuestions.previousQuestion);
   // When the user presses "return" in a text area, move to next question
diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 897d9c8..36afa0e 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -68,9 +68,9 @@ TotRendering.common = (config) => {
   // and this isn't an optional value
   // don't let the user continue until they enter a value here.
   if (TotValues[config.variable] === undefined && !config.optional) {
-    Navigation.disableNext();
+    TotNavigation.disableNext();
   } else {
-    Navigation.enableNext();
+    TotNavigation.enableNext();
   }
   return question;
 };
@@ -96,7 +96,7 @@ TotRendering.radio = (config) => {
   });
   // When the user makes a choice, go straight to the next question
   form_group.find(':input[type="radio"]').click(() => {
-    Navigation.enableNext();
+    TotNavigation.enableNext();
     jQuery("#button-question-next").click();
   });
   return question;
@@ -110,9 +110,9 @@ TotRendering.makeTextLengthHandler = (element, min_length, optional) => {
   return () => {
     let length = element.val().length;
     if ((optional && length == 0) || length >= min_length) {
-      Navigation.enableNext();
+      TotNavigation.enableNext();
     } else {
-      Navigation.disableNext();
+      TotNavigation.disableNext();
     }
   };
 };
diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 14d16ab..32e147f 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -99,63 +99,63 @@ TotNotifications.setResultAreaMessage = (obj, panelClass) => {
 // Navigation of questions
 ////////////////////////////////////////////////////////////////////////////////
 
-var Navigation = {};
+const TotNavigation = {};
 
-Navigation.progressStack = [];
+let.progressStack = [];
 
 // These return true so we can use them as "handlers" in simpleNextQuestion
 
-Navigation.disableNext = () => {
+let.disableNext = () => {
   jQuery("#button-question-next").prop("disabled", true);
   return true;
 };
 
-Navigation.disablePrevious = () => {
+TotNavigation.disablePrevious = () => {
   jQuery("#button-question-back").prop("disabled", true);
   return true;
 };
 
-Navigation.enableNext = () => {
+TotNavigation.enableNext = () => {
   jQuery("#button-question-next").prop("disabled", false);
   return true;
 };
 
-Navigation.enablePrevious = () => {
+TotNavigation.enablePrevious = () => {
   jQuery("#button-question-back").prop("disabled", false);
   return true;
 };
 
-Navigation.showNextPrevious = () => {
+TotNavigation.showNextPrevious = () => {
   jQuery("#question-progress-buttons").removeClass("hidden");
 };
 
-Navigation.hideQuestions = () => {
+TotNavigation.hideQuestions = () => {
   jQuery("#questionnaire-section").addClass("hidden");
   jQuery(".form-group").addClass("hidden");
 };
 
-Navigation.showQuestions = () => {
+TotNavigation.showQuestions = () => {
   jQuery("#questionnaire-section").removeClass("hidden");
   jQuery(".form-group").removeClass("hidden");
 };
 
-Navigation.hideNoJSWarning = () => {};
+TotNavigation.hideNoJSWarning = () => {};
 
-Navigation.showAnswersTable = () => {
+TotNavigation.showAnswersTable = () => {
   jQuery("#answers-table").removeClass("hidden");
 };
 
 // After this, do not restart the questionnaire, reload the page to restart
 
-Navigation.finishQuestions = () => {
-  Navigation.hideQuestions();
+TotNavigation.finishQuestions = () => {
+  TotNavigation.hideQuestions();
   TotNotifications.displayResultArea();
-  Navigation.disableNext();
+  TotNavigation.disableNext();
   jQuery("#button-restart").removeClass("hidden");
 };
 
-Navigation.unfinishQuestions = () => {
-  Navigation.showQuestions();
+TotNavigation.unfinishQuestions = () => {
+  TotNavigation.showQuestions();
   TotNotifications.hideResultArea();
   jQuery("#button-restart").addClass("hidden");
 };

From cb9eb18af3b253688951717f7f7a6fa1d38ee78d Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 09:41:02 +0100
Subject: [PATCH 105/196] fixed let. type to let

---
 assets/js/widgets.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 32e147f..4f24aa5 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -101,11 +101,11 @@ TotNotifications.setResultAreaMessage = (obj, panelClass) => {
 
 const TotNavigation = {};
 
-let.progressStack = [];
+let progressStack = [];
 
 // These return true so we can use them as "handlers" in simpleNextQuestion
 
-let.disableNext = () => {
+let disableNext = () => {
   jQuery("#button-question-next").prop("disabled", true);
   return true;
 };

From a2b975ebab12f80269069b90c8f36ae365020fea Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 10:00:03 +0100
Subject: [PATCH 106/196] install evince for test if not installed on machine

---
 test/result-pdf.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/result-pdf.sh b/test/result-pdf.sh
index e8b6f0b..4f74ce6 100644
--- a/test/result-pdf.sh
+++ b/test/result-pdf.sh
@@ -10,4 +10,7 @@ PORT=$1
 TMPFILE=$(mktemp /tmp/result-pdf-XXXXXX.pdf)
 echo $TMPFILE
 wget --post-data='data={"report_timestamp":1471297389, "conclusion": "A.i", "flags":["B.i", "B.ii"], "details":[{"key": "Title of Work", "value": "Untitled"}, {"key":"Published", "value": 1968}]}' -O $TMPFILE http://localhost:$PORT/result-pdf.php
+if [ ! command -v evince  &> /dev/null]; then
+    apt-get update && apt-get install evince -y
+fi
 evince $TMPFILE

From d5cb2073c7ba818118f55e590ba77431714d2cfc Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 10:06:32 +0100
Subject: [PATCH 107/196] updated test url

---
 test/result-pdf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/result-pdf.sh b/test/result-pdf.sh
index 4f74ce6..493210a 100644
--- a/test/result-pdf.sh
+++ b/test/result-pdf.sh
@@ -9,7 +9,7 @@ fi
 PORT=$1
 TMPFILE=$(mktemp /tmp/result-pdf-XXXXXX.pdf)
 echo $TMPFILE
-wget --post-data='data={"report_timestamp":1471297389, "conclusion": "A.i", "flags":["B.i", "B.ii"], "details":[{"key": "Title of Work", "value": "Untitled"}, {"key":"Published", "value": 1968}]}' -O $TMPFILE http://localhost:$PORT/result-pdf.php
+wget --post-data='data={"report_timestamp":1471297389, "conclusion": "A.i", "flags":["B.i", "B.ii"], "details":[{"key": "Title of Work", "value": "Untitled"}, {"key":"Published", "value": 1968}]}' -O $TMPFILE http://localhost:$PORT/wp-content/plugins/termination-of-transfer/src/ResultPdf.php
 if [ ! command -v evince  &> /dev/null]; then
     apt-get update && apt-get install evince -y
 fi

From f845a5e19a8fb8f0574d563600c945cc11abe706 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 10:11:10 +0100
Subject: [PATCH 108/196] created result-pdf.php to act as entry script for
 result generating since it will not be called from WordPress PHP codebase
 directly.

---
 pdf-result.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pdf-result.php

diff --git a/pdf-result.php b/pdf-result.php
new file mode 100644
index 0000000..e69de29

From cbf2081dd92d040a039ad17ec88b380d9e363ddf Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 10:12:20 +0100
Subject: [PATCH 109/196] removed the result initializing code

---
 src/ResultPdf.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/ResultPdf.php b/src/ResultPdf.php
index ec591b0..755dec2 100644
--- a/src/ResultPdf.php
+++ b/src/ResultPdf.php
@@ -151,7 +151,3 @@ public function generatePdf()
         return $mpdf->Output('ToT.pdf', 'I');
     }
 }
-
-$result = new ResultPdf();
-$result->init();
-return $result->generatePdf();

From 43d3a30a2e905d4b4e2639da9c9f24188262e2b8 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 10:13:44 +0100
Subject: [PATCH 110/196] added the result logic

---
 pdf-result.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pdf-result.php b/pdf-result.php
index e69de29..180c718 100644
--- a/pdf-result.php
+++ b/pdf-result.php
@@ -0,0 +1,26 @@
+<?php
+require_once plugin_dir_path(__FILE__) . 'vendor/autoload.php';
+
+use CreativeCommons_TOT\ResultPdf;
+
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016, 2017  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+$result = new ResultPdf();
+$result->init();
+return $result->generatePdf();

From 0acc8fbad56ad9472fc02418c0385331c9961938 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 14 Oct 2022 10:16:09 +0100
Subject: [PATCH 111/196] updated result url

---
 assets/js/pdf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index a39ada0..c7e6720 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -27,7 +27,7 @@ TotPdf.url = `${jQuery(
   "script[src*='/termination-of-transfer/assets/js/pdf.js']"
 )
   .attr("src")
-  .replace(/assets\/js\/pdf\.js.*$/, "")}src/ResultPdf.php`;
+  .replace(/assets\/js\/pdf\.js.*$/, "")}pdf-result.php`;
 
 TotPdf.appendProperty = (details, key, value) => {
   let mapping = { key: key, value: value };

From b2dfd529353c8149393faaded4bfb73bb4b50ec1 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 14 Oct 2022 13:19:37 +0100
Subject: [PATCH 112/196] refactor pdf result to a function to avoid any
 possible variable collision with other plugins

---
 pdf-result.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pdf-result.php b/pdf-result.php
index 180c718..5cdccbd 100644
--- a/pdf-result.php
+++ b/pdf-result.php
@@ -21,6 +21,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-$result = new ResultPdf();
-$result->init();
-return $result->generatePdf();
+function cc_tot_pdf_result() 
+{
+    $result = new ResultPdf();
+    $result->init();
+    return $result->generatePdf();
+}
+
+cc_tot_pdf_result();

From 772b6caa8b1bb92c53e12a950208caa1f631a719 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 14 Oct 2022 13:54:33 +0100
Subject: [PATCH 113/196] added uninstall.php to remove shortcode upon plugin
 uninstall

---
 uninstall.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 uninstall.php

diff --git a/uninstall.php b/uninstall.php
new file mode 100644
index 0000000..25c16c6
--- /dev/null
+++ b/uninstall.php
@@ -0,0 +1,28 @@
+<?php
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016, 2017  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// if uninstall.php is not called by WordPress, kill process
+if (!defined(WP_UNINSTALL_PLUGIN)) {
+    die;
+}
+
+// if the termination-of-transfer-tool shortcode exists, remove it
+if (shortcode_exists('termination-of-transfer-tool')) { 
+    remove_shortcode('termination-of-transfer-tool');
+}
\ No newline at end of file

From a803ba2f143947c5dc417f8736b6879b3936aab9 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Sat, 15 Oct 2022 08:40:54 +0100
Subject: [PATCH 114/196] added omiited shebang to composer-fix.sh used for
 development purpose in docker-compose.dev.yml

---
 composer-fix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/composer-fix.sh b/composer-fix.sh
index f3efecd..d44b993 100755
--- a/composer-fix.sh
+++ b/composer-fix.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -d /var/www/html/wp-content/plugins/termination-of-transfer ]; then
   
    # change directory

From 825461fcaef8e54287f6c2fcd2d9795ef8cc70f5 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Sat, 15 Oct 2022 08:46:10 +0100
Subject: [PATCH 115/196] updated test result url to reference pdf-result.php
 in plugin root directory

---
 test/result-pdf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/result-pdf.sh b/test/result-pdf.sh
index 493210a..86e8e0d 100644
--- a/test/result-pdf.sh
+++ b/test/result-pdf.sh
@@ -9,7 +9,7 @@ fi
 PORT=$1
 TMPFILE=$(mktemp /tmp/result-pdf-XXXXXX.pdf)
 echo $TMPFILE
-wget --post-data='data={"report_timestamp":1471297389, "conclusion": "A.i", "flags":["B.i", "B.ii"], "details":[{"key": "Title of Work", "value": "Untitled"}, {"key":"Published", "value": 1968}]}' -O $TMPFILE http://localhost:$PORT/wp-content/plugins/termination-of-transfer/src/ResultPdf.php
+wget --post-data='data={"report_timestamp":1471297389, "conclusion": "A.i", "flags":["B.i", "B.ii"], "details":[{"key": "Title of Work", "value": "Untitled"}, {"key":"Published", "value": 1968}]}' -O $TMPFILE http://localhost:$PORT/wp-content/plugins/termination-of-transfer/pdf-result.php
 if [ ! command -v evince  &> /dev/null]; then
     apt-get update && apt-get install evince -y
 fi

From a825d71dc448e3a340d7846bd267863f1ee929d2 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Sat, 15 Oct 2022 08:47:34 +0100
Subject: [PATCH 116/196] replace conditional install position

---
 test/result-pdf.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/result-pdf.sh b/test/result-pdf.sh
index 86e8e0d..2e697fa 100644
--- a/test/result-pdf.sh
+++ b/test/result-pdf.sh
@@ -6,11 +6,12 @@ if [ "$#" -ne 1 ]; then
     echo "Usage: result-pdf.sh [PORT NUMBER ON LOCALHOST]"
 fi
 
+if [ ! command -v evince  &> /dev/null]; then
+    apt-get update && apt-get install evince -y
+fi
+
 PORT=$1
 TMPFILE=$(mktemp /tmp/result-pdf-XXXXXX.pdf)
 echo $TMPFILE
 wget --post-data='data={"report_timestamp":1471297389, "conclusion": "A.i", "flags":["B.i", "B.ii"], "details":[{"key": "Title of Work", "value": "Untitled"}, {"key":"Published", "value": 1968}]}' -O $TMPFILE http://localhost:$PORT/wp-content/plugins/termination-of-transfer/pdf-result.php
-if [ ! command -v evince  &> /dev/null]; then
-    apt-get update && apt-get install evince -y
-fi
 evince $TMPFILE

From e6d31b7f5bd6658caa5a91be5d3509108d665c4a Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Sat, 15 Oct 2022 09:38:24 +0100
Subject: [PATCH 117/196] changed let to const where variables are not
 re-assined within their defined scope

---
 assets/js/pdf.js       |  8 ++++----
 assets/js/rendering.js | 36 ++++++++++++++++++------------------
 assets/js/values.js    |  4 ++--
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index c7e6720..dc8f2de 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -30,7 +30,7 @@ TotPdf.url = `${jQuery(
   .replace(/assets\/js\/pdf\.js.*$/, "")}pdf-result.php`;
 
 TotPdf.appendProperty = (details, key, value) => {
-  let mapping = { key: key, value: value };
+  const mapping = { key: key, value: value };
   details.push(mapping);
 };
 
@@ -129,18 +129,18 @@ TotPdf.details = () => {
 };
 
 TotPdf.request = () => {
-  let data = {
+  const data = {
     report_timestamp: TotValues.current_date.getTime() / 1000,
     flags: TotValues.flags.sort(), // Sorts inline & returns, so OK here
     conclusion: TotValues.conclusion,
     details: TotPdf.details(),
   };
-  let totform = document.createElement("FORM");
+  const totform = document.createElement("FORM");
   totform.setAttribute("action", TotPdf.url);
   totform.setAttribute("method", "post");
   totform.setAttribute("enctype", "multipart/form-data");
   totform.setAttribute("target", "_blank");
-  let data_field = document.createElement("INPUT");
+  const data_field = document.createElement("INPUT");
   data_field.setAttribute("type", "hidden");
   data_field.setAttribute("name", "data");
   data_field.setAttribute("value", JSON.stringify(data));
diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 36afa0e..5f6bc9a 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -53,7 +53,7 @@ TotRendering.createQuestion = () => {
 };
 
 TotRendering.common = (config) => {
-  let question = TotRendering.createQuestion();
+  const question = TotRendering.createQuestion();
   // If this is a question in a different section, change the section header
   // Section is 1-based, so we can use a simple logical and here.
   if (config.section && config.section != TotRendering.currentSection) {
@@ -80,11 +80,11 @@ TotRendering.common = (config) => {
 ////////////////////////////////////////////////////////////////////////////////
 
 TotRendering.radio = (config) => {
-  let question = TotRendering.common(config);
-  let form_group = question.find(".form-group");
-  let name = `input ${config.variable}`;
+  const question = TotRendering.common(config);
+  const form_group = question.find(".form-group");
+  const name = `input ${config.variable}`;
   // If we are returning to this via the back button, get the previous value
-  let existing_value = TotValues[config.variable];
+  const existing_value = TotValues[config.variable];
   let radio_button_values = config.values || ["yes", "no"];
   radio_button_values.forEach((value) => {
     let radio_button = `<label class="radio-inline"><input type="radio" name=${name} value="${value}">${value}</label>`
@@ -108,7 +108,7 @@ TotRendering.radio = (config) => {
 
 TotRendering.makeTextLengthHandler = (element, min_length, optional) => {
   return () => {
-    let length = element.val().length;
+    const length = element.val().length;
     if ((optional && length == 0) || length >= min_length) {
       TotNavigation.enableNext();
     } else {
@@ -118,22 +118,22 @@ TotRendering.makeTextLengthHandler = (element, min_length, optional) => {
 };
 
 TotRendering.text = (config) => {
-  let question = TotRendering.common(config);
-  let form_group = question.find(".form-group");
-  let name = "input-" + config.variable;
-  let text_field = jQuery(`<input type="text" class="form-control text-question" id="${config.variable}" placeholder="${config.placeholder || ""}" >`
+  const question = TotRendering.common(config);
+  const form_group = question.find(".form-group");
+  // const name = "input-" + config.variable;
+  const text_field = jQuery(`<input type="text" class="form-control text-question" id="${config.variable}" placeholder="${config.placeholder || ""}" >`
   );
   form_group.append(text_field);
   // Set the label
-  let label = question.find(".question-label").prop("for", name);
+  // const label = question.find(".question-label").prop("for", name);
   if (TotValues[config.variable]) {
     form_group.find("text-question").val(TotValues[config.variable]);
   }
-  let existing_value = TotValues[config.variable];
+  const existing_value = TotValues[config.variable];
   // Ensure next isn't enabled until enough characters are entered
-  let min_length = config.min_length || 4;
-  let text_field_element = question.find(".text-question");
-  let validator = TotRendering.makeTextLengthHandler(
+  const min_length = config.min_length || 4;
+  const text_field_element = question.find(".text-question");
+  const validator = TotRendering.makeTextLengthHandler(
     text_field_element,
     min_length,
     config.optional
@@ -152,8 +152,8 @@ TotRendering.text = (config) => {
 ////////////////////////////////////////////////////////////////////////////////
 
 TotRendering.year = (config) => {
-  let question = TotRendering.text(config);
-  let text_field = question.find(".text-question");
+  const question = TotRendering.text(config);
+  const text_field = question.find(".text-question");
   TotValidation.allowOnlyNumbers(text_field);
   text_field.prop("maxlength", 4);
   text_field.prop("placeholder", "1977");
@@ -183,7 +183,7 @@ TotRendering.render = (config) => {
 };
 
 TotRendering.transitionTo = (config) => {
-  let question = TotRendering.render(config);
+  const question = TotRendering.render(config);
   jQuery(".question-form").slideUp("fast", () => {
     jQuery(this).remove();
   });
diff --git a/assets/js/values.js b/assets/js/values.js
index 485b3aa..5f75684 100644
--- a/assets/js/values.js
+++ b/assets/js/values.js
@@ -25,7 +25,7 @@
 let TotValues = {};
 
 TotValues.reset = () => {
-  let now = new Date();
+  const now = new Date();
   TotValues = {
     current_date: now,
     current_year: now.getFullYear(),
@@ -62,7 +62,7 @@ ValuesStack.height = () => {
 
 ValuesStack.push = () => {
   // Handle the date not liking being serialized.
-  let now = TotValues.current_date;
+  const now = TotValues.current_date;
   ValuesStack._stack.push(TotValues);
   // Deep clone
   TotValues = JSON.parse(JSON.stringify(TotValues));

From 406a0b374a567ac7f21f9fc31fc651e44ae39175 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Sat, 15 Oct 2022 09:56:59 +0100
Subject: [PATCH 118/196] changed ommited var to const where not reassigned
 wthin scope

---
 assets/js/questions.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 18fff1f..867e29c 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -382,13 +382,13 @@ jQuery
     resultMap = result;
   })
   .fail((jqxhr, textStatus, error) => {
-    var err = textStatus + ", " + error;
+    const err = textStatus + ", " + error;
     console.log("Request Failed: " + err);
   });
 
 TotQuestions.getConclusionDetails = (specifier) => {
-  var path = specifier.split(".");
-  var result = resultMap["Conclusion"][path[0]][path[1]];
+  const path = specifier.split(".");
+  const result = resultMap["Conclusion"][path[0]][path[1]];
   return result;
 };
 
@@ -409,7 +409,7 @@ TotQuestions.start = () => {
 };
 
 TotQuestions.transitionQuestion = (next_question) => {
-  var previous_question = TotQuestions[TotQuestions.current_question];
+  const previous_question = TotQuestions[TotQuestions.current_question];
   if (previous_question) {
     if (previous_question.post) {
       previous_question.post();
@@ -419,7 +419,7 @@ TotQuestions.transitionQuestion = (next_question) => {
     TotQuestions.finish();
   } else {
     TotQuestions.current_question = next_question;
-    var question = TotQuestions[TotQuestions.current_question];
+    const question = TotQuestions[TotQuestions.current_question];
     if (question["pre"]) {
       question.pre();
     }
@@ -428,8 +428,8 @@ TotQuestions.transitionQuestion = (next_question) => {
 };
 
 TotQuestions.nextQuestionID = () => {
-  var next_question = TotQuestions.current_question;
-  var rule = TotRules[TotQuestions.current_question];
+  let next_question = TotQuestions.current_question;
+  const rule = TotRules[TotQuestions.current_question];
   if (typeof rule == "function") {
     next_question = rule();
   } else {
@@ -442,7 +442,7 @@ TotQuestions.nextQuestion = () => {
   // If the answer was OK, move on
   if (TotQuestions.processAnswer()) {
     ValuesStack.push();
-    var id = TotQuestions.nextQuestionID();
+    const id = TotQuestions.nextQuestionID();
     TotValues.question_id = id;
     if (id == "finish") {
       TotQuestions.finish();
@@ -471,7 +471,7 @@ TotQuestions.previousQuestion = () => {
     TotQuestions.transitionQuestion(TotValues.question_id);
     TotNotifications.clearAlerts();
     // Clear previous answer
-    var previous_question = TotQuestions[TotValues.question_id];
+    const previous_question = TotQuestions[TotValues.question_id];
     TotAnswers.removeAnswer(previous_question.variable);
     // Scroll down to make sure the input UI is visible
     jQuery("html,body").animate(
@@ -484,7 +484,7 @@ TotQuestions.previousQuestion = () => {
 };
 
 TotQuestions.finish = () => {
-  var obj = TotQuestions.getConclusionDetails(TotValues.conclusion);
+  const obj = TotQuestions.getConclusionDetails(TotValues.conclusion);
   TotValues.termination_type = obj.title;
   TotNotifications.setResultAreaMessage(obj, "panel-success");
   TotNavigation.finishQuestions();

From 4cb53a2e708f391cccd621662cdb6494eaa54be3 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Sat, 15 Oct 2022 10:00:44 +0100
Subject: [PATCH 119/196] fixed TotNavigation.disableNext is not a function

---
 assets/js/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 4f24aa5..eedb6af 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -105,7 +105,7 @@ let progressStack = [];
 
 // These return true so we can use them as "handlers" in simpleNextQuestion
 
-let disableNext = () => {
+TotNavigation.disableNext = () => {
   jQuery("#button-question-next").prop("disabled", true);
   return true;
 };

From 82af53d943a278fbd6296d7b2be5954c576aad1f Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Sat, 15 Oct 2022 10:22:55 +0100
Subject: [PATCH 120/196] added plugin_path property and assigned to
 plugin_dir_path(__DIR__) in _construct method

---
 src/ResultPdf.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ResultPdf.php b/src/ResultPdf.php
index 755dec2..97aaa7c 100644
--- a/src/ResultPdf.php
+++ b/src/ResultPdf.php
@@ -41,6 +41,9 @@ class ResultPdf
 
     protected $conclusion_description;
 
+    /**@var String path where the plugin is installed */
+    protected $plugin_path;
+
     public function __construct()
     {
         ////////////////////////////////////////////////////////////////////////////////
@@ -50,6 +53,7 @@ public function __construct()
         if (! isset($_POST['data'])) {
             exit('No data provided.');
         }
+        $this->plugin_path = plugin_dir_path(__DIR__);
     }
 
     public function init()
@@ -90,7 +94,7 @@ public function validate()
 
     public function flagTitleAndDescription ($spec)
     {
-        $results_json = file_get_contents(\dirname(__DIR__ ). '/js/results.json');
+        $results_json = file_get_contents($this->plugin_path. 'js/results.json');
         $this->results_strings = json_decode($results_json, true);
         $path = explode('.', $spec);
         // A, B, C, D
@@ -133,14 +137,14 @@ public function generatePdf()
         $now_timestamp = intval($this->data['report_timestamp']);
 
         $smarty = new Smarty;
-        $smarty->setCompileDir(\dirname(__DIR__) . '/../templates_c');
+        $smarty->setCompileDir($this->plugin_path . 'templates_c');
         $smarty->assign('date', date('jS F Y', $now_timestamp));
         $smarty->assign('flags', $this->flags);
         $smarty->assign('details', $this->data['details']);
         $smarty->assign('conclusion_title', $this->conclusion_title);
         $smarty->assign('conclusion_subtitle', $this->conclusion_subtitle);
         $smarty->assign('conclusion_description', $this->conclusion_description);
-        $html = $smarty->fetch(\dirname(__DIR__) . '/../template/result.tpl');
+        $html = $smarty->fetch($this->plugin_path . 'template/result.tpl');
 
         ////////////////////////////////////////////////////////////////////////////////
         // Generate and return the PDF

From 3250666a1e269b23a12729a06a01fff0c0c71d98 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Sat, 15 Oct 2022 10:25:23 +0100
Subject: [PATCH 121/196] aded ommited assets folder in result referenece

---
 src/ResultPdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ResultPdf.php b/src/ResultPdf.php
index 97aaa7c..366d789 100644
--- a/src/ResultPdf.php
+++ b/src/ResultPdf.php
@@ -94,7 +94,7 @@ public function validate()
 
     public function flagTitleAndDescription ($spec)
     {
-        $results_json = file_get_contents($this->plugin_path. 'js/results.json');
+        $results_json = file_get_contents($this->plugin_path. '/assets/js/results.json');
         $this->results_strings = json_decode($results_json, true);
         $path = explode('.', $spec);
         // A, B, C, D

From 80530324a96b6ec3673700f156f2f6746313af3c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Sun, 16 Oct 2022 17:52:07 +0100
Subject: [PATCH 122/196] Removed the leading slash in assets reference

Since plugin_dir_path will return a path with leading slash, referencing should start with assets and not /assets
---
 src/ResultPdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ResultPdf.php b/src/ResultPdf.php
index 366d789..006ba46 100644
--- a/src/ResultPdf.php
+++ b/src/ResultPdf.php
@@ -94,7 +94,7 @@ public function validate()
 
     public function flagTitleAndDescription ($spec)
     {
-        $results_json = file_get_contents($this->plugin_path. '/assets/js/results.json');
+        $results_json = file_get_contents($this->plugin_path. 'assets/js/results.json');
         $this->results_strings = json_decode($results_json, true);
         $path = explode('.', $spec);
         // A, B, C, D

From 66454e577408d9511b34fbdc94d603ad6efa4c28 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 17 Oct 2022 06:57:35 +0100
Subject: [PATCH 123/196] renamed ommited methods to camelCase

---
 src/TerminationOfTransfer.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/TerminationOfTransfer.php b/src/TerminationOfTransfer.php
index 1908d51..bae5c28 100644
--- a/src/TerminationOfTransfer.php
+++ b/src/TerminationOfTransfer.php
@@ -53,9 +53,9 @@ protected function registerStyles()
     public function run()
     {
         if ( ! version_compare( PHP_VERSION, '7.4', '>=' ) ) {
-            add_action( 'admin_notices', 'fail_php_version' );
+            add_action( 'admin_notices', 'failPhpVersion' );
         } elseif ( ! version_compare( get_bloginfo( 'version' ), '5.0', '>=' ) ) {
-            add_action( 'admin_notices', 'fail_wp_version' );
+            add_action( 'admin_notices', 'failWpVersion' );
         } else {
             add_shortcode( 'termination-of-transfer-tool', [$this, 'handleShortcode'] );
         }
@@ -81,7 +81,7 @@ public function handleShortcode( $atts = [] )
      *
      * @return void
      */
-    public function fail_php_version() {
+    public function failPhpVersion() {
         /* translators: %s: PHP version */
         $v = $this->data['version'];
         $n = $this->data['name'];
@@ -97,7 +97,7 @@ public function fail_php_version() {
      *
      * @return void
      */
-    public function fail_wp_version() {
+    public function failWpVersion() {
         /* translators: %s: WordPress version */
         $v = $this->data['version'];
         $n = $this->data['name'];

From b277d701ec951baffc1ad950e0724515aa495d98 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 17 Oct 2022 07:05:06 +0100
Subject: [PATCH 124/196] refactored add_action parameter from string to araay

---
 src/TerminationOfTransfer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TerminationOfTransfer.php b/src/TerminationOfTransfer.php
index bae5c28..0bfc8d4 100644
--- a/src/TerminationOfTransfer.php
+++ b/src/TerminationOfTransfer.php
@@ -53,9 +53,9 @@ protected function registerStyles()
     public function run()
     {
         if ( ! version_compare( PHP_VERSION, '7.4', '>=' ) ) {
-            add_action( 'admin_notices', 'failPhpVersion' );
+            add_action( 'admin_notices', [$this, 'failPhpVersion'] );
         } elseif ( ! version_compare( get_bloginfo( 'version' ), '5.0', '>=' ) ) {
-            add_action( 'admin_notices', 'failWpVersion' );
+            add_action( 'admin_notices', [$this, 'failWpVersion'] );
         } else {
             add_shortcode( 'termination-of-transfer-tool', [$this, 'handleShortcode'] );
         }

From 7b9624d2c5f431bb6ac331091bf89a50da78513b Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 17 Oct 2022 07:07:06 +0100
Subject: [PATCH 125/196] commented out unused properties for runtime speeed

---
 termination-of-transfer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index d07be3c..d35eb3a 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -38,9 +38,9 @@ function termination_of_transfer_tool_init()
 {
     $tot_plugin = new Plugin();
     // the instaled directory path
-    $tot_plugin['path'] = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR;
+    // $tot_plugin['path'] = realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR;
     // the instaled directory url
-    $tot_plugin['url'] = plugin_dir_url( __FILE__ );
+    // $tot_plugin['url'] = plugin_dir_url( __FILE__ );
     // the current plugin version
     $tot_plugin['version'] = '2.0.0';
     // the plugin name

From 19d14155f23adc1bc07d865e8bae9b79d4383516 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 17 Oct 2022 07:07:46 +0100
Subject: [PATCH 126/196] fixed typo

---
 termination-of-transfer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index d35eb3a..9ca39e6 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -44,7 +44,7 @@ function termination_of_transfer_tool_init()
     // the current plugin version
     $tot_plugin['version'] = '2.0.0';
     // the plugin name
-    $tot_plugin['name'] = 'Termination of Tranfer Tool';
+    $tot_plugin['name'] = 'Termination of Transfer Tool';
     // the scripts to load, if prefixed with js/ then it's located in the plugin scripts folder
     $tot_plugin['scripts'] = [
         'jquery',

From adafc8fb178b888b8a697dc2b2fdf242a083ec48 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 17 Oct 2022 10:57:11 +0100
Subject: [PATCH 127/196] updated version to 2 in header requirements

---
 termination-of-transfer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/termination-of-transfer.php b/termination-of-transfer.php
index 9ca39e6..34d9d01 100644
--- a/termination-of-transfer.php
+++ b/termination-of-transfer.php
@@ -26,7 +26,7 @@
 /*
 Plugin Name: Termination of Tranfer Tool
 Plugin URI: https://github.com/creativecommons/termination-of-transfer
-Version: 1.0.0
+Version: 2.0.0
 Author: Creative Commons Corporation
 Author URI: https://github.com/creativecommons/
 Requires PHP: 7.4.0

From ff9de35f0655f8839f0e621ed63cbf71e5f0da52 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Tue, 18 Oct 2022 19:45:16 +0100
Subject: [PATCH 128/196] converted ommited var to const and let when
 re-asigned within defined scope

---
 assets/js/questions.js  | 22 +++++++++++-----------
 assets/js/validation.js |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 867e29c..d71b459 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -86,9 +86,9 @@ TotQuestions.s1q1bii = {
   variable: "grant_pub_year",
   input: "year",
   validate: () => {
-    var errors = TotValidation.validDate();
+    let errors = TotValidation.validDate();
     if (errors == false) {
-      var year = parseInt(jQuery(".text-question").val());
+      const year = parseInt(jQuery(".text-question").val());
       if (year < TotValues.creation_year) {
         errors =
           "Year of publication under grant cannot be earlier than year of creation.";
@@ -147,7 +147,7 @@ TotQuestions.s1q1d = {
   variable: "k_year",
   input: "year",
   validate: () => {
-    var errors = TotValidation.validDate();
+    const errors = TotValidation.validDate();
     if (errors == false) {
       // Stash the user-entered agreement year
       TotValues.user_inputted_k_year = parseInt(jQuery(".text-question").val());
@@ -295,8 +295,8 @@ TotQuestions.s2q2fii = {
 ////////////////////////////////////////////////////////////////////////////////
 
 TotQuestions.validateAnswer = () => {
-  var result = false;
-  var question = TotQuestions[TotQuestions.current_question];
+  let result = false;
+  const question = TotQuestions[TotQuestions.current_question];
   if (question["validate"]) {
     result = question.validate();
   } else if (question.type == "year") {
@@ -312,8 +312,8 @@ TotQuestions.validateAnswer = () => {
 };
 
 TotQuestions.getAnswer = () => {
-  var question = TotQuestions[TotQuestions.current_question];
-  var answer = undefined;
+  const question = TotQuestions[TotQuestions.current_question];
+  let answer = undefined;
   switch (question.input) {
     case "radio":
       answer = jQuery(':input[type="radio"]:checked').val();
@@ -341,11 +341,11 @@ TotQuestions.getAnswer = () => {
 };
 
 TotQuestions.processAnswer = () => {
-  var result = false;
-  var warnings = TotQuestions.validateAnswer();
+  let result = false;
+  const warnings = TotQuestions.validateAnswer();
   if (warnings === false) {
-    var question = TotQuestions[TotQuestions.current_question];
-    var answer = TotQuestions.getAnswer();
+    const question = TotQuestions[TotQuestions.current_question];
+    let answer = TotQuestions.getAnswer();
     TotValues[question.variable] = answer;
     // FIXME: handle converting radio buttons to correct store values
     //        while recording their label in the answers table
diff --git a/assets/js/validation.js b/assets/js/validation.js
index 8d14d23..bf9a656 100644
--- a/assets/js/validation.js
+++ b/assets/js/validation.js
@@ -55,10 +55,10 @@ TotValidation.allowOnlyNumbers = (element) => {
 // false here means no errors, a string means errors
 
 TotValidation.validDate = () => {
-  var text_field = jQuery(".text-question");
-  var date = text_field.val();
-  var result = false;
-  var errors = [];
+  const text_field = jQuery(".text-question");
+  const date = text_field.val();
+  let result = false;
+  const errors = [];
   if (!date.match(/[0-9]{4}/)) {
     errors.push("date must be four digits");
   }

From 85bb3ed8805c9ddc1d593967b1d0863c20a0b2dc Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 06:48:39 +0100
Subject: [PATCH 129/196] added conditional chaining in TotQuestions.getAnswer

---
 assets/js/questions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index d71b459..2cb633f 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -314,7 +314,7 @@ TotQuestions.validateAnswer = () => {
 TotQuestions.getAnswer = () => {
   const question = TotQuestions[TotQuestions.current_question];
   let answer = undefined;
-  switch (question.input) {
+  switch (question?.input) {
     case "radio":
       answer = jQuery(':input[type="radio"]:checked').val();
       break;

From 246f5b296154de513da207fb111da1711ac20b63 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 07:08:08 +0100
Subject: [PATCH 130/196] formatted with prettier

---
 assets/js/rendering.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 5f6bc9a..878c93e 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -57,7 +57,9 @@ TotRendering.common = (config) => {
   // If this is a question in a different section, change the section header
   // Section is 1-based, so we can use a simple logical and here.
   if (config.section && config.section != TotRendering.currentSection) {
-    jQuery("#section-title").html(TotRendering.sections[config.section]).fadeIn();
+    jQuery("#section-title")
+      .html(TotRendering.sections[config.section])
+      .fadeIn();
   }
   question.find(".question-label").html(config.question);
   if (config.explanation) {
@@ -87,9 +89,9 @@ TotRendering.radio = (config) => {
   const existing_value = TotValues[config.variable];
   let radio_button_values = config.values || ["yes", "no"];
   radio_button_values.forEach((value) => {
-    let radio_button = `<label class="radio-inline"><input type="radio" name=${name} value="${value}">${value}</label>`
+    let radio_button = `<label class="radio-inline"><input type="radio" name=${name} value="${value}">${value}</label>`;
     if (value == existing_value) {
-      radio_button = `<label class="radio-inline"><input type="radio" name=${name} checked="checked" value="${value}">${value}</label>`
+      radio_button = `<label class="radio-inline"><input type="radio" name=${name} checked="checked" value="${value}">${value}</label>`;
     }
 
     form_group.append(jQuery(radio_button));
@@ -121,7 +123,10 @@ TotRendering.text = (config) => {
   const question = TotRendering.common(config);
   const form_group = question.find(".form-group");
   // const name = "input-" + config.variable;
-  const text_field = jQuery(`<input type="text" class="form-control text-question" id="${config.variable}" placeholder="${config.placeholder || ""}" >`
+  const text_field = jQuery(
+    `<input type="text" class="form-control text-question" id="${
+      config.variable
+    }" placeholder="${config.placeholder || ""}" >`
   );
   form_group.append(text_field);
   // Set the label

From 4d949206cc47f4d1e0b4ea588c2db0c89dd6eb45 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 07:11:46 +0100
Subject: [PATCH 131/196] replaced label to value to display

---
 assets/js/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index eedb6af..bca76d6 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -39,7 +39,7 @@ TotAnswers.appendAnswer = (myId, label, value) => {
   // If the user has gone back and is changing the answer, first remove it
   TotAnswers.removeAnswer(myId);
   jQuery("#answers-table-rows").append(
-    `<tr id="answer-row-${myId}><td>${label}</td><td align="right">${label}</td></tr>`
+    `<tr id="answer-row-${myId}><td>${label}</td><td align="right">${value}</td></tr>`
   );
 };
 

From a4c9810e262fcc6ce752c58ad73d8f68db81f332 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 07:41:36 +0100
Subject: [PATCH 132/196] updated conditional statement

---
 assets/js/questions.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 2cb633f..2cac3c3 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -350,9 +350,9 @@ TotQuestions.processAnswer = () => {
     // FIXME: handle converting radio buttons to correct store values
     //        while recording their label in the answers table
     if (answer) {
-      answer =
-        (question.answerDisplayValue && question.answerDisplayValue()) ||
-        answer;
+      if (typeof question.answerDisplayValue === 'function') {
+        answer = question.answerDisplayValue();
+      }
       TotAnswers.appendAnswer(question.variable, question.question, answer);
     }
     TotNotifications.clearAlerts();

From b369a793709889f062354fab8cab247d2bf4f449 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 07:56:39 +0100
Subject: [PATCH 133/196] quote name attribute

---
 assets/js/rendering.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 878c93e..4d3b70e 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -89,9 +89,9 @@ TotRendering.radio = (config) => {
   const existing_value = TotValues[config.variable];
   let radio_button_values = config.values || ["yes", "no"];
   radio_button_values.forEach((value) => {
-    let radio_button = `<label class="radio-inline"><input type="radio" name=${name} value="${value}">${value}</label>`;
+    let radio_button = `<label class="radio-inline"><input type="radio" name="${name}" value="${value}">${value}</label>`;
     if (value == existing_value) {
-      radio_button = `<label class="radio-inline"><input type="radio" name=${name} checked="checked" value="${value}">${value}</label>`;
+      radio_button = `<label class="radio-inline"><input type="radio" name="${name}" checked="checked" value="${value}">${value}</label>`;
     }
 
     form_group.append(jQuery(radio_button));

From ec47d669a1caa5d72cc768f119c8bc4ec0a68e98 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 08:15:34 +0100
Subject: [PATCH 134/196] retructured TotRendering

---
 assets/js/rendering.js | 311 +++++++++++++++++++----------------------
 1 file changed, 141 insertions(+), 170 deletions(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 4d3b70e..a3bdbfb 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -20,178 +20,149 @@
 // Rendering UI elements for input
 ////////////////////////////////////////////////////////////////////////////////
 
-const TotRendering = {};
-
-////////////////////////////////////////////////////////////////////////////////
-// Sections
-////////////////////////////////////////////////////////////////////////////////
-
-TotRendering.sections = [
-  "",
-  "First tell us a few things about the work",
-  "Now, let’s find out whether the work is eligible for termination",
-  "Information about the work",
-];
-
-TotRendering.currentSection = 0;
-
-////////////////////////////////////////////////////////////////////////////////
-// Template basics
-////////////////////////////////////////////////////////////////////////////////
-
-TotRendering.questionTemplate =
-  '\
-<form class="question-form">\
-  <div class="form-group">\
-    <label class="question-label"></label><br>\
-    <p class="help-block"></p> \
-  </div>\
-</form>';
-
-TotRendering.createQuestion = () => {
-  return jQuery(TotRendering.questionTemplate);
-};
-
-TotRendering.common = (config) => {
-  const question = TotRendering.createQuestion();
-  // If this is a question in a different section, change the section header
-  // Section is 1-based, so we can use a simple logical and here.
-  if (config.section && config.section != TotRendering.currentSection) {
-    jQuery("#section-title")
-      .html(TotRendering.sections[config.section])
-      .fadeIn();
-  }
-  question.find(".question-label").html(config.question);
-  if (config.explanation) {
-    question.find(".help-block").html(config.explanation);
-  }
-  question.css("display", "none");
-  // If we're entering this value for the first time (not via the back button)
-  // and this isn't an optional value
-  // don't let the user continue until they enter a value here.
-  if (TotValues[config.variable] === undefined && !config.optional) {
-    TotNavigation.disableNext();
-  } else {
-    TotNavigation.enableNext();
-  }
-  return question;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Multiple choice questions (radio buttons)
-////////////////////////////////////////////////////////////////////////////////
-
-TotRendering.radio = (config) => {
-  const question = TotRendering.common(config);
-  const form_group = question.find(".form-group");
-  const name = `input ${config.variable}`;
-  // If we are returning to this via the back button, get the previous value
-  const existing_value = TotValues[config.variable];
-  let radio_button_values = config.values || ["yes", "no"];
-  radio_button_values.forEach((value) => {
-    let radio_button = `<label class="radio-inline"><input type="radio" name="${name}" value="${value}">${value}</label>`;
-    if (value == existing_value) {
-      radio_button = `<label class="radio-inline"><input type="radio" name="${name}" checked="checked" value="${value}">${value}</label>`;
+const TotRendering = {
+  currentSection: 0,
+  sections: [
+    "",
+    "First tell us a few things about the work",
+    "Now, let’s find out whether the work is eligible for termination",
+    "Information about the work",
+  ],
+  questionTemplate: `
+    <form class="question-form">
+      <div class="form-group">
+        <label class="question-label"></label>
+        <br>
+        <p class="help-block"></p> 
+      </div>
+    </form>`,
+  createQuestion: () => {
+    return jQuery(TotRendering.questionTemplate);
+  },
+  common: (config) => {
+    const question = TotRendering.createQuestion();
+    // If this is a question in a different section, change the section header
+    // Section is 1-based, so we can use a simple logical and here.
+    if (config.section && config.section != TotRendering.currentSection) {
+      jQuery("#section-title")
+        .html(TotRendering.sections[config.section])
+        .fadeIn();
     }
-
-    form_group.append(jQuery(radio_button));
-  });
-  // When the user makes a choice, go straight to the next question
-  form_group.find(':input[type="radio"]').click(() => {
-    TotNavigation.enableNext();
-    jQuery("#button-question-next").click();
-  });
-  return question;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Text input
-////////////////////////////////////////////////////////////////////////////////
-
-TotRendering.makeTextLengthHandler = (element, min_length, optional) => {
-  return () => {
-    const length = element.val().length;
-    if ((optional && length == 0) || length >= min_length) {
-      TotNavigation.enableNext();
-    } else {
+    question.find(".question-label").html(config.question);
+    if (config.explanation) {
+      question.find(".help-block").html(config.explanation);
+    }
+    question.css("display", "none");
+    // If we're entering this value for the first time (not via the back button)
+    // and this isn't an optional value
+    // don't let the user continue until they enter a value here.
+    if (TotValues[config.variable] === undefined && !config.optional) {
       TotNavigation.disableNext();
+    } else {
+      TotNavigation.enableNext();
     }
-  };
-};
-
-TotRendering.text = (config) => {
-  const question = TotRendering.common(config);
-  const form_group = question.find(".form-group");
-  // const name = "input-" + config.variable;
-  const text_field = jQuery(
-    `<input type="text" class="form-control text-question" id="${
-      config.variable
-    }" placeholder="${config.placeholder || ""}" >`
-  );
-  form_group.append(text_field);
-  // Set the label
-  // const label = question.find(".question-label").prop("for", name);
-  if (TotValues[config.variable]) {
-    form_group.find("text-question").val(TotValues[config.variable]);
-  }
-  const existing_value = TotValues[config.variable];
-  // Ensure next isn't enabled until enough characters are entered
-  const min_length = config.min_length || 4;
-  const text_field_element = question.find(".text-question");
-  const validator = TotRendering.makeTextLengthHandler(
-    text_field_element,
-    min_length,
-    config.optional
-  );
-  text_field_element.on("keyup", validator);
-  text_field_element.on("change", validator);
-  // If we are returning to the field and the value has already been set, use it
-  if (existing_value !== undefined) {
-    text_field.val(TotValues[config.variable]);
-  }
-  return question;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Year input (text subtype)
-////////////////////////////////////////////////////////////////////////////////
-
-TotRendering.year = (config) => {
-  const question = TotRendering.text(config);
-  const text_field = question.find(".text-question");
-  TotValidation.allowOnlyNumbers(text_field);
-  text_field.prop("maxlength", 4);
-  text_field.prop("placeholder", "1977");
-  return question;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Render html UI from config specification
-////////////////////////////////////////////////////////////////////////////////
-
-TotRendering.render = (config) => {
-  let result = undefined;
-  switch (config.input) {
-    case "radio":
-      result = TotRendering.radio(config);
-      break;
-    case "year":
-      result = TotRendering.year(config);
-      break;
-    case "text":
-    // Fall through to default
-    default:
-      result = TotRendering.text(config);
-      break;
+    return question;
+  },
+  radio: (config) => {
+    // Multiple choice questions (radio buttons)
+    const question = TotRendering.common(config);
+    const form_group = question.find(".form-group");
+    const name = `input ${config.variable}`;
+    // If we are returning to this via the back button, get the previous value
+    const existing_value = TotValues[config.variable];
+    let radio_button_values = config.values || ["yes", "no"];
+    radio_button_values.forEach((value) => {
+      let radio_button = `<label class="radio-inline"><input type="radio" name="${name}" value="${value}">${value}</label>`;
+      if (value == existing_value) {
+        radio_button = `<label class="radio-inline"><input type="radio" name="${name}" checked="checked" value="${value}">${value}</label>`;
+      }
+  
+      form_group.append(jQuery(radio_button));
+    });
+    // When the user makes a choice, go straight to the next question
+    form_group.find(':input[type="radio"]').click(() => {
+      TotNavigation.enableNext();
+      jQuery("#button-question-next").click();
+    });
+    return question;
+  },
+  makeTextLengthHandler: (element, min_length, optional) => {
+    // text input validator handler
+    return () => {
+      const length = element.val().length;
+      if ((optional && length == 0) || length >= min_length) {
+        TotNavigation.enableNext();
+      } else {
+        TotNavigation.disableNext();
+      }
+    };
+  },
+  text: (config) => {
+     // Text input
+    const question = TotRendering.common(config);
+    const form_group = question.find(".form-group");
+    // const name = "input-" + config.variable;
+    const text_field = jQuery(
+      `<input type="text" class="form-control text-question" id="${
+        config.variable
+      }" placeholder="${config.placeholder || ""}" >`
+    );
+    form_group.append(text_field);
+    // Set the label
+    // const label = question.find(".question-label").prop("for", name);
+    if (TotValues[config.variable]) {
+      form_group.find("text-question").val(TotValues[config.variable]);
+    }
+    const existing_value = TotValues[config.variable];
+    // Ensure next isn't enabled until enough characters are entered
+    const min_length = config.min_length || 4;
+    const text_field_element = question.find(".text-question");
+    const validator = TotRendering.makeTextLengthHandler(
+      text_field_element,
+      min_length,
+      config.optional
+    );
+    text_field_element.on("keyup", validator);
+    text_field_element.on("change", validator);
+    // If we are returning to the field and the value has already been set, use it
+    if (existing_value !== undefined) {
+      text_field.val(TotValues[config.variable]);
+    }
+    return question;
+  },
+  year: (config) => {
+    // Year input (text subtype)
+    const question = TotRendering.text(config);
+    const text_field = question.find(".text-question");
+    TotValidation.allowOnlyNumbers(text_field);
+    text_field.prop("maxlength", 4);
+    text_field.prop("placeholder", "1977");
+    return question;
+  },
+  render: (config) => {
+    // Render html UI from config specification
+    let result = undefined;
+    switch (config.input) {
+      case "radio":
+        result = TotRendering.radio(config);
+        break;
+      case "year":
+        result = TotRendering.year(config);
+        break;
+      case "text":
+      // Fall through to default
+      default:
+        result = TotRendering.text(config);
+        break;
+    }
+    return result;
+  },
+  transitionTo: (config) => {
+    const question = TotRendering.render(config);
+    jQuery(".question-form").slideUp("fast", () => {
+      jQuery(this).remove();
+    });
+    jQuery("#question-rendering-area").append(question);
+    question.slideDown("fast");
   }
-  return result;
-};
-
-TotRendering.transitionTo = (config) => {
-  const question = TotRendering.render(config);
-  jQuery(".question-form").slideUp("fast", () => {
-    jQuery(this).remove();
-  });
-  jQuery("#question-rendering-area").append(question);
-  question.slideDown("fast");
 };

From 847fa0386d95dcb354b486726f439f9dc3cf3801 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 08:21:32 +0100
Subject: [PATCH 135/196] fixed radio input name

---
 assets/js/rendering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index a3bdbfb..0c87b7c 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -67,7 +67,7 @@ const TotRendering = {
     // Multiple choice questions (radio buttons)
     const question = TotRendering.common(config);
     const form_group = question.find(".form-group");
-    const name = `input ${config.variable}`;
+    const name = `input_${config.variable}`;
     // If we are returning to this via the back button, get the previous value
     const existing_value = TotValues[config.variable];
     let radio_button_values = config.values || ["yes", "no"];

From 5574b7b9787615d0b3a576b68f6e092522a0f2a2 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 08:26:03 +0100
Subject: [PATCH 136/196] updated click event

---
 assets/js/rendering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index 0c87b7c..f12b035 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -80,7 +80,7 @@ const TotRendering = {
       form_group.append(jQuery(radio_button));
     });
     // When the user makes a choice, go straight to the next question
-    form_group.find(':input[type="radio"]').click(() => {
+    form_group.find(':input[type="radio"]').on('click', () => {
       TotNavigation.enableNext();
       jQuery("#button-question-next").click();
     });

From fe19cc48daf531973ce2b4d313d1a8ccf8d1af04 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 08:31:23 +0100
Subject: [PATCH 137/196] updated  event registration

---
 assets/js/questions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 2cac3c3..ff45fbe 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -498,8 +498,8 @@ TotQuestions.start = () => {
   TotNavigation.showQuestions();
   TotNavigation.showAnswersTable();
   TotNavigation.showNextPrevious();
-  jQuery("#button-question-next").click(TotQuestions.nextQuestion);
-  jQuery("#button-question-back").click(TotQuestions.previousQuestion);
+  jQuery("#button-question-next").on('click',TotQuestions.nextQuestion);
+  jQuery("#button-question-back").on('click', TotQuestions.previousQuestion);
   // When the user presses "return" in a text area, move to next question
   jQuery("#question-rendering-area").on("submit", () => {
     if (jQuery("#button-question-next").is(":enabled")) {

From 844caef9027d3d2cb8ae632a880d2f2488140462 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 08:34:35 +0100
Subject: [PATCH 138/196] rename selector

---
 assets/js/rendering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index f12b035..e880735 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -160,7 +160,7 @@ const TotRendering = {
   transitionTo: (config) => {
     const question = TotRendering.render(config);
     jQuery(".question-form").slideUp("fast", () => {
-      jQuery(this).remove();
+      jQuery(".question-form").remove();
     });
     jQuery("#question-rendering-area").append(question);
     question.slideDown("fast");

From f247ea47f4c62a58c5f8c7b2f99feda4e15dbd54 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 08:38:22 +0100
Subject: [PATCH 139/196] rename selector

---
 assets/js/rendering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index e880735..f12b035 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -160,7 +160,7 @@ const TotRendering = {
   transitionTo: (config) => {
     const question = TotRendering.render(config);
     jQuery(".question-form").slideUp("fast", () => {
-      jQuery(".question-form").remove();
+      jQuery(this).remove();
     });
     jQuery("#question-rendering-area").append(question);
     question.slideDown("fast");

From 38c17651f8c99cc166785fdf39c4999de244c45f Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 08:52:18 +0100
Subject: [PATCH 140/196] updated label selector query

---
 assets/js/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index bca76d6..cfea2d6 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -34,7 +34,7 @@ TotAnswers.resetAnswers = () => {
 
 TotAnswers.appendAnswer = (myId, label, value) => {
   if (!label) {
-    label = jQuery(`#${myId} > label`).first().text();
+    label = jQuery(`#${myId}`).parent().find('label').first().text();
   }
   // If the user has gone back and is changing the answer, first remove it
   TotAnswers.removeAnswer(myId);

From 78df19b437750abaa3ae84fab435f6ebf4a81282 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 08:53:58 +0100
Subject: [PATCH 141/196] updated ommited closing quotey

---
 assets/js/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index cfea2d6..5535f1e 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -39,7 +39,7 @@ TotAnswers.appendAnswer = (myId, label, value) => {
   // If the user has gone back and is changing the answer, first remove it
   TotAnswers.removeAnswer(myId);
   jQuery("#answers-table-rows").append(
-    `<tr id="answer-row-${myId}><td>${label}</td><td align="right">${value}</td></tr>`
+    `<tr id="answer-row-${myId}"><td>${label}</td><td align="right">${value}</td></tr>`
   );
 };
 

From 6a23cbdfdc658203a0e6a9da45fbd7be4fd9bb73 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:09:10 +0100
Subject: [PATCH 142/196] created npm project as per new RFC

---
 package.json | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package.json

diff --git a/package.json b/package.json
new file mode 100644
index 0000000..28c28c5
--- /dev/null
+++ b/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "termination-of-transfer",
+  "version": "2.0.0",
+  "description": "Termination of transfer tool",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/creativecommons/termination-of-transfer.git"
+  },
+  "keywords": [
+    "termination",
+    "transfer",
+    "creative",
+    "commons",
+    "tool"
+  ],
+  "author": "Creative Commons",
+  "license": "AGPL-3.0",
+  "bugs": {
+    "url": "https://github.com/onyijne/termination-of-transfer/issues"
+  },
+  "homepage": "https://github.com/creativecommons/termination-of-transfer#readme"
+}

From 3eaf1a68478fc457182d6315e7ad04be05c4526a Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:10:08 +0100
Subject: [PATCH 143/196] added node_modules to git ignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ce4844d..c9b9a0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
 .\#*
 vendor
-templates_c
\ No newline at end of file
+templates_c
+node_modules
\ No newline at end of file

From 40f48c2c32701b3c4f381a5a0572815f350dd00b Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:18:08 +0100
Subject: [PATCH 144/196] installed dev dependencies

---
 package-lock.json | 1533 +++++++++++++++++++++++++++++++++++++++++++++
 package.json      |    9 +-
 2 files changed, 1541 insertions(+), 1 deletion(-)
 create mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..bad1f44
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1533 @@
+{
+  "name": "termination-of-transfer",
+  "version": "2.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@babel/cli": {
+      "version": "7.19.3",
+      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.19.3.tgz",
+      "integrity": "sha512-643/TybmaCAe101m2tSVHi9UKpETXP9c/Ff4mD2tAwkdP6esKIfaauZFc67vGEM6r9fekbEGid+sZhbEnSe3dg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/trace-mapping": "^0.3.8",
+        "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents.3",
+        "chokidar": "^3.4.0",
+        "commander": "^4.0.1",
+        "convert-source-map": "^1.1.0",
+        "fs-readdir-recursive": "^1.1.0",
+        "glob": "^7.2.0",
+        "make-dir": "^2.1.0",
+        "slash": "^2.0.0"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.18.6"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz",
+      "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==",
+      "dev": true
+    },
+    "@babel/core": {
+      "version": "7.19.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz",
+      "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==",
+      "dev": true,
+      "requires": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.3",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helpers": "^7.19.0",
+        "@babel/parser": "^7.19.3",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.3",
+        "@babel/types": "^7.19.3",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.19.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.5.tgz",
+      "integrity": "sha512-DxbNz9Lz4aMZ99qPpO1raTbcrI1ZeYh+9NR9qhfkQIbFtVEqotHojEBxHzmxhVONkGt6VyrqVQcgpefMy9pqcg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.19.4",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
+      },
+      "dependencies": {
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        }
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.19.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz",
+      "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.19.3",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "dev": true
+    },
+    "@babel/helper-function-name": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
+      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.19.4"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "dev": true
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "dev": true
+    },
+    "@babel/helpers": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz",
+      "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.4",
+        "@babel/types": "^7.19.4"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz",
+      "integrity": "sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA==",
+      "dev": true
+    },
+    "@babel/template": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.18.10",
+        "@babel/types": "^7.18.10"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.4.tgz",
+      "integrity": "sha512-w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.4",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.19.4",
+        "@babel/types": "^7.19.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/types": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz",
+      "integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@eslint/eslintrc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "globals": {
+          "version": "13.17.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        }
+      }
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
+      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "@nicolo-ribaudo/chokidar-2": {
+      "version": "2.1.8-no-fsevents.3",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
+      "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "acorn": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "optional": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "browserslist": {
+      "version": "4.21.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001400",
+        "electron-to-chromium": "^1.4.251",
+        "node-releases": "^2.0.6",
+        "update-browserslist-db": "^1.0.9"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001422",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001422.tgz",
+      "integrity": "sha512-hSesn02u1QacQHhaxl/kNMZwqVG35Sz/8DgvmgedxSH8z9UUpcDYSPYgsj3x5dQNRcNp6BwpSfQfVzYUTm+fog==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
+      "dev": true
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true
+    },
+    "eslint": {
+      "version": "8.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
+      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
+      "dev": true,
+      "requires": {
+        "@eslint/eslintrc": "^1.3.3",
+        "@humanwhocodes/config-array": "^0.10.5",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "globby": "^11.1.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.3"
+          }
+        },
+        "globals": {
+          "version": "13.17.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "dev": true,
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
+      }
+    },
+    "eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
+      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
+    "fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      }
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "fs-readdir-recursive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
+        }
+      }
+    },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true
+    },
+    "ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "js-sdsl": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
+      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^5.0.0"
+      }
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      }
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node-releases": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
+      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+      "dev": true
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "optional": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "requires": {
+        "yocto-queue": "^0.1.0"
+      }
+    },
+    "p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^3.0.2"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
+    "prettier": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "dev": true
+    },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
+    },
+    "update-browserslist-db": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "dev": true,
+      "requires": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
index 28c28c5..85ad123 100644
--- a/package.json
+++ b/package.json
@@ -25,5 +25,12 @@
   "bugs": {
     "url": "https://github.com/onyijne/termination-of-transfer/issues"
   },
-  "homepage": "https://github.com/creativecommons/termination-of-transfer#readme"
+  "homepage": "https://github.com/creativecommons/termination-of-transfer#readme",
+  "devDependencies": {
+    "@babel/cli": "^7.19.3",
+    "@babel/core": "^7.19.3",
+    "eslint": "^8.25.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.7.1"
+  }
 }

From aca3d3567327c48c7dd2b846f3656c24e0a36874 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:19:38 +0100
Subject: [PATCH 145/196] installed  dependencies

---
 package-lock.json | 5 +++++
 package.json      | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index bad1f44..b0a435d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1095,6 +1095,11 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "jquery": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="
+    },
     "js-sdsl": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
diff --git a/package.json b/package.json
index 85ad123..1a5485a 100644
--- a/package.json
+++ b/package.json
@@ -32,5 +32,8 @@
     "eslint": "^8.25.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.7.1"
+  },
+  "dependencies": {
+    "jquery": "^3.6.1"
   }
 }

From 850af003adb2bf24948278b4645d6635a477355e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:23:31 +0100
Subject: [PATCH 146/196] added prettier plugin to eslint

---
 .eslintrc.json | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .eslintrc.json

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..fda752f
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+    "extends": ["plugin:prettier/recommended"]
+}
\ No newline at end of file

From 44ad5ad77e6fae292b733025fe846d0b7d8044df Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:33:51 +0100
Subject: [PATCH 147/196] added prettier rules

---
 .prettierrc.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .prettierrc.json

diff --git a/.prettierrc.json b/.prettierrc.json
new file mode 100644
index 0000000..c83793c
--- /dev/null
+++ b/.prettierrc.json
@@ -0,0 +1,11 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "singleQuote": false,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "semi": true,
+  "useTabs": false,
+  "parser": "babel",
+  "bracketSameLine": false
+}

From 4c650af22d5dd53f3804be0b218bca7a344ad9a4 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:41:46 +0100
Subject: [PATCH 148/196] updated dev dependencies

---
 package-lock.json | 6 ++++++
 package.json      | 1 +
 2 files changed, 7 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index b0a435d..c967b03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -759,6 +759,12 @@
         }
       }
     },
+    "eslint-config-prettier": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
+      "dev": true
+    },
     "eslint-plugin-prettier": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
diff --git a/package.json b/package.json
index 1a5485a..7449bdc 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "eslint": "^8.25.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.7.1"
   },

From bdd4dd045d147f70e3feb51d6d6490e960987504 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:48:15 +0100
Subject: [PATCH 149/196] updated dev dependencies

---
 .eslintrc.json    |  2 ++
 package-lock.json | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |  1 +
 3 files changed, 55 insertions(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index fda752f..7412445 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,3 +1,5 @@
 {
+    "root": true,
+    "parser": "@babel/eslint-parser",
     "extends": ["plugin:prettier/recommended"]
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index c967b03..58d49f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,6 +77,31 @@
         }
       }
     },
+    "@babel/eslint-parser": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
+      "dev": true,
+      "requires": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
     "@babel/generator": {
       "version": "7.19.5",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.5.tgz",
@@ -371,6 +396,33 @@
       "dev": true,
       "optional": true
     },
+    "@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "requires": {
+        "eslint-scope": "5.1.1"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "dev": true
+        }
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/package.json b/package.json
index 7449bdc..edbeeb9 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
   "devDependencies": {
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
+    "@babel/eslint-parser": "^7.19.1",
     "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",

From 170d6321ab3818de4e8602583e25d5050bf27cdd Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:54:28 +0100
Subject: [PATCH 150/196] updated dev dependencies

---
 package-lock.json | 1323 ++++++++++++++++++++++++++++++++++++++++++---
 package.json      |    1 +
 2 files changed, 1241 insertions(+), 83 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 58d49f8..bbd9ea3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -126,139 +126,1028 @@
         }
       }
     },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
+      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.18.6",
+        "@babel/types": "^7.18.9"
+      }
+    },
     "@babel/helper-compilation-targets": {
       "version": "7.19.3",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz",
       "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.19.3",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
+        "@babel/compat-data": "^7.19.3",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "regexpu-core": "^5.1.0"
+      }
+    },
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "dev": true
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
+      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.9"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
+      "dev": true
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
+      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-wrap-function": "^7.18.9",
+        "@babel/types": "^7.18.9"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/traverse": "^7.19.1",
+        "@babel/types": "^7.19.0"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
+      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.19.4"
+      }
+    },
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
+      "integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.9"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "dev": true
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "dev": true
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz",
+      "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.4",
+        "@babel/types": "^7.19.4"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz",
+      "integrity": "sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA==",
+      "dev": true
+    },
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
+      }
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
+      "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      }
+    },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
+      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
+      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
+      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.18.8"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-import-assertions": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
+      "integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-remap-async-to-generator": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz",
+      "integrity": "sha512-934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-compilation-targets": "^7.19.0",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
+      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz",
+      "integrity": "sha512-t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
+      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.18.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
+      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.18.9",
+        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
+      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
+      "integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
+      "integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-simple-access": "^7.18.6",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
+      "integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-      "dev": true
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0"
+      }
     },
-    "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+    "@babel/plugin-transform-new-target": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "@babel/helper-hoist-variables": {
+    "@babel/plugin-transform-object-super": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.6"
       }
     },
-    "@babel/helper-module-imports": {
+    "@babel/plugin-transform-parameters": {
+      "version": "7.18.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
+      "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "@babel/helper-module-transforms": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "regenerator-transform": "^0.15.0"
       }
     },
-    "@babel/helper-simple-access": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.19.4"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "@babel/helper-split-export-declaration": {
+    "@babel/plugin-transform-shorthand-properties": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
-      "dev": true
+    "@babel/plugin-transform-spread": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+      }
     },
-    "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
-      "dev": true
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "@babel/helper-validator-option": {
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
+      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
+      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
+      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "@babel/helpers": {
+    "@babel/preset-env": {
       "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz",
-      "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
+      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.4",
-        "@babel/types": "^7.19.4"
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
+        "@babel/plugin-proposal-class-properties": "^7.18.6",
+        "@babel/plugin-proposal-class-static-block": "^7.18.6",
+        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+        "@babel/plugin-proposal-json-strings": "^7.18.6",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.18.6",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.18.6",
+        "@babel/plugin-transform-async-to-generator": "^7.18.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+        "@babel/plugin-transform-block-scoping": "^7.19.4",
+        "@babel/plugin-transform-classes": "^7.19.0",
+        "@babel/plugin-transform-computed-properties": "^7.18.9",
+        "@babel/plugin-transform-destructuring": "^7.19.4",
+        "@babel/plugin-transform-dotall-regex": "^7.18.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+        "@babel/plugin-transform-for-of": "^7.18.8",
+        "@babel/plugin-transform-function-name": "^7.18.9",
+        "@babel/plugin-transform-literals": "^7.18.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+        "@babel/plugin-transform-modules-amd": "^7.18.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
+        "@babel/plugin-transform-modules-umd": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
+        "@babel/plugin-transform-new-target": "^7.18.6",
+        "@babel/plugin-transform-object-super": "^7.18.6",
+        "@babel/plugin-transform-parameters": "^7.18.8",
+        "@babel/plugin-transform-property-literals": "^7.18.6",
+        "@babel/plugin-transform-regenerator": "^7.18.6",
+        "@babel/plugin-transform-reserved-words": "^7.18.6",
+        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+        "@babel/plugin-transform-spread": "^7.19.0",
+        "@babel/plugin-transform-sticky-regex": "^7.18.6",
+        "@babel/plugin-transform-template-literals": "^7.18.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+        "@babel/plugin-transform-unicode-regex": "^7.18.6",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.19.4",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "core-js-compat": "^3.25.1",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
-    "@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+    "@babel/preset-modules": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
       }
     },
-    "@babel/parser": {
+    "@babel/runtime": {
       "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz",
-      "integrity": "sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA==",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz",
+      "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
     },
     "@babel/template": {
       "version": "7.18.10",
@@ -511,6 +1400,53 @@
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "semver": "^6.1.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "core-js-compat": "^3.25.1"
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
+      }
+    },
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -555,6 +1491,16 @@
         "update-browserslist-db": "^1.0.9"
       }
     },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -628,6 +1574,15 @@
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
       "dev": true
     },
+    "core-js-compat": {
+      "version": "3.25.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.5.tgz",
+      "integrity": "sha512-ovcyhs2DEBUIE0MGEKHP4olCUW/XYte3Vroyxuh38rD1wAO4dHohsovUC4eAOuzFxE6b+RXvBU3UZ9o0YhUTkA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.21.4"
+      }
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -654,6 +1609,16 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "requires": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
+    },
     "dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -1009,12 +1974,29 @@
       "dev": true,
       "optional": true
     },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true
     },
+    "get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
     "glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -1072,12 +2054,36 @@
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
       "dev": true
     },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true
     },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true
+    },
     "ignore": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@ -1126,6 +2132,15 @@
         "binary-extensions": "^2.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1222,6 +2237,12 @@
         "p-locate": "^5.0.0"
       }
     },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true
+    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -1288,6 +2309,24 @@
       "dev": true,
       "optional": true
     },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      }
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1356,6 +2395,12 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true
     },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -1423,12 +2468,90 @@
         "picomatch": "^2.2.1"
       }
     },
+    "regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "regenerate-unicode-properties": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.2"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.10",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
+      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==",
+      "dev": true
+    },
+    "regenerator-transform": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
+    "regexpu-core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsgen": "^0.7.1",
+        "regjsparser": "^0.9.1",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+          "dev": true
+        }
+      }
+    },
+    "resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -1510,6 +2633,12 @@
         "has-flag": "^3.0.0"
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -1546,6 +2675,34 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "dev": true
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dev": true,
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+      "dev": true
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+      "dev": true
+    },
     "update-browserslist-db": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
diff --git a/package.json b/package.json
index edbeeb9..e569cd2 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "@babel/eslint-parser": "^7.19.1",
+    "@babel/preset-env": "^7.19.4",
     "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",

From 99fc4312a32ea4eb59c68dd82e32e22b23eca3e5 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 09:55:18 +0100
Subject: [PATCH 151/196] added babel config file

---
 babel.config.json | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 babel.config.json

diff --git a/babel.config.json b/babel.config.json
new file mode 100644
index 0000000..fc8201a
--- /dev/null
+++ b/babel.config.json
@@ -0,0 +1,3 @@
+{
+    "presets": ["@babel/preset-env"]
+  }
\ No newline at end of file

From 270a27e566e870dedd57f098fadfe8b3fde0f306 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:09:24 +0100
Subject: [PATCH 152/196] updated eslint config

---
 .eslintrc.json    | 8 ++++++++
 babel.config.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 7412445..12dba42 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,13 @@
 {
     "root": true,
     "parser": "@babel/eslint-parser",
+    "parserOptions": {
+        "requireConfigFile": false,
+        "babelOptions": {
+            "babelrc": false,
+            "configFile": false,
+            "presets": ["@babel/preset-env"]
+        }
+    },
     "extends": ["plugin:prettier/recommended"]
 }
\ No newline at end of file
diff --git a/babel.config.json b/babel.config.json
index fc8201a..ff3059c 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -1,3 +1,3 @@
 {
     "presets": ["@babel/preset-env"]
-  }
\ No newline at end of file
+}
\ No newline at end of file

From 828ee13fd327c717168948d7ff58fcc86da16170 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:12:54 +0100
Subject: [PATCH 153/196] formatted with prettier

---
 assets/js/pdf.js       | 22 +++++++++++-----------
 assets/js/questions.js | 14 +++++++-------
 assets/js/rendering.js | 12 ++++++------
 assets/js/rules.js     | 10 +++++-----
 assets/js/widgets.js   | 10 +++++-----
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index dc8f2de..e68bad0 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -24,7 +24,7 @@
 const TotPdf = {};
 
 TotPdf.url = `${jQuery(
-  "script[src*='/termination-of-transfer/assets/js/pdf.js']"
+  "script[src*='/termination-of-transfer/assets/js/pdf.js']",
 )
   .attr("src")
   .replace(/assets\/js\/pdf\.js.*$/, "")}pdf-result.php`;
@@ -55,12 +55,12 @@ TotPdf.append203Windows = (details) => {
   TotPdf.appendProperty(
     details,
     '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>',
-    notice
+    notice,
   );
   TotPdf.appendProperty(
     details,
     '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>',
-    termination
+    termination,
   );
 };
 
@@ -68,43 +68,43 @@ TotPdf.append304Windows = (details) => {
   TotPdf.appendProperty(
     details,
     '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
-    TotValues.notice_begin
+    TotValues.notice_begin,
   );
   TotPdf.appendProperty(
     details,
     '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
-    TotValues.notice_end
+    TotValues.notice_end,
   );
   TotPdf.appendProperty(
     details,
     '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
-    TotValues.term_begin
+    TotValues.term_begin,
   );
   TotPdf.appendProperty(
     details,
     '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
-    TotValues.term_end
+    TotValues.term_end,
   );
   if (TotValues.d_notice_begin != undefined) {
     TotPdf.appendProperty(
       details,
       '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins',
-      TotValues.d_notice_begin
+      TotValues.d_notice_begin,
     );
     TotPdf.appendProperty(
       details,
       '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends',
-      TotValues.d_notice_end
+      TotValues.d_notice_end,
     );
     TotPdf.appendProperty(
       details,
       '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins',
-      TotValues.d_term_begin
+      TotValues.d_term_begin,
     );
     TotPdf.appendProperty(
       details,
       '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends',
-      TotValues.d_term_end
+      TotValues.d_term_end,
     );
   }
 };
diff --git a/assets/js/questions.js b/assets/js/questions.js
index ff45fbe..e8254dc 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -350,7 +350,7 @@ TotQuestions.processAnswer = () => {
     // FIXME: handle converting radio buttons to correct store values
     //        while recording their label in the answers table
     if (answer) {
-      if (typeof question.answerDisplayValue === 'function') {
+      if (typeof question.answerDisplayValue === "function") {
         answer = question.answerDisplayValue();
       }
       TotAnswers.appendAnswer(question.variable, question.question, answer);
@@ -376,7 +376,7 @@ jQuery
   .getJSON(
     jQuery("script[src*='/termination-of-transfer/assets/js/questions.js']")
       .attr("src")
-      .replace(/questions\.js.*$/, "") + "results.json"
+      .replace(/questions\.js.*$/, "") + "results.json",
   )
   .done((result) => {
     resultMap = result;
@@ -401,7 +401,7 @@ TotQuestions.last_question = "s2q2fii";
 
 TotQuestions.start = () => {
   jQuery(".questionnaire-section, .question-progress-buttons").removeClass(
-    "hidden"
+    "hidden",
   );
   jQuery(".no-javascript-alert").addClass("hidden");
   //TotNavigation.disablePrevious();
@@ -453,7 +453,7 @@ TotQuestions.nextQuestion = () => {
         {
           scrollTop: jQuery("#button-question-next").offset().top,
         },
-        "slow"
+        "slow",
       );
     }
   }
@@ -478,7 +478,7 @@ TotQuestions.previousQuestion = () => {
       {
         scrollTop: jQuery("#button-question-next").offset().top,
       },
-      "slow"
+      "slow",
     );
   }
 };
@@ -498,8 +498,8 @@ TotQuestions.start = () => {
   TotNavigation.showQuestions();
   TotNavigation.showAnswersTable();
   TotNavigation.showNextPrevious();
-  jQuery("#button-question-next").on('click',TotQuestions.nextQuestion);
-  jQuery("#button-question-back").on('click', TotQuestions.previousQuestion);
+  jQuery("#button-question-next").on("click", TotQuestions.nextQuestion);
+  jQuery("#button-question-back").on("click", TotQuestions.previousQuestion);
   // When the user presses "return" in a text area, move to next question
   jQuery("#question-rendering-area").on("submit", () => {
     if (jQuery("#button-question-next").is(":enabled")) {
diff --git a/assets/js/rendering.js b/assets/js/rendering.js
index f12b035..eca0a4c 100644
--- a/assets/js/rendering.js
+++ b/assets/js/rendering.js
@@ -76,11 +76,11 @@ const TotRendering = {
       if (value == existing_value) {
         radio_button = `<label class="radio-inline"><input type="radio" name="${name}" checked="checked" value="${value}">${value}</label>`;
       }
-  
+
       form_group.append(jQuery(radio_button));
     });
     // When the user makes a choice, go straight to the next question
-    form_group.find(':input[type="radio"]').on('click', () => {
+    form_group.find(':input[type="radio"]').on("click", () => {
       TotNavigation.enableNext();
       jQuery("#button-question-next").click();
     });
@@ -98,14 +98,14 @@ const TotRendering = {
     };
   },
   text: (config) => {
-     // Text input
+    // Text input
     const question = TotRendering.common(config);
     const form_group = question.find(".form-group");
     // const name = "input-" + config.variable;
     const text_field = jQuery(
       `<input type="text" class="form-control text-question" id="${
         config.variable
-      }" placeholder="${config.placeholder || ""}" >`
+      }" placeholder="${config.placeholder || ""}" >`,
     );
     form_group.append(text_field);
     // Set the label
@@ -120,7 +120,7 @@ const TotRendering = {
     const validator = TotRendering.makeTextLengthHandler(
       text_field_element,
       min_length,
-      config.optional
+      config.optional,
     );
     text_field_element.on("keyup", validator);
     text_field_element.on("change", validator);
@@ -164,5 +164,5 @@ const TotRendering = {
     });
     jQuery("#question-rendering-area").append(question);
     question.slideDown("fast");
-  }
+  },
 };
diff --git a/assets/js/rules.js b/assets/js/rules.js
index 05a139c..5f9c241 100644
--- a/assets/js/rules.js
+++ b/assets/js/rules.js
@@ -99,7 +99,7 @@ TotRules.section304Analysis = () => {
       if (TotValues.reg_year != undefined && TotValues.pub_year != undefined) {
         TotValues.cright_year = Math.min(
           TotValues.pub_year,
-          TotValues.reg_year
+          TotValues.reg_year,
         );
       }
       // Otherwise use whichever value is set. One *will* be set here, see top.
@@ -166,7 +166,7 @@ TotRules.section203Analysis = () => {
       if (TotValues.triggering_pub_year != undefined) {
         TotValues.term_begin = Math.min(
           TotValues.triggering_pub_year + 35,
-          TotValues.k_year + 40
+          TotValues.k_year + 40,
         );
       } else {
         TotValues.term_begin = TotValues.k_year + 40;
@@ -192,7 +192,7 @@ TotRules.section203Analysis = () => {
       if (TotValues.triggering_pub_year != undefined) {
         TotValues.p_term_begin = Math.min(
           TotValues.triggering_pub_year + 35,
-          TotValues.p_term_begin
+          TotValues.p_term_begin,
         );
       }
       TotValues.p_term_end = TotValues.p_term_begin + 5;
@@ -317,7 +317,7 @@ TotRules.s1q1d = () => {
       !TotRules.hasPublicDomainFlags()
     ) {
       TotNotifications.setEncouragement(
-        "Both notice window and copyright status look good, let's get some more details!"
+        "Both notice window and copyright status look good, let's get some more details!",
       );
     }
   }
@@ -335,7 +335,7 @@ TotRules.s1q1f = () => {
     !TotRules.hasPublicDomainFlags()
   ) {
     TotNotifications.setEncouragement(
-      "Both notice window and copyright status look good, let's get some more details!"
+      "Both notice window and copyright status look good, let's get some more details!",
     );
   }
   return result;
diff --git a/assets/js/widgets.js b/assets/js/widgets.js
index 5535f1e..584e9bb 100644
--- a/assets/js/widgets.js
+++ b/assets/js/widgets.js
@@ -34,12 +34,12 @@ TotAnswers.resetAnswers = () => {
 
 TotAnswers.appendAnswer = (myId, label, value) => {
   if (!label) {
-    label = jQuery(`#${myId}`).parent().find('label').first().text();
+    label = jQuery(`#${myId}`).parent().find("label").first().text();
   }
   // If the user has gone back and is changing the answer, first remove it
   TotAnswers.removeAnswer(myId);
   jQuery("#answers-table-rows").append(
-    `<tr id="answer-row-${myId}"><td>${label}</td><td align="right">${value}</td></tr>`
+    `<tr id="answer-row-${myId}"><td>${label}</td><td align="right">${value}</td></tr>`,
   );
 };
 
@@ -60,20 +60,20 @@ TotNotifications.clearAlerts = () => {
 TotNotifications.setAlert = (message) => {
   TotNotifications.clearAlerts();
   jQuery("#alert-area").append(
-    `<div class="alert alert-warning" role="alert">${message}</div>`
+    `<div class="alert alert-warning" role="alert">${message}</div>`,
   );
 };
 
 TotNotifications.setEncouragement = (message) => {
   TotNotifications.clearAlerts();
   jQuery("#alert-area").append(
-    `<div class="alert alert-success" role="alert">${message}</div>`
+    `<div class="alert alert-success" role="alert">${message}</div>`,
   );
 };
 
 TotNotifications.displayAnswersHint = () => {
   jQuery("#answers-table-rows").append(
-    '<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>'
+    '<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>',
   );
 };
 

From 4352c40e779ac537c0436bfa0cf0840e6b08c14d Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:34:49 +0100
Subject: [PATCH 154/196] removed jquery from dependencies to use the one from
 WordPress

---
 package-lock.json | 5 -----
 package.json      | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbd9ea3..f0b3f03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2168,11 +2168,6 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "jquery": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
-      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="
-    },
     "js-sdsl": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
diff --git a/package.json b/package.json
index e569cd2..02bd43b 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "test": "test"
   },
   "scripts": {
+    "build": "npx babel assets --out-dir dist",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -36,7 +37,5 @@
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.7.1"
   },
-  "dependencies": {
-    "jquery": "^3.6.1"
-  }
+  "dependencies": {}
 }

From 5d585ff3f8b82899134ceecdd1bc2312948ef63a Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:37:33 +0100
Subject: [PATCH 155/196] updated build command to compile assets folder to
 dist/tot.js

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 02bd43b..e1091c1 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "test": "test"
   },
   "scripts": {
-    "build": "npx babel assets --out-dir dist",
+    "build": "npx babel assets --out-file dist/tot.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {

From 98e3f09ecd2d2fc9c65878dfa782e29ab65b7fa1 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:44:31 +0100
Subject: [PATCH 156/196] updated assets dir to dist

---
 src/TerminationOfTransfer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TerminationOfTransfer.php b/src/TerminationOfTransfer.php
index 0bfc8d4..396c3ae 100644
--- a/src/TerminationOfTransfer.php
+++ b/src/TerminationOfTransfer.php
@@ -30,7 +30,7 @@ protected function registerScripts()
             $script = \explode('/', $value);
             if (isset($script[1])) {
                 $n = $script[1];
-                wp_enqueue_script( "tot-$n", plugins_url( "assets/$value.js", __DIR__ ) );
+                wp_enqueue_script( "tot-$n", plugins_url( "dist/$value.js", __DIR__ ) );
             } else {
                 wp_enqueue_script($value);
             }
@@ -43,7 +43,7 @@ protected function registerStyles()
             $style = \explode('/', $value);
             if (isset($style[1])) {
                 $n = $style[1];
-                wp_enqueue_style( "tot-style-$n", plugins_url( "assets/$value.css", __DIR__ ) );
+                wp_enqueue_style( "tot-style-$n", plugins_url( "dist/$value.css", __DIR__ ) );
             } else {
                 wp_enqueue_style($value);
             }

From 3603d740c130c5f9dff6340ec72ace603e62483c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:47:16 +0100
Subject: [PATCH 157/196] updated assets bulding to dist dir

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e1091c1..02bd43b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "test": "test"
   },
   "scripts": {
-    "build": "npx babel assets --out-file dist/tot.js",
+    "build": "npx babel assets --out-dir dist",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {

From 55c735f907a0b7c599cab8fad0c1aeee3a827fe1 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:48:44 +0100
Subject: [PATCH 158/196] updated assets dir to dist

---
 assets/js/pdf.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/assets/js/pdf.js b/assets/js/pdf.js
index e68bad0..323b34e 100644
--- a/assets/js/pdf.js
+++ b/assets/js/pdf.js
@@ -23,11 +23,9 @@
 
 const TotPdf = {};
 
-TotPdf.url = `${jQuery(
-  "script[src*='/termination-of-transfer/assets/js/pdf.js']",
-)
+TotPdf.url = `${jQuery("script[src*='/termination-of-transfer/dist/js/pdf.js']")
   .attr("src")
-  .replace(/assets\/js\/pdf\.js.*$/, "")}pdf-result.php`;
+  .replace(/dist\/js\/pdf\.js.*$/, "")}pdf-result.php`;
 
 TotPdf.appendProperty = (details, key, value) => {
   const mapping = { key: key, value: value };

From 020dc480c77c9894c09329b6583e4e12219a237d Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:50:08 +0100
Subject: [PATCH 159/196] build js assets

---
 dist/js/pdf.js        | 102 +++++++++
 dist/js/questions.js  | 459 +++++++++++++++++++++++++++++++++++++++++
 dist/js/rendering.js  | 148 +++++++++++++
 dist/js/rules.js      | 469 ++++++++++++++++++++++++++++++++++++++++++
 dist/js/validation.js |  69 +++++++
 dist/js/values.js     |  71 +++++++
 dist/js/widgets.js    | 134 ++++++++++++
 7 files changed, 1452 insertions(+)
 create mode 100644 dist/js/pdf.js
 create mode 100644 dist/js/questions.js
 create mode 100644 dist/js/rendering.js
 create mode 100644 dist/js/rules.js
 create mode 100644 dist/js/validation.js
 create mode 100644 dist/js/values.js
 create mode 100644 dist/js/widgets.js

diff --git a/dist/js/pdf.js b/dist/js/pdf.js
new file mode 100644
index 0000000..07691d0
--- /dev/null
+++ b/dist/js/pdf.js
@@ -0,0 +1,102 @@
+"use strict";
+
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// PDF Generation
+// (browser-side data preparation and call to server)
+////////////////////////////////////////////////////////////////////////////////
+
+var TotPdf = {};
+TotPdf.url = "".concat(jQuery("script[src*='/termination-of-transfer/dist/js/pdf.js']").attr("src").replace(/dist\/js\/pdf\.js.*$/, ""), "pdf-result.php");
+TotPdf.appendProperty = function (details, key, value) {
+  var mapping = {
+    key: key,
+    value: value
+  };
+  details.push(mapping);
+};
+TotPdf.append203Windows = function (details) {
+  var notice = "";
+  var termination = "";
+  if (TotValues.notice_begin != undefined) {
+    notice += "".concat(TotValues.notice_begin, "-").concat(TotValues.notice_end);
+    termination += "".concat(TotValues.term_begin, "-").concat(TotValues.term_end);
+  }
+  if (TotValues.p_term_begin != undefined) {
+    if (notice != "") {
+      notice += " or ";
+      termination += " or ";
+    }
+    notice += "".concat(TotValues.p_notice_begin, "-").concat(TotValues.p_notice_end);
+    termination += "".concat(TotValues.p_term_begin, "-").concat(TotValues.p_term_end);
+  }
+  TotPdf.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a>', notice);
+  TotPdf.appendProperty(details, '&sect; 203 <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a>', termination);
+};
+TotPdf.append304Windows = function (details) {
+  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins', TotValues.notice_begin);
+  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends', TotValues.notice_end);
+  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins', TotValues.term_begin);
+  TotPdf.appendProperty(details, '&sect; 304(c) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends', TotValues.term_end);
+  if (TotValues.d_notice_begin != undefined) {
+    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> begins', TotValues.d_notice_begin);
+    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#notice_window" target="_blank">notice window</a> ends', TotValues.d_notice_end);
+    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> begins', TotValues.d_term_begin);
+    TotPdf.appendProperty(details, '&sect; 304(d) <a href="https://rightsback.org/glossary/#termination_window" target="_blank">termination window</a> ends', TotValues.d_term_end);
+  }
+};
+TotPdf.appendWindows = function (details) {
+  if (TotRules.is203()) {
+    TotPdf.append203Windows(details);
+  } else if (TotRules.is304()) {
+    TotPdf.append304Windows(details);
+  }
+};
+TotPdf.details = function () {
+  var details = [];
+  Object.getOwnPropertyNames(totVarsToTitles).forEach(function (key) {
+    if (TotValues[key] != undefined && TotValues[key] != "") {
+      TotPdf.appendProperty(details, totVarsToTitles[key], TotValues[key]);
+    }
+  });
+  TotPdf.appendWindows(details);
+  return details;
+};
+TotPdf.request = function () {
+  var data = {
+    report_timestamp: TotValues.current_date.getTime() / 1000,
+    flags: TotValues.flags.sort(),
+    // Sorts inline & returns, so OK here
+    conclusion: TotValues.conclusion,
+    details: TotPdf.details()
+  };
+  var totform = document.createElement("FORM");
+  totform.setAttribute("action", TotPdf.url);
+  totform.setAttribute("method", "post");
+  totform.setAttribute("enctype", "multipart/form-data");
+  totform.setAttribute("target", "_blank");
+  var data_field = document.createElement("INPUT");
+  data_field.setAttribute("type", "hidden");
+  data_field.setAttribute("name", "data");
+  data_field.setAttribute("value", JSON.stringify(data));
+  totform.appendChild(data_field);
+  jQuery("body").append(totform);
+  totform.submit();
+};
\ No newline at end of file
diff --git a/dist/js/questions.js b/dist/js/questions.js
new file mode 100644
index 0000000..30cfc75
--- /dev/null
+++ b/dist/js/questions.js
@@ -0,0 +1,459 @@
+"use strict";
+
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Presentation of questions, and main flow of control
+// (This is slightly overloaded)
+////////////////////////////////////////////////////////////////////////////////
+
+var TotQuestions = {};
+
+////////////////////////////////////////////////////////////////////////////////
+// Section One
+////////////////////////////////////////////////////////////////////////////////
+
+// When was the work created?
+
+TotQuestions.s1q1a = {
+  section: 1,
+  question: "When was the work created?",
+  explanation: "The year in which a work was created can affect its copyright status and its treatment under U.S. copyright law. Most importantly, the tool is concerned with whether a worked was made before or after January 1, 1978, when the most recent overhaul of U.S. copyright went into effect.",
+  variable: "creation_year",
+  input: "year",
+  pre: function pre() {
+    TotNavigation.disablePrevious();
+    TotNotifications.displayAnswersHint();
+  },
+  post: function post() {
+    TotNotifications.removeAnswersHint();
+  }
+};
+
+// Has the work been published?
+
+TotQuestions.s1q1b = {
+  question: "Has the work been published?",
+  explanation: 'Whether a work has been published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
+  variable: "work_published",
+  input: "radio",
+  pre: function pre() {
+    TotNavigation.enablePrevious();
+  }
+};
+
+// When was the work first published?
+
+TotQuestions.s1q1bi = {
+  variable: "pub_year",
+  question: "When was the work first published?",
+  explanation: 'When a work was published can affect its copyright status and factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">glossary</a>.',
+  input: "year",
+  validate: function validate() {
+    return TotValidation.validDate() || (parseInt(jQuery(".text-question").val()) < TotValues.creation_year ? "The publication year cannot be earlier than the creation year." : false);
+  }
+};
+
+// When was the work first published under the grant?
+
+TotQuestions.s1q1bii = {
+  section: 1,
+  question: "When was the work first published under the grant?",
+  explanation: 'When a work was first published under the grant (which may be different than the the date the work was published for the first time) can factor into the timing of a termination right. Note that "publication" has a particular meaning in U.S. copyright law, as discussed in our <a href="/glossary/#publication_date">glossary</a>.',
+  variable: "grant_pub_year",
+  input: "year",
+  validate: function validate() {
+    var errors = TotValidation.validDate();
+    if (errors == false) {
+      var year = parseInt(jQuery(".text-question").val());
+      if (year < TotValues.creation_year) {
+        errors = "Year of publication under grant cannot be earlier than year of creation.";
+      } else if (year < TotValues.pub_year) {
+        errors = "Year of publication under grant cannot be earlier than year of initial publication.";
+      } /* else if (year < TotValues.k_year) {
+        errors = 'Year of publication under grant cannot be earlier than year of grant.';
+        }*/
+    }
+
+    return errors;
+  }
+};
+
+// Works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?
+
+TotQuestions.s1q1bi2 = {
+  question: "Published works from 1989 and earlier usually display a copyright notice. Did the work have a copyright notice?",
+  explanation: 'For U.S. works published in certain years, U.S. law required that they feature a "copyright notice" in order to receive federal copyright protection. Whether or not the published version featured a copyright notice can affect the copyright status of these works.',
+  variable: "copyright_notice",
+  input: "radio",
+  values: ["yes", "no", "maybe"]
+};
+
+// Has the work been registered with the United State Copyright Office?
+
+TotQuestions.s1q1c = {
+  question: "Has the work been registered with the United State Copyright Office?",
+  explanation: "Before 1989, registration was one of the ways authors could secure federal copyright in their work. Whether a work was registered can affect copyright status and the timing of termination right.",
+  variable: "work_registered",
+  input: "radio",
+  values: ["yes", "no"] //, "don't know"] GitHub issue #33
+};
+
+// When was the work registered with the United States Copyright Office?
+
+TotQuestions.s1q1ci = {
+  question: "When was the work registered with the United States Copyright Office?",
+  explanation: "Before 1989, registration was one of the ways authors could secure federal copyright in their work. When a work was registered can affect copyright status and the timing of termination right.",
+  variable: "reg_year",
+  input: "year"
+};
+
+// What is the date of the agreement or transfer? ...
+
+TotQuestions.s1q1d = {
+  question: "What is the year of the agreement or transfer?",
+  explanation: "When a transfer took place determines the particular set of termination rules that will be applicable. The timing of a transfer is also needed to know when a work's copyright transfer may be eligible for termination.",
+  variable: "k_year",
+  input: "year",
+  validate: function validate() {
+    var errors = TotValidation.validDate();
+    if (errors == false) {
+      // Stash the user-entered agreement year
+      TotValues.user_inputted_k_year = parseInt(jQuery(".text-question").val());
+      // If date is before the creation year, use the creation year instead
+      if (TotValues.user_inputted_k_year < TotValues.creation_year) {
+        jQuery(".text-question").val(TotValues.creation_year);
+      }
+    }
+    return errors;
+  },
+  answerDisplayValue: function answerDisplayValue() {
+    return "Effective: ".concat(TotValues.k_year, " <br/>User entered:  ").concat(TotValues.user_inputted_k_year);
+  }
+};
+
+// Did the agreement or transfer include the right of publication?
+
+TotQuestions.s1q1f = {
+  // Last question in section 1, so set this if we've arrived via back button
+  section: 1,
+  question: "Did the agreement or transfer include the right of publication?",
+  explanation: 'If a <a href="/glossary/#agreement" target="_blank" title="Termination of Transfer: Glossary">transfer</a> from 1978 or later includes the right of <a href="/glossary/#publication_date" target="_blank" title="Termination of Transfer: Glossary">publication</a>, there is a different set of rules for determining when the transfer is eligible for termination.',
+  variable: "pub_right",
+  input: "radio",
+  values: ["yes", "no", "maybe"]
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Section Two
+////////////////////////////////////////////////////////////////////////////////
+
+// Is the agreement or transfer you want to terminate part of a last will...
+
+TotQuestions.s2q2a = {
+  // First question in section 2
+  section: 2,
+  question: 'Is the agreement or transfer in question part of a <a href="/glossary/#will" target="_blank" title="Termination of Transfer: Glossary">last will and testament</a>?',
+  variable: "last_will",
+  input: "radio"
+};
+
+// Are any of the authors still alive?
+
+TotQuestions.s2q2bi = {
+  question: 'Are <i>any</i> of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors or artists</a> still alive?',
+  explanation: "The copyright term for many works is based on the life of the author.",
+  variable: "any_authors_alive",
+  input: "radio"
+};
+
+// What is the year the last surviving author died?
+
+TotQuestions.s2q2bi2 = {
+  question: 'What is the year the last surviving <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author or artist</a> died?',
+  explanation: "The copyright term for many works is based on the life of the author.",
+  variable: "death",
+  input: "year"
+};
+
+// Was the work created within the scope of the author’s employment?
+
+TotQuestions.s2q2c = {
+  question: 'Was the work created within the <a href="/glossary/#scope_of_employment" target="_blank" title="Termination of Transfer: Glossary">scope of the author’s employment</a>?',
+  variable: "within_scope_of_employment",
+  input: "radio"
+};
+
+// Was there an express agreement between the author and the author's employer to not treat the work as a work made for hire?
+
+TotQuestions.s2q2ci = {
+  question: 'Was there an express agreement the author and the author\'s employer to not treat the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
+  variable: "express_agreement",
+  input: "radio"
+};
+
+// Was the work created in response to a special order or commission
+
+TotQuestions.s2q2d = {
+  question: 'Was the work created in response to a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">special order or commission</a> by some other person or company?',
+  variable: "special_order",
+  input: "radio"
+};
+
+// Was there a signed written agreement regarding the special order...
+
+TotQuestions.s2q2di = {
+  question: 'Was there a signed written agreement regarding the special order or commission which explicitly refers to the work as a <a href="/glossary/#work_for_hire" target="_blank" title="Termination of Transfer: Glossary">work for hire</a>?',
+  variable: "signed_written_agreement",
+  input: "radio"
+};
+
+// Was the work created for use as one of the following? ...
+
+TotQuestions.s2q2dia = {
+  question: 'Was the work created for use as one of the following? — <ul><li>a contribution to a collective work; a part of a motion picture or other audiovisual work;</li> <li>a translation;</li> <li>a <a href="/glossary/#supplementary_work" title="Termination of Transfer: Glossary">supplementary work</a> (such as a foreword, afterword, table, editorial note, musical arrangement, bibliography, appendix, or index);</li> <li>a <a href="/glossary/#compilation" target="_blank" title="Termination of Transfer: Glossary">compilation</a>;</li> <li>an <a href="/glossary/#instructional_text" target="_blank" title="Termination of Transfer: Glossary">instructional text (text and/or graphics)</a>;</li> <li>a test or answer material for a test;</li> <li>or as an atlas?</li></ul?>',
+  variable: "created_as_part_of_motion_picture",
+  input: "radio",
+  values: ["yes", "no", "don't know"]
+};
+
+// Has the original transfer since been renegotiated or altered?
+
+TotQuestions.s2q2e = {
+  question: "Has the original transfer since been renegotiated or altered?",
+  variable: "renego",
+  input: "radio",
+  values: ["yes", "no", "don't know"]
+};
+
+// Did one or more of the authors or artists enter into the agreement...
+
+TotQuestions.s2q2f = {
+  question: 'Did one or more of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">authors</a> enter into the agreement or transfer?',
+  variable: "authors_entered_agreement",
+  input: "radio"
+};
+
+// s2q2fii is part of the rule for s2q2f
+
+// Was the agreement or transfer made by a member of...
+
+TotQuestions.s2q2fii = {
+  // Last question in section 2, so set section if we're going back
+  section: 2,
+  question: 'Was the agreement or transfer made by a member of the <a href="/glossary/#author" target="_blank" title="Termination of Transfer: Glossary">author\'s</a> immediate family, or by the executors?<br><i>For more information about which family members qualify, check out the FAQ.</i>',
+  variable: "agreement_by_family_or_executor",
+  input: "radio"
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Storing answers
+////////////////////////////////////////////////////////////////////////////////
+
+TotQuestions.validateAnswer = function () {
+  var result = false;
+  var question = TotQuestions[TotQuestions.current_question];
+  if (question["validate"]) {
+    result = question.validate();
+  } else if (question.type == "year") {
+    result = TotValidation.validDate();
+  } else if (question.type == "text") {
+    // If the text has a minimum length, check it
+    if (jQuery(".text-question").val().length < question.min_chars) {
+      result = "Answer is too short, it must be at least ".concat(question.min_chars, " characters");
+    }
+  }
+  // We don't worry about radio buttons
+  return result;
+};
+TotQuestions.getAnswer = function () {
+  var question = TotQuestions[TotQuestions.current_question];
+  var answer = undefined;
+  switch (question === null || question === void 0 ? void 0 : question.input) {
+    case "radio":
+      answer = jQuery(':input[type="radio"]:checked').val();
+      break;
+    case "year":
+      if (question.optional != true || question.optional == true && jQuery(".text-question").val() != "") {
+        answer = parseInt(jQuery(".text-question").val());
+      }
+      break;
+    case "year_or_empty":
+      if (jQuery(".text-question").val() != "") {
+        answer = parseInt(jQuery(".text-question").val());
+      }
+      break;
+    case "text":
+    // Fall through to default
+    default:
+      answer = jQuery(".text-question").val();
+      break;
+  }
+  return answer;
+};
+TotQuestions.processAnswer = function () {
+  var result = false;
+  var warnings = TotQuestions.validateAnswer();
+  if (warnings === false) {
+    var question = TotQuestions[TotQuestions.current_question];
+    var answer = TotQuestions.getAnswer();
+    TotValues[question.variable] = answer;
+    // FIXME: handle converting radio buttons to correct store values
+    //        while recording their label in the answers table
+    if (answer) {
+      if (typeof question.answerDisplayValue === "function") {
+        answer = question.answerDisplayValue();
+      }
+      TotAnswers.appendAnswer(question.variable, question.question, answer);
+    }
+    TotNotifications.clearAlerts();
+    result = true;
+  } else {
+    TotNotifications.setAlert(warnings);
+  }
+  return result;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Flag and result lookup
+// These messages are stored in a json file so we can also use them in the PDF
+////////////////////////////////////////////////////////////////////////////////
+
+TotQuestions.resultMap = undefined;
+// Asynchronous fetch of data that is accessed synchronously.
+// This data won't be used until after several questions, so this is tolerable.
+
+jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/assets/js/questions.js']").attr("src").replace(/questions\.js.*$/, "") + "results.json").done(function (result) {
+  resultMap = result;
+}).fail(function (jqxhr, textStatus, error) {
+  var err = textStatus + ", " + error;
+  console.log("Request Failed: " + err);
+});
+TotQuestions.getConclusionDetails = function (specifier) {
+  var path = specifier.split(".");
+  var result = resultMap["Conclusion"][path[0]][path[1]];
+  return result;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Flow of control
+////////////////////////////////////////////////////////////////////////////////
+
+TotQuestions.first_question = "s1q1a";
+TotQuestions.last_question = "s2q2fii";
+TotQuestions.start = function () {
+  jQuery(".questionnaire-section, .question-progress-buttons").removeClass("hidden");
+  jQuery(".no-javascript-alert").addClass("hidden");
+  //TotNavigation.disablePrevious();
+  TotRendering.transitionTo(TotQuestions.first_question);
+};
+TotQuestions.transitionQuestion = function (next_question) {
+  var previous_question = TotQuestions[TotQuestions.current_question];
+  if (previous_question) {
+    if (previous_question.post) {
+      previous_question.post();
+    }
+  }
+  if (next_question == "finish") {
+    TotQuestions.finish();
+  } else {
+    TotQuestions.current_question = next_question;
+    var question = TotQuestions[TotQuestions.current_question];
+    if (question["pre"]) {
+      question.pre();
+    }
+    TotRendering.transitionTo(question);
+  }
+};
+TotQuestions.nextQuestionID = function () {
+  var next_question = TotQuestions.current_question;
+  var rule = TotRules[TotQuestions.current_question];
+  if (typeof rule == "function") {
+    next_question = rule();
+  } else {
+    next_question = rule;
+  }
+  return next_question;
+};
+TotQuestions.nextQuestion = function () {
+  // If the answer was OK, move on
+  if (TotQuestions.processAnswer()) {
+    ValuesStack.push();
+    var id = TotQuestions.nextQuestionID();
+    TotValues.question_id = id;
+    if (id == "finish") {
+      TotQuestions.finish();
+    } else {
+      TotQuestions.transitionQuestion(TotValues.question_id);
+      // Scroll down to make sure the input UI is visible
+      jQuery("html,body").animate({
+        scrollTop: jQuery("#button-question-next").offset().top
+      }, "slow");
+    }
+  }
+};
+TotQuestions.previousQuestion = function () {
+  // If we are going back from *after* the last question, re-enable UI
+  if (TotValues.question_id == "finish") {
+    TotNavigation.unfinishQuestions();
+  }
+  // Don't pop past the very first item
+  if (ValuesStack.height() > 0) {
+    // Go back
+    ValuesStack.pop();
+    TotQuestions.transitionQuestion(TotValues.question_id);
+    TotNotifications.clearAlerts();
+    // Clear previous answer
+    var previous_question = TotQuestions[TotValues.question_id];
+    TotAnswers.removeAnswer(previous_question.variable);
+    // Scroll down to make sure the input UI is visible
+    jQuery("html,body").animate({
+      scrollTop: jQuery("#button-question-next").offset().top
+    }, "slow");
+  }
+};
+TotQuestions.finish = function () {
+  var obj = TotQuestions.getConclusionDetails(TotValues.conclusion);
+  TotValues.termination_type = obj.title;
+  TotNotifications.setResultAreaMessage(obj, "panel-success");
+  TotNavigation.finishQuestions();
+  if (TotValues.conclusion_generate_pdf) {
+    TotPdf.request();
+  }
+};
+TotQuestions.start = function () {
+  TotValues.reset();
+  TotNavigation.showQuestions();
+  TotNavigation.showAnswersTable();
+  TotNavigation.showNextPrevious();
+  jQuery("#button-question-next").on("click", TotQuestions.nextQuestion);
+  jQuery("#button-question-back").on("click", TotQuestions.previousQuestion);
+  // When the user presses "return" in a text area, move to next question
+  jQuery("#question-rendering-area").on("submit", function () {
+    if (jQuery("#button-question-next").is(":enabled")) {
+      jQuery("#button-question-next").click();
+    }
+    return false;
+  });
+  TotQuestions.transitionQuestion(TotQuestions.first_question);
+  TotValues.question_id = TotQuestions.first_question;
+};
+jQuery(document).ready(function () {
+  TotQuestions.start();
+});
\ No newline at end of file
diff --git a/dist/js/rendering.js b/dist/js/rendering.js
new file mode 100644
index 0000000..7d3651c
--- /dev/null
+++ b/dist/js/rendering.js
@@ -0,0 +1,148 @@
+"use strict";
+
+var _this = void 0;
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Rendering UI elements for input
+////////////////////////////////////////////////////////////////////////////////
+
+var TotRendering = {
+  currentSection: 0,
+  sections: ["", "First tell us a few things about the work", "Now, let’s find out whether the work is eligible for termination", "Information about the work"],
+  questionTemplate: "\n    <form class=\"question-form\">\n      <div class=\"form-group\">\n        <label class=\"question-label\"></label>\n        <br>\n        <p class=\"help-block\"></p> \n      </div>\n    </form>",
+  createQuestion: function createQuestion() {
+    return jQuery(TotRendering.questionTemplate);
+  },
+  common: function common(config) {
+    var question = TotRendering.createQuestion();
+    // If this is a question in a different section, change the section header
+    // Section is 1-based, so we can use a simple logical and here.
+    if (config.section && config.section != TotRendering.currentSection) {
+      jQuery("#section-title").html(TotRendering.sections[config.section]).fadeIn();
+    }
+    question.find(".question-label").html(config.question);
+    if (config.explanation) {
+      question.find(".help-block").html(config.explanation);
+    }
+    question.css("display", "none");
+    // If we're entering this value for the first time (not via the back button)
+    // and this isn't an optional value
+    // don't let the user continue until they enter a value here.
+    if (TotValues[config.variable] === undefined && !config.optional) {
+      TotNavigation.disableNext();
+    } else {
+      TotNavigation.enableNext();
+    }
+    return question;
+  },
+  radio: function radio(config) {
+    // Multiple choice questions (radio buttons)
+    var question = TotRendering.common(config);
+    var form_group = question.find(".form-group");
+    var name = "input_".concat(config.variable);
+    // If we are returning to this via the back button, get the previous value
+    var existing_value = TotValues[config.variable];
+    var radio_button_values = config.values || ["yes", "no"];
+    radio_button_values.forEach(function (value) {
+      var radio_button = "<label class=\"radio-inline\"><input type=\"radio\" name=\"".concat(name, "\" value=\"").concat(value, "\">").concat(value, "</label>");
+      if (value == existing_value) {
+        radio_button = "<label class=\"radio-inline\"><input type=\"radio\" name=\"".concat(name, "\" checked=\"checked\" value=\"").concat(value, "\">").concat(value, "</label>");
+      }
+      form_group.append(jQuery(radio_button));
+    });
+    // When the user makes a choice, go straight to the next question
+    form_group.find(':input[type="radio"]').on("click", function () {
+      TotNavigation.enableNext();
+      jQuery("#button-question-next").click();
+    });
+    return question;
+  },
+  makeTextLengthHandler: function makeTextLengthHandler(element, min_length, optional) {
+    // text input validator handler
+    return function () {
+      var length = element.val().length;
+      if (optional && length == 0 || length >= min_length) {
+        TotNavigation.enableNext();
+      } else {
+        TotNavigation.disableNext();
+      }
+    };
+  },
+  text: function text(config) {
+    // Text input
+    var question = TotRendering.common(config);
+    var form_group = question.find(".form-group");
+    // const name = "input-" + config.variable;
+    var text_field = jQuery("<input type=\"text\" class=\"form-control text-question\" id=\"".concat(config.variable, "\" placeholder=\"").concat(config.placeholder || "", "\" >"));
+    form_group.append(text_field);
+    // Set the label
+    // const label = question.find(".question-label").prop("for", name);
+    if (TotValues[config.variable]) {
+      form_group.find("text-question").val(TotValues[config.variable]);
+    }
+    var existing_value = TotValues[config.variable];
+    // Ensure next isn't enabled until enough characters are entered
+    var min_length = config.min_length || 4;
+    var text_field_element = question.find(".text-question");
+    var validator = TotRendering.makeTextLengthHandler(text_field_element, min_length, config.optional);
+    text_field_element.on("keyup", validator);
+    text_field_element.on("change", validator);
+    // If we are returning to the field and the value has already been set, use it
+    if (existing_value !== undefined) {
+      text_field.val(TotValues[config.variable]);
+    }
+    return question;
+  },
+  year: function year(config) {
+    // Year input (text subtype)
+    var question = TotRendering.text(config);
+    var text_field = question.find(".text-question");
+    TotValidation.allowOnlyNumbers(text_field);
+    text_field.prop("maxlength", 4);
+    text_field.prop("placeholder", "1977");
+    return question;
+  },
+  render: function render(config) {
+    // Render html UI from config specification
+    var result = undefined;
+    switch (config.input) {
+      case "radio":
+        result = TotRendering.radio(config);
+        break;
+      case "year":
+        result = TotRendering.year(config);
+        break;
+      case "text":
+      // Fall through to default
+      default:
+        result = TotRendering.text(config);
+        break;
+    }
+    return result;
+  },
+  transitionTo: function transitionTo(config) {
+    var question = TotRendering.render(config);
+    jQuery(".question-form").slideUp("fast", function () {
+      jQuery(_this).remove();
+    });
+    jQuery("#question-rendering-area").append(question);
+    question.slideDown("fast");
+  }
+};
\ No newline at end of file
diff --git a/dist/js/rules.js b/dist/js/rules.js
new file mode 100644
index 0000000..7c822c9
--- /dev/null
+++ b/dist/js/rules.js
@@ -0,0 +1,469 @@
+"use strict";
+
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+var TotRules = {};
+TotRules.simpleYesNoRule = function (variable_id, yesValue, noValue) {
+  return function () {
+    var result = undefined;
+    if (TotValues[variable_id] == "yes") {
+      result = yesValue;
+    } else {
+      result = noValue;
+    }
+    return result;
+  };
+};
+TotRules.jumpToFinish = "finish";
+TotRules.conclusion = function (conclusion) {
+  TotValues.conclusion = conclusion;
+  return TotRules.jumpToFinish;
+};
+TotRules.conclusionPDF = function (conclusion) {
+  TotRules.conclusion(conclusion);
+  TotValues.conclusion_generate_pdf = true;
+  return TotRules.jumpToFinish;
+};
+TotRules.addFlag = function (flag) {
+  TotValues.flags.push(flag);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Calculated/inferred properties
+////////////////////////////////////////////////////////////////////////////////
+
+TotRules.is203 = function () {
+  return TotValues.conclusion == "A.iii";
+};
+TotRules.is304 = function () {
+  return ["A.i", "A.ii", "A.i-ii"].indexOf(TotValues.conclusion) > -1;
+};
+TotRules.hasPublicDomainFlags = function () {
+  var result = false;
+  for (var i = 0; i < TotValues.flags.length; i++) {
+    if (TotValues.flags[i][0] == "B") {
+      result = true;
+    }
+  }
+  return result;
+};
+TotRules.beforeEndOfNoticeWindow = function () {
+  return TotValues.notice_end != undefined && TotValues.notice_end >= TotValues.current_year || TotValues.d_notice_end != undefined && TotValues.d_notice_end >= TotValues.current_year || TotValues.p_notice_end != undefined && TotValues.p_notice_end >= TotValues.current_year;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Section N Analyses
+////////////////////////////////////////////////////////////////////////////////
+
+TotRules.section304Analysis = function () {
+  // Note that this is part of the logic from the section 203 analysis
+  var result = "s1q1f";
+  if (TotValues.k_year < 1978) {
+    result = "s2q2a";
+    TotRules.addFlag("F.i");
+    if (TotValues.pub_year > 1977 && TotValues.reg_year > 1977) {
+      result = TotRules.conclusion("B.vii");
+    } else {
+      // Under the 1909 Act, copyright term begins at the earlier of
+      // the registration date and the publication date.
+      // If the work is both registered and published use the minimum of them.
+      if (TotValues.reg_year != undefined && TotValues.pub_year != undefined) {
+        TotValues.cright_year = Math.min(TotValues.pub_year, TotValues.reg_year);
+      }
+      // Otherwise use whichever value is set. One *will* be set here, see top.
+      else {
+        TotValues.cright_year = TotValues.reg_year || TotValues.pub_year;
+      }
+      TotValues.cright_year = Math.min(TotValues.cright_year, 1978);
+      TotValues.term_begin = TotValues.cright_year + 56;
+      TotValues.term_begin = Math.max(TotValues.term_begin, 1978);
+      TotValues.term_end = TotValues.term_begin + 5;
+      TotValues.notice_begin = TotValues.term_begin - 10;
+      TotValues.notice_end = TotValues.term_end - 2;
+      // If the we're presently before the 304(c) window, then we don't have to worry about 304(d)
+      if (TotValues.notice_begin > TotValues.current_year) {
+        TotRules.addFlag("A.i.a");
+        // Following Copyright Office guidance, works copyrighted before 1940 may also be eligible for termination under 304d
+      } else if (TotValues.cright_year < 1940) {
+        TotRules.addFlag("F.ii");
+        TotValues.d_term_begin = TotValues.term_begin + 19;
+        TotValues.d_term_end = TotValues.d_term_begin + 5;
+        TotValues.d_notice_begin = TotValues.d_term_begin - 10;
+        TotValues.d_notice_end = TotValues.d_term_end - 2;
+        if (TotValues.cright_year > 1936) {
+          TotRules.addFlag("G.i");
+        }
+        if (TotValues.cright_year == 1939) {
+          TotRules.addFlag("G.ii.a");
+        }
+        if (TotValues.d_notice_begin > TotValues.current_year) {
+          // time traveler flag -- applies where the present day is between
+          // the 304(c) and 304(d) notice windows
+          TotRules.addFlag("A.iii.a");
+        } else if (TotValues.d_notice_end < TotValues.current_year) {
+          TotRules.addFlag("A.ii.a");
+        }
+      } else if (TotValues.notice_end < TotValues.current_year) {
+        TotRules.addFlag("A.ii.a");
+      } else {
+        // Here for clarity / to reflect decision tree structure
+        // But note that we set it as the result above.
+        result = "s2q2a";
+      }
+    }
+    if (TotValues.d_term_begin != undefined && TotValues.term_begin != undefined) {
+      TotRules.addFlag("E.i");
+    }
+  }
+  return result;
+};
+TotRules.section203Analysis = function () {
+  var result = "s2q2a";
+  if (typeof TotValues.grant_pub_year !== "undefined") {
+    TotRules.addFlag("F.iv");
+  }
+  TotValues.triggering_pub_year = TotValues.grant_pub_year || TotValues.pub_year;
+  if (TotValues.k_year > 1977) {
+    TotRules.addFlag("F.iii");
+    if (TotValues.pub_right == "yes") {
+      if (TotValues.triggering_pub_year != undefined) {
+        TotValues.term_begin = Math.min(TotValues.triggering_pub_year + 35, TotValues.k_year + 40);
+      } else {
+        TotValues.term_begin = TotValues.k_year + 40;
+      }
+    } else if (TotValues.triggering_pub_year != TotValues.k_year || TotValues.pub_right == "no") {
+      TotValues.term_begin = TotValues.k_year + 35;
+    }
+    if (TotValues.term_begin != undefined) {
+      TotValues.term_end = TotValues.term_begin + 5;
+      TotValues.notice_begin = TotValues.term_begin - 10;
+      TotValues.notice_end = TotValues.term_end - 2;
+      if (TotValues.notice_begin > TotValues.current_year) {
+        TotRules.addFlag("A.i.a");
+      } else if (TotValues.notice_end < TotValues.current_year) {
+        TotRules.addFlag("A.ii.a");
+      }
+    }
+    if (TotValues.pub_right == "maybe") {
+      TotValues.p_term_begin = TotValues.k_year + 40;
+      if (TotValues.triggering_pub_year != undefined) {
+        TotValues.p_term_begin = Math.min(TotValues.triggering_pub_year + 35, TotValues.p_term_begin);
+      }
+      TotValues.p_term_end = TotValues.p_term_begin + 5;
+      TotValues.p_notice_begin = TotValues.p_term_begin - 10;
+      TotValues.p_notice_end = TotValues.p_term_end - 2;
+      if (TotValues.p_notice_begin > TotValues.current_year) {
+        TotRules.addFlag("A.i.a");
+      } else if (TotValues.p_notice_end < TotValues.current_year) {
+        TotRules.addFlag("A.ii.a");
+      }
+    }
+  }
+  if (TotValues.p_term_begin != undefined && TotValues.term_begin != undefined) {
+    TotRules.addFlag("E.ii");
+  }
+  return result;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Section 1
+////////////////////////////////////////////////////////////////////////////////
+
+// When was the work created?
+
+TotRules.s1q1a = "s1q1b";
+
+// Has the work been published?
+
+TotRules.s1q1b = TotRules.simpleYesNoRule("work_published", "s1q1bi", "s1q1c");
+
+// When was the work first published?
+
+TotRules.s1q1bi = "s1q1bii";
+
+// When was the work first published under the grant?
+// Note that the condition is based on s1q1b, we are inserting this question
+// after 'When was the work first published?' and *then* going on to the
+// questions about registration/notices or not.
+
+TotRules.s1q1bii = function () {
+  var result = undefined;
+  if (TotValues.pub_year < 1923) {
+    result = TotRules.conclusion("B.viii");
+  } else if (TotValues.pub_year < 1990) result = "s1q1bi2";else {
+    result = "s1q1d";
+  }
+  return result;
+};
+
+// Works from 1989 and earlier usually display a copyright notice...
+
+TotRules.s1q1bi2 = function () {
+  var result = undefined;
+  if (TotValues.copyright_notice == "yes") {
+    result = "s1q1c";
+  } else if (TotValues.copyright_notice == "no") {
+    // The same
+    result = "s1q1c";
+    if (TotValues.pub_year < 1989) {
+      TotRules.addFlag("B.i");
+    } else {
+      TotRules.addFlag("B.ii");
+    }
+  } /* maybe */else {
+    result = "s1q1c";
+    TotRules.addFlag("B.iii");
+  }
+  return result;
+};
+
+// Has the work been registered with the United State Copyright Office?
+
+TotRules.s1q1c = function () {
+  var result = undefined;
+  if (TotValues.work_registered == "yes") {
+    result = "s1q1ci";
+  } else if (TotValues.work_registered == "no") {
+    result = "s1q1d";
+  } /* don't know */else {
+    // If someone doesn't know, continue without asking for registration number
+    result = "s1q1d";
+  }
+  return result;
+};
+
+// When was the work registered with the United States Copyright Office?
+
+TotRules.s1q1ci = function () {
+  var result = undefined;
+  if (TotValues.reg_year < 1923) {
+    result = TotRules.conclusion("B.viii");
+  } else {
+    result = "s1q1d";
+  }
+  return result;
+};
+
+// For s1q1d,
+// What is the date of the agreement or transfer? ...
+
+TotRules.s1q1d = function () {
+  var result = undefined;
+  if (TotValues.user_inputted_k_year != TotValues.k_year) {
+    TotRules.addFlag("H.i");
+  }
+  if (TotValues.k_year < 1978 && TotValues.pub_year == undefined && TotValues.reg_year == undefined) {
+    result = TotRules.conclusion("B.vii");
+  } else {
+    // Intercept the result so we can add encouragement if things look good
+    result = TotRules.section304Analysis();
+    if (result != TotRules.jumpToFinish && TotRules.beforeEndOfNoticeWindow() && !TotRules.hasPublicDomainFlags()) {
+      TotNotifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
+    }
+  }
+  return result;
+};
+
+// Did the agreement or transfer include the right of publication?
+
+TotRules.s1q1f = function () {
+  // Intercept the result so we can add encouragement if things look good
+  var result = TotRules.section203Analysis();
+  if (result != TotRules.jumpToFinish && TotRules.beforeEndOfNoticeWindow() && !TotRules.hasPublicDomainFlags()) {
+    TotNotifications.setEncouragement("Both notice window and copyright status look good, let's get some more details!");
+  }
+  return result;
+};
+TotRules.section203Analysis;
+
+////////////////////////////////////////////////////////////////////////////////
+// Section 2
+////////////////////////////////////////////////////////////////////////////////
+
+// Is the agreement or transfer you want to terminate part of a last will...
+
+TotRules.s2q2a = function () {
+  var result = undefined;
+  if (TotValues.last_will == "yes") {
+    result = TotRules.conclusion("B.iv");
+  } else {
+    if (TotValues.creation_year > 1977 || (TotValues.pub_year == undefined || TotValues.pub_year > 1977) && (TotValues.reg_year == undefined || TotValues.reg_year > 1977)) {
+      result = "s2q2bi";
+    } else {
+      result = "s2q2c";
+    }
+  }
+  return result;
+};
+
+// Are any of the authors still alive?
+// It's i) because the conditional logic that starts b is included in a
+
+TotRules.s2q2bi = function () {
+  var result = undefined;
+  if (TotValues.any_authors_alive == "yes") {
+    result = "s2q2c";
+  } else {
+    result = "s2q2bi2";
+  }
+  return result;
+};
+
+// What is the year the last surviving author died?
+
+TotRules.s2q2bi2 = function () {
+  var result = undefined;
+  // creation_year is always set, pub_year may not be, death will be here
+  if (TotValues.creation_year > 1977) {
+    TotValues.pd = TotValues.death + 71;
+  } else if (TotValues.pub_year != undefined && TotValues.pub_year < 2003) {
+    TotValues.pd = Math.max(TotValues.death + 71, 2048);
+  } else {
+    TotValues.pd = Math.max(TotValues.death + 71, 2003);
+  }
+  // pd *will* have been set in the if/else block
+  if (TotValues.current_year > TotValues.pd) {
+    result = TotRules.conclusion("B.viii");
+  } else {
+    result = "s2q2c";
+  }
+  return result;
+};
+
+// Was the work created within the scope of the author’s employment?
+
+TotRules.s2q2c = function () {
+  var result = undefined;
+  if (TotValues.within_scope_of_employment == "yes") {
+    if (TotValues.creation_year > 1977) {
+      result = "s2q2ci";
+    } else {
+      result = TotRules.conclusion("B.i");
+    }
+  } else {
+    result = "s2q2d";
+  }
+  return result;
+};
+
+// Was there an express agreement between you...
+
+TotRules.s2q2ci = function () {
+  var result = undefined;
+  if (TotValues.express_agreement == "yes") {
+    result = "s2q2d";
+  } else {
+    result = TotRules.conclusion("B.i");
+  }
+  return result;
+};
+
+// Was the work created in response to a special order or commission?
+
+TotRules.s2q2d = function () {
+  var result = undefined;
+  if (TotValues.special_order == "yes") {
+    if (TotValues.creation_year < 1978) {
+      TotRules.addFlag("D.i");
+      result = "s2q2e";
+    } else {
+      result = "s2q2di";
+    }
+  } else {
+    result = "s2q2e";
+  }
+  return result;
+};
+
+// Was there a signed written agreement regarding the special order...
+
+TotRules.s2q2di = function () {
+  var result = undefined;
+  if (TotValues.signed_written_agreement == "yes") {
+    if (TotValues.creation_year < 1978) {
+      result = TotRules.conclusion("B.iii");
+    } else {
+      result = "s2q2dia";
+    }
+  } else {
+    result = "s2q2e";
+  }
+  return result;
+};
+
+// Was the work created for use as one of the following? ...
+
+TotRules.s2q2dia = function () {
+  var result = undefined;
+  if (TotValues.created_as_part_of_motion_picture == "yes") {
+    result = TotRules.conclusion("C.ii");
+  } else if (TotValues.created_as_part_of_motion_picture == "no") {
+    result = "s2q2e";
+  } /* don't know */else {
+    TotRules.addFlag("D.ii");
+    result = "s2q2e";
+  }
+  return result;
+};
+
+// Has the original transfer since been renegotiated or altered?
+
+TotRules.s2q2e = function () {
+  var result = "s2q2f";
+  if (TotValues.renego == "yes") {
+    TotRules.addFlag("C.i");
+  } else if (TotValues.renego == "no") {
+    // Continue
+  } /* don't know */else {
+    TotRules.addFlag("C.ii");
+  }
+  return result;
+};
+
+// Did one or more of the authors or artists enter into the agreement...
+
+TotRules.s2q2f = function () {
+  var result = undefined;
+  if (TotValues.authors_entered_agreement == "yes") {
+    if (TotValues.k_year < 1978) {
+      result = TotRules.conclusionPDF("A.i-ii");
+    } /*if (k_year > 1977)*/else {
+      result = TotRules.conclusionPDF("A.iii");
+    }
+  } else {
+    if (TotValues.k_year < 1978) {
+      result = "s2q2fii";
+    } /*if (TotValues.k_year > 1977)*/else {
+      result = TotRules.conclusion("B.vi");
+    }
+  }
+  return result;
+};
+
+// Was the agreement or transfer made by a member of...
+
+TotRules.s2q2fii = function () {
+  var result = undefined;
+  if (TotValues.agreement_by_family_or_executor) {
+    result = TotRules.conclusionPDF("A.i-ii");
+  } else {
+    result = TotRules.conclusion("B.v");
+  }
+  return result;
+};
\ No newline at end of file
diff --git a/dist/js/validation.js b/dist/js/validation.js
new file mode 100644
index 0000000..5abd5e7
--- /dev/null
+++ b/dist/js/validation.js
@@ -0,0 +1,69 @@
+"use strict";
+
+var _this = void 0;
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// TotValidation of values and of UI state
+////////////////////////////////////////////////////////////////////////////////
+
+var TotValidation = {};
+
+// Naughty. If we're going to monkeypatch we should have a file for these
+
+String.prototype.capitalizeFirstLetter = function () {
+  return _this.charAt(0).toUpperCase() + _this.slice(1);
+};
+TotValidation.allowOnlyNumbers = function (element) {
+  // http://stackoverflow.com/a/995193
+  element.keydown(function (e) {
+    // Allow: backspace, delete, tab, escape, enter and .
+    if (jQuery.inArray(e.keyCode, [46, 8, 9, 27, 13, 110, 190]) !== -1 ||
+    // Allow: Ctrl+A, Command+A
+    e.keyCode == 65 && (e.ctrlKey === true || e.metaKey === true) ||
+    // Allow: home, end, left, right, down, up
+    e.keyCode >= 35 && e.keyCode <= 40) {
+      // let it happen, don't do anything
+      return;
+    }
+    // Ensure that it is a number and stop the keypress
+    if ((e.shiftKey || e.keyCode < 48 || e.keyCode > 57) && (e.keyCode < 96 || e.keyCode > 105)) {
+      e.preventDefault();
+    }
+  });
+};
+
+// false here means no errors, a string means errors
+
+TotValidation.validDate = function () {
+  var text_field = jQuery(".text-question");
+  var date = text_field.val();
+  var result = false;
+  var errors = [];
+  if (!date.match(/[0-9]{4}/)) {
+    errors.push("date must be four digits");
+  }
+  if (parseInt(date) > TotValues.current_year) {
+    errors.push("date must be in the past");
+  }
+  if (errors.length != 0) {
+    result = "".concat(errors.join().capitalizeFirstLetter(), ".");
+  }
+  return result;
+};
\ No newline at end of file
diff --git a/dist/js/values.js b/dist/js/values.js
new file mode 100644
index 0000000..d6797e3
--- /dev/null
+++ b/dist/js/values.js
@@ -0,0 +1,71 @@
+"use strict";
+
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Storing answers and computed values
+// Questions save their answers here,
+// Rules consult these values and add their own.
+////////////////////////////////////////////////////////////////////////////////
+
+var TotValues = {};
+TotValues.reset = function () {
+  var now = new Date();
+  TotValues = {
+    current_date: now,
+    current_year: now.getFullYear(),
+    flags: []
+  };
+};
+
+//FIXME: Hello namespace pollution
+
+var totVarsToTitles = {
+  work_authors: "Author",
+  work_title: "Title of Work",
+  creation_year: "Creation Year",
+  pub_year: "Publication Year",
+  grant_pub_year: "Publication Year Under Grant",
+  triggering_pub_year: "Triggering Publication Date",
+  k_year: "Effective Grant Year",
+  user_inputted_k_year: "User Entered Grant Year",
+  reg_year: "Copyright Registration Year",
+  work_copyright_reg_num: "Registration Number",
+  termination_type: "Termination Type",
+  work_agreement_type: "Agreement or Transfer Type",
+  work_agreement_desc: "Agreement or Transfer Description"
+  //'': 'Grantor',
+};
+
+var ValuesStack = {};
+ValuesStack._stack = [];
+ValuesStack.height = function () {
+  return ValuesStack._stack.length;
+};
+ValuesStack.push = function () {
+  // Handle the date not liking being serialized.
+  var now = TotValues.current_date;
+  ValuesStack._stack.push(TotValues);
+  // Deep clone
+  TotValues = JSON.parse(JSON.stringify(TotValues));
+  TotValues.current_date = now;
+};
+ValuesStack.pop = function () {
+  TotValues = ValuesStack._stack.pop();
+};
\ No newline at end of file
diff --git a/dist/js/widgets.js b/dist/js/widgets.js
new file mode 100644
index 0000000..417b84e
--- /dev/null
+++ b/dist/js/widgets.js
@@ -0,0 +1,134 @@
+"use strict";
+
+/*
+    Termination of Transfer - tool to help in returning authors rights.
+    Copyright (C) 2016  Creative Commons Corporation.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// Control of the html UI
+////////////////////////////////////////////////////////////////////////////////
+
+//var Widgets = {};
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual display of the user's responses
+////////////////////////////////////////////////////////////////////////////////
+
+var TotAnswers = {};
+TotAnswers.resetAnswers = function () {
+  jQuery("#answers-table-rows").empty();
+};
+TotAnswers.appendAnswer = function (myId, label, value) {
+  if (!label) {
+    label = jQuery("#".concat(myId)).parent().find("label").first().text();
+  }
+  // If the user has gone back and is changing the answer, first remove it
+  TotAnswers.removeAnswer(myId);
+  jQuery("#answers-table-rows").append("<tr id=\"answer-row-".concat(myId, "\"><td>").concat(label, "</td><td align=\"right\">").concat(value, "</td></tr>"));
+};
+TotAnswers.removeAnswer = function (myId) {
+  jQuery("#answer-row-".concat(myId)).remove();
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Notifications and other notices
+////////////////////////////////////////////////////////////////////////////////
+
+var TotNotifications = {};
+TotNotifications.clearAlerts = function () {
+  jQuery("#alert-area").empty();
+};
+TotNotifications.setAlert = function (message) {
+  TotNotifications.clearAlerts();
+  jQuery("#alert-area").append("<div class=\"alert alert-warning\" role=\"alert\">".concat(message, "</div>"));
+};
+TotNotifications.setEncouragement = function (message) {
+  TotNotifications.clearAlerts();
+  jQuery("#alert-area").append("<div class=\"alert alert-success\" role=\"alert\">".concat(message, "</div>"));
+};
+TotNotifications.displayAnswersHint = function () {
+  jQuery("#answers-table-rows").append('<tr id="answers-table-row-placeholder"><td>As you respond to the questions we\'ll save the answers here.</td></tr>');
+};
+TotNotifications.removeAnswersHint = function () {
+  jQuery("#answers-table-row-placeholder").remove();
+};
+TotNotifications.displayResultArea = function () {
+  jQuery("#result-area").removeClass("hidden");
+};
+TotNotifications.hideResultArea = function () {
+  jQuery("#result-area").addClass("hidden");
+};
+TotNotifications.setResultAreaMessage = function (obj, panelClass) {
+  jQuery("#result-area").addClass(panelClass);
+  jQuery("#result-area-title").html(obj.title);
+  jQuery("#result-area-message").html(obj.description);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Navigation of questions
+////////////////////////////////////////////////////////////////////////////////
+
+var TotNavigation = {};
+var progressStack = [];
+
+// These return true so we can use them as "handlers" in simpleNextQuestion
+
+TotNavigation.disableNext = function () {
+  jQuery("#button-question-next").prop("disabled", true);
+  return true;
+};
+TotNavigation.disablePrevious = function () {
+  jQuery("#button-question-back").prop("disabled", true);
+  return true;
+};
+TotNavigation.enableNext = function () {
+  jQuery("#button-question-next").prop("disabled", false);
+  return true;
+};
+TotNavigation.enablePrevious = function () {
+  jQuery("#button-question-back").prop("disabled", false);
+  return true;
+};
+TotNavigation.showNextPrevious = function () {
+  jQuery("#question-progress-buttons").removeClass("hidden");
+};
+TotNavigation.hideQuestions = function () {
+  jQuery("#questionnaire-section").addClass("hidden");
+  jQuery(".form-group").addClass("hidden");
+};
+TotNavigation.showQuestions = function () {
+  jQuery("#questionnaire-section").removeClass("hidden");
+  jQuery(".form-group").removeClass("hidden");
+};
+TotNavigation.hideNoJSWarning = function () {};
+TotNavigation.showAnswersTable = function () {
+  jQuery("#answers-table").removeClass("hidden");
+};
+
+// After this, do not restart the questionnaire, reload the page to restart
+
+TotNavigation.finishQuestions = function () {
+  TotNavigation.hideQuestions();
+  TotNotifications.displayResultArea();
+  TotNavigation.disableNext();
+  jQuery("#button-restart").removeClass("hidden");
+};
+TotNavigation.unfinishQuestions = function () {
+  TotNavigation.showQuestions();
+  TotNotifications.hideResultArea();
+  jQuery("#button-restart").addClass("hidden");
+};
\ No newline at end of file

From c99665e011bc823cb12635f2113dfd1da8c69b9c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 10:58:17 +0100
Subject: [PATCH 160/196] updated assets dir

---
 assets/js/questions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index e8254dc..2de54d9 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -374,9 +374,9 @@ TotQuestions.resultMap = undefined;
 
 jQuery
   .getJSON(
-    jQuery("script[src*='/termination-of-transfer/assets/js/questions.js']")
+    jQuery("script[src*='/termination-of-transfer/dist/js/questions.js']")
       .attr("src")
-      .replace(/questions\.js.*$/, "") + "results.json",
+      .replace(/dist\/js\/questions\.js.*$/, "") + "assets/js/results.json",
   )
   .done((result) => {
     resultMap = result;

From 876446da1c95051f351f1cac24e46098cb4eb1b9 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 11:11:44 +0100
Subject: [PATCH 161/196] build js assets

---
 dist/js/questions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/js/questions.js b/dist/js/questions.js
index 30cfc75..2b2915a 100644
--- a/dist/js/questions.js
+++ b/dist/js/questions.js
@@ -339,7 +339,7 @@ TotQuestions.resultMap = undefined;
 // Asynchronous fetch of data that is accessed synchronously.
 // This data won't be used until after several questions, so this is tolerable.
 
-jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/assets/js/questions.js']").attr("src").replace(/questions\.js.*$/, "") + "results.json").done(function (result) {
+jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/dist/js/questions.js']").attr("src").replace(/dist\/js\/questions\.js.*$/, "") + "assets/js/results.json").done(function (result) {
   resultMap = result;
 }).fail(function (jqxhr, textStatus, error) {
   var err = textStatus + ", " + error;

From e6808247cadd74bd8b8a347d06da0303a6586582 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 11:22:12 +0100
Subject: [PATCH 162/196] fixed undefined variable

---
 assets/js/questions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/questions.js b/assets/js/questions.js
index 2de54d9..041ca85 100644
--- a/assets/js/questions.js
+++ b/assets/js/questions.js
@@ -379,7 +379,7 @@ jQuery
       .replace(/dist\/js\/questions\.js.*$/, "") + "assets/js/results.json",
   )
   .done((result) => {
-    resultMap = result;
+    TotQuestions.resultMap = result;
   })
   .fail((jqxhr, textStatus, error) => {
     const err = textStatus + ", " + error;
@@ -388,7 +388,7 @@ jQuery
 
 TotQuestions.getConclusionDetails = (specifier) => {
   const path = specifier.split(".");
-  const result = resultMap["Conclusion"][path[0]][path[1]];
+  const result = TotQuestions.resultMap["Conclusion"][path[0]][path[1]];
   return result;
 };
 

From 4f24c9679a8f8d51624565831bd7a53de38229c0 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Wed, 19 Oct 2022 11:23:06 +0100
Subject: [PATCH 163/196] build js assets

---
 dist/js/questions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/js/questions.js b/dist/js/questions.js
index 2b2915a..4ee3072 100644
--- a/dist/js/questions.js
+++ b/dist/js/questions.js
@@ -340,14 +340,14 @@ TotQuestions.resultMap = undefined;
 // This data won't be used until after several questions, so this is tolerable.
 
 jQuery.getJSON(jQuery("script[src*='/termination-of-transfer/dist/js/questions.js']").attr("src").replace(/dist\/js\/questions\.js.*$/, "") + "assets/js/results.json").done(function (result) {
-  resultMap = result;
+  TotQuestions.resultMap = result;
 }).fail(function (jqxhr, textStatus, error) {
   var err = textStatus + ", " + error;
   console.log("Request Failed: " + err);
 });
 TotQuestions.getConclusionDetails = function (specifier) {
   var path = specifier.split(".");
-  var result = resultMap["Conclusion"][path[0]][path[1]];
+  var result = TotQuestions.resultMap["Conclusion"][path[0]][path[1]];
   return result;
 };
 

From e46cdecff30c102a2f6a500dbc294efba3612e52 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Fri, 21 Oct 2022 11:04:41 +0100
Subject: [PATCH 164/196] created dev directory for development and deploying
 as per reviewed comment and moved Dockerfile into it

---
 Dockerfile => dev/Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Dockerfile => dev/Dockerfile (100%)

diff --git a/Dockerfile b/dev/Dockerfile
similarity index 100%
rename from Dockerfile
rename to dev/Dockerfile

From b97814ab4f975cb36683e65466ac74d3e918bde5 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 11:07:11 +0100
Subject: [PATCH 165/196] moved docker-composer.dev.yml file into newly created
 dev folder

---
 docker-compose.dev.yml => dev/docker-compose.dev.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docker-compose.dev.yml => dev/docker-compose.dev.yml (100%)

diff --git a/docker-compose.dev.yml b/dev/docker-compose.dev.yml
similarity index 100%
rename from docker-compose.dev.yml
rename to dev/docker-compose.dev.yml

From 4f715306d1acca8a0d185d812cc55edfa9be32af Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 11:08:39 +0100
Subject: [PATCH 166/196] renamed docker-composer.dev.yml file to
 docker-compose.yml

---
 dev/{docker-compose.dev.yml => docker-compose.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dev/{docker-compose.dev.yml => docker-compose.yml} (100%)

diff --git a/dev/docker-compose.dev.yml b/dev/docker-compose.yml
similarity index 100%
rename from dev/docker-compose.dev.yml
rename to dev/docker-compose.yml

From abd152e4c32370944912a2505f71428295d7797e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 11:09:55 +0100
Subject: [PATCH 167/196] changed docker compose version to 3.2

---
 dev/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 9b90480..d8d6a61 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '3.2'
 
 services:
  wp:

From 41febaba29f0f39a6a062264bd2923f77df8e967 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 11:33:12 +0100
Subject: [PATCH 168/196] moved compposer-fix.sh to dev folder

---
 composer-fix.sh => dev/composer-fix.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename composer-fix.sh => dev/composer-fix.sh (100%)
 mode change 100755 => 100644

diff --git a/composer-fix.sh b/dev/composer-fix.sh
old mode 100755
new mode 100644
similarity index 100%
rename from composer-fix.sh
rename to dev/composer-fix.sh

From 0f0568b810a9c75268cdfa813353dce74f5bd8b1 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 12:17:45 +0100
Subject: [PATCH 169/196] updated docker-compose.yml to reflect version change

---
 dev/docker-compose.yml | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index d8d6a61..eda2fe1 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -7,30 +7,31 @@ services:
   restart: always
   environment:
     WORDPRESS_DEBUG: 1
-    WORDPRESS_DB_HOST: 192.168.128.2
+    WORDPRESS_DB_HOST: mariadb
     WORDPRESS_DB_NAME: wordpress
-    WORDPRESS_DB_PASSWORD: SqlNotTooMuch
-    WORDPRESS_DB_USER: codex
+    WORDPRESS_DB_PASSWORD: dbPassword
+    WORDPRESS_DB_USER: dbUsername
   ports:
    - 8701:80
-  networks:
-    server:
+  links:
+    - mariadb:mysql
   volumes:
    - composer-fix.sh:/var/www/html/composer-fix.sh
    - ./:/var/www/html/wp-content/plugins/termination-of-transfer
+  depends_on:
+    - mariadb
   entrypoint: chmod +x composer-fix.sh && ./composer-fix.sh
 
  mariadb:
+  container_name: 'tot-mariadb'
   image: mariadb
   restart: always
-  networks:
-    server:
   environment:
-    MARIADB_ROOT_PASSWORD: NotTooMuch
-    MARIADB_USER: codex
-    MARIADB_PASSWORD: SqlNotTooMuch
+    MARIADB_ROOT_PASSWORD: rootPassword
+    MARIADB_USER: dbUsername
+    MARIADB_PASSWORD: dbPassword
   volumes:
-   - sql:/var/lib/mysql
+    - sql:/var/lib/mysql
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
 
  phpmyadmin:
@@ -38,14 +39,14 @@ services:
    restart: always
    ports:
     - 3010:80
+   links:
+    - mariadb:mysql
    environment:
     - PMA_ARBITRARY=0
     #- PMA_PORT=3006
-    - PMA_HOST=192.168.128.2
-   networks:
-    server:
+    #- PMA_HOST=192.168.128.2
+   depends_on:
+    - mariadb
 
 volumes:
- sql:
-networks:
-  server:
\ No newline at end of file
+ sql:
\ No newline at end of file

From d37bdff3539b6a620849e9f6b309cca2342ab42a Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 15:25:03 +0100
Subject: [PATCH 170/196] changed server maraidb to db

---
 dev/docker-compose.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index eda2fe1..45751b2 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -7,22 +7,22 @@ services:
   restart: always
   environment:
     WORDPRESS_DEBUG: 1
-    WORDPRESS_DB_HOST: mariadb
+    WORDPRESS_DB_HOST: db
     WORDPRESS_DB_NAME: wordpress
     WORDPRESS_DB_PASSWORD: dbPassword
     WORDPRESS_DB_USER: dbUsername
   ports:
    - 8701:80
   links:
-    - mariadb:mysql
+    - db:mysql
   volumes:
    - composer-fix.sh:/var/www/html/composer-fix.sh
    - ./:/var/www/html/wp-content/plugins/termination-of-transfer
   depends_on:
-    - mariadb
+    - db
   entrypoint: chmod +x composer-fix.sh && ./composer-fix.sh
 
- mariadb:
+ db:
   container_name: 'tot-mariadb'
   image: mariadb
   restart: always
@@ -40,13 +40,13 @@ services:
    ports:
     - 3010:80
    links:
-    - mariadb:mysql
+    - db:mysql
    environment:
     - PMA_ARBITRARY=0
     #- PMA_PORT=3006
     #- PMA_HOST=192.168.128.2
    depends_on:
-    - mariadb
+    - db
 
 volumes:
  sql:
\ No newline at end of file

From c0b2f7de6c191193f8f6981e4d0710988081718f Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 15:40:57 +0100
Subject: [PATCH 171/196] updated Dockerfile copy path

---
 dev/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/Dockerfile b/dev/Dockerfile
index 3a96aea..5e90a2b 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install apt-utils zip unzip -y
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 # copy all the files in this folder to plugins directory
-COPY . /var/www/html/wp-content/plugins/termination-of-transfer
+COPY ../. /var/www/html/wp-content/plugins/termination-of-transfer
 
 # cd to plugin directory AND install plugin dependencies
 RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install

From 88b51b848b6ce94b4b6d63096536a88920a2a30e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 15:48:02 +0100
Subject: [PATCH 172/196] updated service.wp volumn path

---
 dev/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 45751b2..8678696 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     - db:mysql
   volumes:
    - composer-fix.sh:/var/www/html/composer-fix.sh
-   - ./:/var/www/html/wp-content/plugins/termination-of-transfer
+   - .././:/var/www/html/wp-content/plugins/termination-of-transfer
   depends_on:
     - db
   entrypoint: chmod +x composer-fix.sh && ./composer-fix.sh

From b6cd5c874b52539c558175d801af6db0319292d5 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 16:02:45 +0100
Subject: [PATCH 173/196] updated Dockerfile copy path

---
 dev/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/Dockerfile b/dev/Dockerfile
index 5e90a2b..3a96aea 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install apt-utils zip unzip -y
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 # copy all the files in this folder to plugins directory
-COPY ../. /var/www/html/wp-content/plugins/termination-of-transfer
+COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 
 # cd to plugin directory AND install plugin dependencies
 RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install

From f7e6a8fc36e67709225e6d698716553c57583a7a Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 16:03:21 +0100
Subject: [PATCH 174/196] moved Dockerfile back to root directory

---
 dev/Dockerfile => Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dev/Dockerfile => Dockerfile (100%)

diff --git a/dev/Dockerfile b/Dockerfile
similarity index 100%
rename from dev/Dockerfile
rename to Dockerfile

From efd4e8348286b0cd0bc8ef50336e376ae37dd563 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 16:23:58 +0100
Subject: [PATCH 175/196] allow composer to install with root user

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 3a96aea..31662c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,5 +12,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 # copy all the files in this folder to plugins directory
 COPY . /var/www/html/wp-content/plugins/termination-of-transfer
 
+# allow root user so composer can install dependencies without having root user error
+RUN export COMPOSER_ALLOW_SUPERUSER=1;
+
 # cd to plugin directory AND install plugin dependencies
 RUN cd /var/www/html/wp-content/plugins/termination-of-transfer && composer install

From c91772aa89afb2a22339129d66b148dcc2262fe9 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 16:25:41 +0100
Subject: [PATCH 176/196] updated build context path

---
 dev/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 8678696..72351e6 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.2'
 services:
  wp:
   build:
-   context: .
+   context: ../
   restart: always
   environment:
     WORDPRESS_DEBUG: 1

From d8ba2dcc576275a2e281c9e900ec804f346bca88 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelonyijne@gmail.com>
Date: Fri, 21 Oct 2022 16:41:15 +0100
Subject: [PATCH 177/196] removed composer-fix.sh since its no longer in use

---
 dev/composer-fix.sh    | 11 -----------
 dev/docker-compose.yml |  2 --
 2 files changed, 13 deletions(-)
 delete mode 100644 dev/composer-fix.sh

diff --git a/dev/composer-fix.sh b/dev/composer-fix.sh
deleted file mode 100644
index d44b993..0000000
--- a/dev/composer-fix.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ -d /var/www/html/wp-content/plugins/termination-of-transfer ]; then
-  
-   # change directory
-   cd /var/www/html/wp-content/plugins/termination-of-transfer
-
-   # ensure dependencies are installed
-   composer update
-
-fi
\ No newline at end of file
diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 72351e6..af97b0f 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -16,11 +16,9 @@ services:
   links:
     - db:mysql
   volumes:
-   - composer-fix.sh:/var/www/html/composer-fix.sh
    - .././:/var/www/html/wp-content/plugins/termination-of-transfer
   depends_on:
     - db
-  entrypoint: chmod +x composer-fix.sh && ./composer-fix.sh
 
  db:
   container_name: 'tot-mariadb'

From 3546d5be376c6371978d69d31a0719367326b771 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 16:23:56 +0100
Subject: [PATCH 178/196] exclude dev directory from container

---
 .dockerignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..ed874e9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+# exclude dev directory from container
+dev
\ No newline at end of file

From ceb8bdb09cce137ec50d2dfbb891c376a74d3e1e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 17:31:51 +0100
Subject: [PATCH 179/196] locked php dependencies

---
 composer.lock | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 193 insertions(+)
 create mode 100644 composer.lock

diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..fc89c42
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,193 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "c7b180543aade87b3b7942f30dc807f7",
+    "packages": [
+        {
+            "name": "mpdf/mpdf",
+            "version": "v6.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mpdf/mpdf.git",
+                "reference": "7f138bf7508eac895ac2c13d2509b056ac7e7e97"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/7f138bf7508eac895ac2c13d2509b056ac7e7e97",
+                "reference": "7f138bf7508eac895ac2c13d2509b056ac7e7e97",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=5.4.0",
+                "setasign/fpdi": "1.6.*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.7"
+            },
+            "suggest": {
+                "ext-zlib": "Needed for compression of embedded resources, such as fonts"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "mpdf.php",
+                    "classes"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Ian Back",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A PHP class to generate PDF files from HTML with Unicode/UTF-8 and CJK support",
+            "homepage": "http://mpdf.github.io",
+            "keywords": [
+                "pdf",
+                "php",
+                "utf-8"
+            ],
+            "support": {
+                "docs": "http://mpdf.github.io",
+                "issues": "https://github.com/mpdf/mpdf/issues",
+                "source": "https://github.com/mpdf/mpdf"
+            },
+            "time": "2016-12-12T10:42:18+00:00"
+        },
+        {
+            "name": "setasign/fpdi",
+            "version": "1.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Setasign/FPDI.git",
+                "reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6ad58897a6d97cc2d2cd2adaeda343b25a368ea",
+                "reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea",
+                "shasum": ""
+            },
+            "suggest": {
+                "setasign/fpdf": "FPDI will extend this class but as it is also possible to use \"tecnickcom/tcpdf\" as an alternative there's no fixed dependency configured.",
+                "setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.",
+                "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF."
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "filters/",
+                    "fpdi.php",
+                    "fpdf_tpl.php",
+                    "fpdi_pdf_parser.php",
+                    "pdf_context.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Slabon",
+                    "email": "jan.slabon@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                }
+            ],
+            "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
+            "homepage": "https://www.setasign.com/fpdi",
+            "keywords": [
+                "fpdf",
+                "fpdi",
+                "pdf"
+            ],
+            "support": {
+                "issues": "https://github.com/Setasign/FPDI/issues",
+                "source": "https://github.com/Setasign/FPDI/tree/master"
+            },
+            "time": "2017-05-11T14:25:49+00:00"
+        },
+        {
+            "name": "smarty/smarty",
+            "version": "v3.1.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "a09364fe1706cb465e910eb040e592053d7effb8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/a09364fe1706cb465e910eb040e592053d7effb8",
+                "reference": "a09364fe1706cb465e910eb040e592053d7effb8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.2 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
+                "smarty/smarty-lexer": "^3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "libs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "http://www.smarty.net",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "forum": "http://www.smarty.net/forums/",
+                "irc": "irc://irc.freenode.org/smarty",
+                "issues": "https://github.com/smarty-php/smarty/issues",
+                "source": "https://github.com/smarty-php/smarty/tree/v3.1.47"
+            },
+            "time": "2022-09-14T11:29:00+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "dev",
+    "stability-flags": [],
+    "prefer-stable": true,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=7.4"
+    },
+    "platform-dev": [],
+    "plugin-api-version": "2.3.0"
+}

From d7d5946fd413026a735447861e80fcff6a2ff094 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 19:15:04 +0100
Subject: [PATCH 180/196] added dbsetup service to automate db setup

---
 dev/docker-compose.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index af97b0f..d4d2024 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -31,6 +31,13 @@ services:
   volumes:
     - sql:/var/lib/mysql
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
+ 
+ dbsetup:
+  image: mariadb
+  depends_on:
+    - db
+  restart: "no"
+  entrypoint: [ "bash", "-c", "sleep 10 && mysql -p=rootPassword -u \"root\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
  phpmyadmin:
    image: phpmyadmin

From aed2a884541a585302227f7de79a0617363a317b Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 19:19:31 +0100
Subject: [PATCH 181/196] linked db to dbsetup

---
 dev/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index d4d2024..1d6d367 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -37,6 +37,8 @@ services:
   depends_on:
     - db
   restart: "no"
+  links:
+    - db:mysql
   entrypoint: [ "bash", "-c", "sleep 10 && mysql -p=rootPassword -u \"root\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
  phpmyadmin:

From e62f2fc270fffcc9aaf13225d37b8c37a7b49245 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 19:26:42 +0100
Subject: [PATCH 182/196] added hostname to db service

---
 dev/docker-compose.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 1d6d367..70fedd9 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -22,6 +22,7 @@ services:
 
  db:
   container_name: 'tot-mariadb'
+  hostname: db
   image: mariadb
   restart: always
   environment:
@@ -39,7 +40,7 @@ services:
   restart: "no"
   links:
     - db:mysql
-  entrypoint: [ "bash", "-c", "sleep 10 && mysql -p=rootPassword -u \"root\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
+  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -p=rootPassword -u \"root\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
  phpmyadmin:
    image: phpmyadmin

From 4dee431ec7c92912a8e4a5eb905589905a38bf7c Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 19:29:52 +0100
Subject: [PATCH 183/196] removed phpmyadmin service

---
 dev/docker-compose.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 70fedd9..55fbd8a 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -42,19 +42,5 @@ services:
     - db:mysql
   entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -p=rootPassword -u \"root\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
- phpmyadmin:
-   image: phpmyadmin
-   restart: always
-   ports:
-    - 3010:80
-   links:
-    - db:mysql
-   environment:
-    - PMA_ARBITRARY=0
-    #- PMA_PORT=3006
-    #- PMA_HOST=192.168.128.2
-   depends_on:
-    - db
-
 volumes:
  sql:
\ No newline at end of file

From 8f064af37bbb6f4053bafab1150d84edc3595b95 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 19:37:26 +0100
Subject: [PATCH 184/196] restructure dbsetup service

---
 dev/docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 55fbd8a..ac14c5a 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -35,12 +35,12 @@ services:
  
  dbsetup:
   image: mariadb
-  depends_on:
-    - db
   restart: "no"
   links:
     - db:mysql
-  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -p=rootPassword -u \"root\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
+  depends_on:
+    - db
+  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -u \"root\" -p=rootPassword -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
 volumes:
  sql:
\ No newline at end of file

From 4667345051b7da340e90222679966fa206acc482 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 19:52:10 +0100
Subject: [PATCH 185/196] added my.cnf to fix access denied issue for root

---
 dev/my.cnf | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 dev/my.cnf

diff --git a/dev/my.cnf b/dev/my.cnf
new file mode 100644
index 0000000..02ee260
--- /dev/null
+++ b/dev/my.cnf
@@ -0,0 +1,139 @@
+#
+# These groups are read by MariaDB server.
+# Use it for options that only the server (but not clients) should see
+#
+# See the examples of server my.cnf files in /usr/share/mysql/
+#
+
+# this is read by the standalone daemon and embedded servers
+[server]
+
+# this is only for the mysqld standalone daemon
+[mysqld]
+
+#
+# * Basic Settings
+#
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+lc-messages-dir	= /usr/share/mysql
+skip-external-locking
+
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address		= 0.0.0.0
+
+#
+# * Fine Tuning
+#
+key_buffer_size		= 16M
+max_allowed_packet	= 16M
+thread_stack		= 192K
+thread_cache_size       = 8
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+myisam_recover_options  = BACKUP
+#max_connections        = 100
+#table_cache            = 64
+#thread_concurrency     = 10
+
+#
+# * Query Cache Configuration
+#
+query_cache_limit	= 1M
+query_cache_size        = 16M
+
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+#
+# Error log - should be very few entries.
+#
+log_error = /var/log/mysql/error.log
+#
+# Enable the slow query log to see queries with especially long duration
+#slow_query_log_file	= /var/log/mysql/mariadb-slow.log
+#long_query_time = 10
+#log_slow_rate_limit	= 1000
+#log_slow_verbosity	= query_plan
+#log-queries-not-using-indexes
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id		= 1
+#log_bin			= /var/log/mysql/mysql-bin.log
+expire_logs_days	= 10
+max_binlog_size   = 100M
+#binlog_do_db		= include_database_name
+#binlog_ignore_db	= exclude_database_name
+
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates you can use for example the GUI tool "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+#
+# Accept only connections using the latest and most secure TLS protocol version.
+# ..when MariaDB is compiled with OpenSSL:
+# ssl-cipher=TLSv1.2
+# ..when MariaDB is compiled with YaSSL (default in Debian):
+# ssl=on
+
+#
+# * Character sets
+#
+# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full
+# utf8 4-byte character set. See also client.cnf
+#
+character-set-server  = utf8mb4
+collation-server      = utf8mb4_general_ci
+
+#
+# * Unix socket authentication plugin is built-in since 10.0.22-6
+#
+# Needed so the root database user can authenticate without a password but
+# only when running as the unix root user.
+#
+# Also available for other users if required.
+# See https://mariadb.com/kb/en/unix_socket-authentication-plugin/
+
+# this is only for embedded server
+[embedded]
+
+# This group is only read by MariaDB servers, not by MySQL.
+# If you use the same .cnf file for MySQL and MariaDB,
+# you can put MariaDB-only options here
+[mariadb]
+
+# This group is only read by MariaDB-10.1 servers.
+# If you use the same .cnf file for MariaDB of different versions,
+# use this group for options that older servers don't understand
+[mariadb-10.1]
+
+#client login details
+[client]
+user = root
+password = rootPassword
\ No newline at end of file

From 0d01b483b1fe5a958a7862980da7a013ef40dbf0 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 19:53:19 +0100
Subject: [PATCH 186/196] added my.cnf to volume in dbsetup

---
 dev/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index ac14c5a..e389bc0 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -40,6 +40,8 @@ services:
     - db:mysql
   depends_on:
     - db
+  volumes:
+    - ./my.cnf:/etc/mysql/my.cnf
   entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -u \"root\" -p=rootPassword -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
 volumes:

From 808ce5035a8d56d2ce97ed2ad602d4edb8725925 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 19:55:54 +0100
Subject: [PATCH 187/196] removed volume in dbsetup and moved it to db service

---
 dev/docker-compose.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index e389bc0..822547a 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -31,6 +31,7 @@ services:
     MARIADB_PASSWORD: dbPassword
   volumes:
     - sql:/var/lib/mysql
+    - ./my.cnf:/etc/mysql/my.cnf
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
  
  dbsetup:
@@ -40,8 +41,6 @@ services:
     - db:mysql
   depends_on:
     - db
-  volumes:
-    - ./my.cnf:/etc/mysql/my.cnf
   entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -u \"root\" -p=rootPassword -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
 volumes:

From 54556d22905a1c7f5e7d4804e000b5ae127d9720 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 20:01:15 +0100
Subject: [PATCH 188/196] removed login details in setup

---
 dev/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 822547a..a6f14f1 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -41,7 +41,7 @@ services:
     - db:mysql
   depends_on:
     - db
-  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -u \"root\" -p=rootPassword -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
+  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
 volumes:
  sql:
\ No newline at end of file

From 1d06833bb29b65db7c35364ef7be65ea8ec67e61 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 20:08:01 +0100
Subject: [PATCH 189/196] used same volumes for both db and dbsetup services to
 fix access denied issue

---
 dev/docker-compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index a6f14f1..6c64006 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -41,6 +41,9 @@ services:
     - db:mysql
   depends_on:
     - db
+  volumes:
+    - sql:/var/lib/mysql
+    - ./my.cnf:/etc/mysql/my.cnf
   entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
 
 volumes:

From 8ad7a7f4d85ca59262a199d4c663b4979c9bbd2e Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 20:22:05 +0100
Subject: [PATCH 190/196] changed quotes to backticks in sql

---
 dev/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 6c64006..554d239 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -44,7 +44,7 @@ services:
   volumes:
     - sql:/var/lib/mysql
     - ./my.cnf:/etc/mysql/my.cnf
-  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS 'wordpress'; GRANT ALL PRIVILEGES ON 'wordpress'.* TO 'dbUsername'@'%'' WITH GRANT OPTION;\""]
+  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS wordpress; GRANT ALL PRIVILEGES ON `wordpress`.* TO `dbUsername`@`%`' WITH GRANT OPTION;\""]
 
 volumes:
  sql:
\ No newline at end of file

From a0a220a897dc4db6df04b9a941afaec274b063c2 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 20:26:28 +0100
Subject: [PATCH 191/196] updated grant option to localhost

---
 dev/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 554d239..5e13bbc 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -44,7 +44,7 @@ services:
   volumes:
     - sql:/var/lib/mysql
     - ./my.cnf:/etc/mysql/my.cnf
-  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS wordpress; GRANT ALL PRIVILEGES ON `wordpress`.* TO `dbUsername`@`%`' WITH GRANT OPTION;\""]
+  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS wordpress; GRANT ALL PRIVILEGES ON `wordpress`.`*` TO `dbUsername`@`localhost`' WITH GRANT OPTION;\""]
 
 volumes:
  sql:
\ No newline at end of file

From 44af2193df4e4b61194e41a138552f024d1bbb74 Mon Sep 17 00:00:00 2001
From: Samuel Onyijne <samuelord1@gmail.com>
Date: Mon, 7 Nov 2022 20:47:53 +0100
Subject: [PATCH 192/196] updated sql to fix syntax error

---
 dev/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 5e13bbc..f767e19 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -44,7 +44,7 @@ services:
   volumes:
     - sql:/var/lib/mysql
     - ./my.cnf:/etc/mysql/my.cnf
-  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS wordpress; GRANT ALL PRIVILEGES ON `wordpress`.`*` TO `dbUsername`@`localhost`' WITH GRANT OPTION;\""]
+  entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS wordpress; GRANT ALL PRIVILEGES ON \"wordpress\".* TO \"dbUsername\"@'%' WITH GRANT OPTION;\""]
 
 volumes:
  sql:
\ No newline at end of file

From 01c517559ae3bf469c846435aca39dd99a5e33ae Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Mon, 15 Apr 2024 07:45:18 -0700
Subject: [PATCH 193/196] add newline at end of file

---
 .dockerignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index ed874e9..d5582db 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,2 @@
 # exclude dev directory from container
-dev
\ No newline at end of file
+dev

From 55a10202219d7c1d5269672b089d371caf586ccb Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Mon, 15 Apr 2024 07:46:07 -0700
Subject: [PATCH 194/196] sort and add newline at end of file

---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9b9a0a..eb0fb2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *~
 .\#*
-vendor
+node_modules
 templates_c
-node_modules
\ No newline at end of file
+vendor

From 34d5e356db8f4ed2765ecb9563e71e81af889402 Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Mon, 15 Apr 2024 07:47:15 -0700
Subject: [PATCH 195/196] clean-up whitespace and add newline at end of file

---
 dev/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index f767e19..ea2ec14 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -33,7 +33,7 @@ services:
     - sql:/var/lib/mysql
     - ./my.cnf:/etc/mysql/my.cnf
   #entrypoint: mysqld_safe --skip-grant-tables --user=mysql
- 
+
  dbsetup:
   image: mariadb
   restart: "no"
@@ -47,4 +47,4 @@ services:
   entrypoint: [ "bash", "-c", "sleep 10 && mysql -h \"db\" -Be \"CREATE DATABASE IF NOT EXISTS wordpress; GRANT ALL PRIVILEGES ON \"wordpress\".* TO \"dbUsername\"@'%' WITH GRANT OPTION;\""]
 
 volumes:
- sql:
\ No newline at end of file
+ sql:

From c42abb43aada4bed3128a1d53263d47d686e1a5d Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Mon, 15 Apr 2024 07:48:52 -0700
Subject: [PATCH 196/196] add newline at end of files

---
 .eslintrc.json        | 2 +-
 babel.config.json     | 2 +-
 dev/my.cnf            | 2 +-
 dist/js/pdf.js        | 2 +-
 dist/js/rendering.js  | 2 +-
 dist/js/validation.js | 2 +-
 dist/js/values.js     | 2 +-
 dist/js/widgets.js    | 2 +-
 uninstall.php         | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 12dba42..6566ecb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,4 +10,4 @@
         }
     },
     "extends": ["plugin:prettier/recommended"]
-}
\ No newline at end of file
+}
diff --git a/babel.config.json b/babel.config.json
index ff3059c..69fe715 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -1,3 +1,3 @@
 {
     "presets": ["@babel/preset-env"]
-}
\ No newline at end of file
+}
diff --git a/dev/my.cnf b/dev/my.cnf
index 02ee260..9d9f4cd 100644
--- a/dev/my.cnf
+++ b/dev/my.cnf
@@ -136,4 +136,4 @@ collation-server      = utf8mb4_general_ci
 #client login details
 [client]
 user = root
-password = rootPassword
\ No newline at end of file
+password = rootPassword
diff --git a/dist/js/pdf.js b/dist/js/pdf.js
index 07691d0..cb2c8d8 100644
--- a/dist/js/pdf.js
+++ b/dist/js/pdf.js
@@ -99,4 +99,4 @@ TotPdf.request = function () {
   totform.appendChild(data_field);
   jQuery("body").append(totform);
   totform.submit();
-};
\ No newline at end of file
+};
diff --git a/dist/js/rendering.js b/dist/js/rendering.js
index 7d3651c..709dc24 100644
--- a/dist/js/rendering.js
+++ b/dist/js/rendering.js
@@ -145,4 +145,4 @@ var TotRendering = {
     jQuery("#question-rendering-area").append(question);
     question.slideDown("fast");
   }
-};
\ No newline at end of file
+};
diff --git a/dist/js/validation.js b/dist/js/validation.js
index 5abd5e7..d660eb2 100644
--- a/dist/js/validation.js
+++ b/dist/js/validation.js
@@ -66,4 +66,4 @@ TotValidation.validDate = function () {
     result = "".concat(errors.join().capitalizeFirstLetter(), ".");
   }
   return result;
-};
\ No newline at end of file
+};
diff --git a/dist/js/values.js b/dist/js/values.js
index d6797e3..a598b00 100644
--- a/dist/js/values.js
+++ b/dist/js/values.js
@@ -68,4 +68,4 @@ ValuesStack.push = function () {
 };
 ValuesStack.pop = function () {
   TotValues = ValuesStack._stack.pop();
-};
\ No newline at end of file
+};
diff --git a/dist/js/widgets.js b/dist/js/widgets.js
index 417b84e..7ffc20e 100644
--- a/dist/js/widgets.js
+++ b/dist/js/widgets.js
@@ -131,4 +131,4 @@ TotNavigation.unfinishQuestions = function () {
   TotNavigation.showQuestions();
   TotNotifications.hideResultArea();
   jQuery("#button-restart").addClass("hidden");
-};
\ No newline at end of file
+};
diff --git a/uninstall.php b/uninstall.php
index 25c16c6..f1e445b 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -25,4 +25,4 @@
 // if the termination-of-transfer-tool shortcode exists, remove it
 if (shortcode_exists('termination-of-transfer-tool')) { 
     remove_shortcode('termination-of-transfer-tool');
-}
\ No newline at end of file
+}