From e5825340b92bda5bc2fc192d6bc7ee065893d94c Mon Sep 17 00:00:00 2001
From: alan <alan@compendiumdev.co.uk>
Date: Fri, 10 Jul 2020 15:37:10 +0100
Subject: [PATCH] created a 1.5.2 release

---
 pom.xml                                       |  11 +-
 readme.md                                     | 166 +++++-------------
 thingifier/readme.md                          | 128 ++++++++++++++
 .../application/PreRequestHook.java           |   9 +
 .../application/ThingifierRestServer.java     |  21 +++
 thingifierapp/Procfile                        |   1 +
 thingifierapp/deploy.txt                      |   6 +
 thingifierapp/pom.xml                         |  17 +-
 .../application/ClearDataPreRequestHook.java  |  43 +++++
 .../thingifier/application/Main.java          |  35 +++-
 .../src/main/resources/public/index.html      |  44 ++++-
 11 files changed, 352 insertions(+), 129 deletions(-)
 create mode 100644 thingifier/readme.md
 create mode 100644 thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/PreRequestHook.java
 create mode 100644 thingifierapp/Procfile
 create mode 100644 thingifierapp/deploy.txt
 create mode 100644 thingifierapp/src/main/java/uk/co/compendiumdev/thingifier/application/ClearDataPreRequestHook.java

diff --git a/pom.xml b/pom.xml
index ea87f9dd..4fbd00d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
 
     <properties>
-        <thingifier.version>1.5.2-SNAPSHOT</thingifier.version>
+        <thingifier.version>1.5.2</thingifier.version>
         <java.version>1.8</java.version>
     </properties>
 
@@ -25,6 +25,15 @@
 
         <!--
 
+        1.5.2
+
+            - added styling to the gui
+            - added many configuration options
+            - started added 'hooks' for responses to make easier to extend
+            - added xml and json examples in documentation output
+            - created heroku instance which auto clears
+            - split out project into more modules to make easier to customise and maintain
+
         1.5.1
             - added simple view gui /gui
             - added compressed relationships - as default in response
diff --git a/readme.md b/readme.md
index 2247e043..adaed18d 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,48 @@
 # Thingifier
 
-An experiment in Model Based Development.
+An experiment in Model Based API Development.
+
+## Download
+
+Thingifier comes preconfigured for download as:
+
+- [a simple todo list](https://github.com/eviltester/thingifier/releases/download/v1.5.1/runTodoListRestAPI-1.5.1.jar)
+- [a more complex todo list manager](https://github.com/eviltester/thingifier/releases/download/v1.5.1/runTodoListRestAPI-1.5.1.jar)
+
+When you download one of the `.jar` files then use:
+
+- `java -jar runTodoListRestAPI-1.5.1.jar`
+
+Where you replace the name of the `.jar` file with the name of the file you downloaded.
+
+- then visit https://localhost:4567 and you will see the welcome gui.
+- there are links to the API documentation, and the View GUI
+
+Command line options are:
+
+- `-port=1234` to change the port to `1234`
+- `-version=1` to start with a different version.
+    - Each api comes preconfigured with multiple versions, by default the 'best' version is used, so if you switch to an earlier version you might find more bugs.
+
+## Cloud Deploy
+
+An online version of the application can be found at:
+
+- https://apithingifier.herokuapp.com
+
+This version will reset all data every 10 minutes.
+
+If you want to practice seriously then I suggest downloading the `.jar` and running it locally.
+
+We are not responsible for any data that you find on the cloud deploy.
+
+We reserve the right to remove the cloud deploy or change the reset time if we discover it is being misused.
+
+## Usage
+
+Currently Thingifier is suitable for using as a Practice Test App for API Testing.
+    
+## Details
 
 Based on my [Compendium-TA](https://www.compendiumdev.co.uk/page.php?title=compendiumta) tool from 2003/2004.
 
@@ -24,125 +66,3 @@ If you want to generate test data for an api, investigate:
 
 ---
 
-This is a work in progress so it currently has a hard coded model of a small TODO application.
-
-## Model
-
-Entities:
-
-- todo
-    - Fields:
-        - doneStatus
-        - guid
-        - description
-        - title
-- project
-    - Fields:
-        - guid
-        - description
-        - active
-        - completed
-        - title
-- category
-    - Fields:
-        - guid
-        - description
-        - title
-
-Relationships:
-
-- projects : category => project
-- categories : todo => category
-- todos : category => todo
-- tasks : project => todo
-
-### Resulting REST API
-
-This generates the following REST API automatically
-
-- /todos
-    - GET - all the todos
-    - POST - create a todo - body JSON
-    - OPTIONS
-- /todos/_GUID_
-    - GET - a specific todo
-    - DELETE - a specific todo
-    - POST - amend the todo
-    - PUT - replace all the todo fields in the JSON body
-    - OPTIONS
-- /todos/_GUID_/categories
-    - GET - all the categories for a todo
-    - POST - create a todo - body JSON must contain a GUID for a category e.g. `{"guid":"1234-1234-1234-1234"}`
-    
-Similar for `/projects` and `/categories`
-
-The JSON body for creating and amending is simply
-
-`{"fieldname":"fieldvalue", "anotherFieldName":"anotherValue", etc.}`
-
-The XML body for creating and amending is simply
-
-`<entity><fieldname>fieldvalue></fieldname><anotherFieldName>anotherValue</anotherFieldName><entity>`
-
-e.g.
-
-`<todo><title>my title</title></todo>`
-
-The fieldnames are shown in the list above for the model or the code below.
-
-The REST API has some guards to check for 404s but very little error handling and no enforcement of mandatory fields etc.
-
-But it is a workable API and all details are stored in memory.
-
-The deployed app does have some sample data for testing purposes, this can easily be `DELETE`d using the API.
-    
-### Code for Model
-
-~~~~~~~~
-       Thing todo = todoManager.createThing("todo", "todos");
-
-        todo.definition()
-                .addFields(Field.is("title", STRING).
-                                mandatory().
-                                withValidation(
-                                        VRule.notEmpty(),
-                                        VRule.matchesType()),
-                        Field.is("description", STRING),
-                        Field.is("doneStatus", FieldType.BOOLEAN).
-                                withDefaultValue("FALSE").
-                                withValidation(
-                                        VRule.matchesType()));
-        
-        Thing project = todoManager.createThing("project", "projects");
-
-        project.definition()
-                .addFields(
-                        Field.is("title", STRING),
-                        Field.is("description", STRING),
-                        Field.is("completed", FieldType.BOOLEAN).
-                                withDefaultValue("FALSE").
-                                withValidation(VRule.matchesType()),
-                        Field.is("active", FieldType.BOOLEAN).
-                                withDefaultValue("TRUE").
-                                withValidation(VRule.matchesType()));
-
-
-        Thing category = todoManager.createThing("category", "categories");
-
-        category.definition()
-                .addFields(
-                        Field.is("title", STRING).
-                                mandatory().
-                                withValidation(VRule.notEmpty()),
-                        Field.is("description", STRING));
-
-        todoManager.defineRelationship(Between.things(project, todo), AndCall.it("tasks"), WithCardinality.of("1", "*")).
-                whenReversed(WithCardinality.of("1", "*"), AndCall.it("task-of"));
-
-        todoManager.defineRelationship(Between.things(project, category), AndCall.it("categories"), WithCardinality.of("1", "*"));
-        todoManager.defineRelationship(Between.things(category, todo), AndCall.it("todos"), WithCardinality.of("1", "*"));
-        todoManager.defineRelationship(Between.things(category, project), AndCall.it("projects"), WithCardinality.of("1", "*"));
-        todoManager.defineRelationship(Between.things(todo, category), AndCall.it("categories"), WithCardinality.of("1", "*"));
-~~~~~~~~
-    
-Default model can be found in [src/main/java/uk/co/compendiumdev/thingifier/application/TodoManagerThingifier.java](https://github.com/eviltester/thingifier/blob/master/src/main/java/uk/co/compendiumdev/thingifier/application/TodoManagerThingifier.java)
\ No newline at end of file
diff --git a/thingifier/readme.md b/thingifier/readme.md
new file mode 100644
index 00000000..6067ef17
--- /dev/null
+++ b/thingifier/readme.md
@@ -0,0 +1,128 @@
+
+## Thingifier as a Library
+
+This is a work in progress so it currently has a hard coded models of a small TODO application.
+
+The models are found in the `examplemodels` module.
+
+---
+
+## Model
+
+Entities:
+
+- todo
+    - Fields:
+        - doneStatus
+        - guid
+        - description
+        - title
+- project
+    - Fields:
+        - guid
+        - description
+        - active
+        - completed
+        - title
+- category
+    - Fields:
+        - guid
+        - description
+        - title
+
+Relationships:
+
+- projects : category => project
+- categories : todo => category
+- todos : category => todo
+- tasks : project => todo
+
+### Resulting REST API
+
+This generates the following REST API automatically
+
+- /todos
+    - GET - all the todos
+    - POST - create a todo - body JSON
+    - OPTIONS
+- /todos/_GUID_
+    - GET - a specific todo
+    - DELETE - a specific todo
+    - POST - amend the todo
+    - PUT - replace all the todo fields in the JSON body
+    - OPTIONS
+- /todos/_GUID_/categories
+    - GET - all the categories for a todo
+    - POST - create a todo - body JSON must contain a GUID for a category e.g. `{"guid":"1234-1234-1234-1234"}`
+    
+Similar for `/projects` and `/categories`
+
+The JSON body for creating and amending is simply
+
+`{"fieldname":"fieldvalue", "anotherFieldName":"anotherValue", etc.}`
+
+The XML body for creating and amending is simply
+
+`<entity><fieldname>fieldvalue></fieldname><anotherFieldName>anotherValue</anotherFieldName><entity>`
+
+e.g.
+
+`<todo><title>my title</title></todo>`
+
+The fieldnames are shown in the list above for the model or the code below.
+
+The REST API has some guards to check for 404s but very little error handling and no enforcement of mandatory fields etc.
+
+But it is a workable API and all details are stored in memory.
+
+The deployed app does have some sample data for testing purposes, this can easily be `DELETE`d using the API.
+    
+### Code for Model
+
+~~~~~~~~
+       Thing todo = todoManager.createThing("todo", "todos");
+
+        todo.definition()
+                .addFields(Field.is("title", STRING).
+                                mandatory().
+                                withValidation(
+                                        VRule.notEmpty(),
+                                        VRule.matchesType()),
+                        Field.is("description", STRING),
+                        Field.is("doneStatus", FieldType.BOOLEAN).
+                                withDefaultValue("FALSE").
+                                withValidation(
+                                        VRule.matchesType()));
+        
+        Thing project = todoManager.createThing("project", "projects");
+
+        project.definition()
+                .addFields(
+                        Field.is("title", STRING),
+                        Field.is("description", STRING),
+                        Field.is("completed", FieldType.BOOLEAN).
+                                withDefaultValue("FALSE").
+                                withValidation(VRule.matchesType()),
+                        Field.is("active", FieldType.BOOLEAN).
+                                withDefaultValue("TRUE").
+                                withValidation(VRule.matchesType()));
+
+
+        Thing category = todoManager.createThing("category", "categories");
+
+        category.definition()
+                .addFields(
+                        Field.is("title", STRING).
+                                mandatory().
+                                withValidation(VRule.notEmpty()),
+                        Field.is("description", STRING));
+
+        todoManager.defineRelationship(Between.things(project, todo), AndCall.it("tasks"), WithCardinality.of("1", "*")).
+                whenReversed(WithCardinality.of("1", "*"), AndCall.it("task-of"));
+
+        todoManager.defineRelationship(Between.things(project, category), AndCall.it("categories"), WithCardinality.of("1", "*"));
+        todoManager.defineRelationship(Between.things(category, todo), AndCall.it("todos"), WithCardinality.of("1", "*"));
+        todoManager.defineRelationship(Between.things(category, project), AndCall.it("projects"), WithCardinality.of("1", "*"));
+        todoManager.defineRelationship(Between.things(todo, category), AndCall.it("categories"), WithCardinality.of("1", "*"));
+~~~~~~~~
+    
diff --git a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/PreRequestHook.java b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/PreRequestHook.java
new file mode 100644
index 00000000..be220572
--- /dev/null
+++ b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/PreRequestHook.java
@@ -0,0 +1,9 @@
+package uk.co.compendiumdev.thingifier.application;
+
+import spark.Request;
+import spark.Response;
+
+public interface PreRequestHook {
+    // return false if we want to 'stop' the request
+    boolean run(Request request, Response response);
+}
diff --git a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/ThingifierRestServer.java b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/ThingifierRestServer.java
index f4d1e0e1..9024e1df 100644
--- a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/ThingifierRestServer.java
+++ b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/ThingifierRestServer.java
@@ -1,5 +1,6 @@
 package uk.co.compendiumdev.thingifier.application;
 
+import org.eclipse.jetty.http.HttpFields;
 import spark.Request;
 import uk.co.compendiumdev.thingifier.Thingifier;
 import uk.co.compendiumdev.thingifier.api.response.ApiResponseError;
@@ -10,6 +11,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 
 import static spark.Spark.*;
@@ -18,6 +20,7 @@ public class ThingifierRestServer {
 
     private final List<RoutingDefinition> additionalRoutes;
     private String urlPath;
+    private List<PreRequestHook> preRequestHooks;
 
 
     // todo : we should be able to configure the API routing for authorisation and support logging
@@ -31,6 +34,8 @@ public ThingifierRestServer(final String[] args, final String path,
 
         this.additionalRoutes = additionalDocumentedRoutes;
 
+        preRequestHooks = new ArrayList<>();
+
         this.urlPath = null;
         // can set path, but if not set, pick up from requests
         if(path!=null && path.length()>0) {
@@ -41,10 +46,12 @@ public ThingifierRestServer(final String[] args, final String path,
 
             // TODO: wrap this in a --verbose option
             try {
+                /*
                 System.out.println("**REQUEST**");
                 System.out.println(request.url());
                 System.out.println(request.pathInfo());
                 System.out.println(request.body());
+                 */
             } catch (Exception e) {
                 System.out.println(e);
             }
@@ -59,6 +66,14 @@ public ThingifierRestServer(final String[] args, final String path,
                 }
             }
 
+            if(preRequestHooks!=null){
+                for(PreRequestHook hook : preRequestHooks){
+                    if(!hook.run(request, response)){
+                        return ;
+                    };
+                }
+            }
+
             // TODO: wrap this in a --verbose option
             System.out.println("**PROCESSING**");
         });
@@ -66,9 +81,11 @@ public ThingifierRestServer(final String[] args, final String path,
         after((request, response) -> {
             // TODO: wrap this in a --verbose option
             try {
+                /*
                 System.out.println("**RESPONSE**");
                 System.out.println(response.status());
                 System.out.println(response.body());
+                 */
             } catch (Exception e) {
                 System.out.println(e);
             }
@@ -224,4 +241,8 @@ private String getExceptionErrorResponse(final Exception e, final Request reques
         }
     }
 
+    public void registerPreRequestHook(final PreRequestHook hook) {
+        // pre-request hooks run pre-every-request
+        preRequestHooks.add(hook);
+    }
 }
diff --git a/thingifierapp/Procfile b/thingifierapp/Procfile
new file mode 100644
index 00000000..9e17e25b
--- /dev/null
+++ b/thingifierapp/Procfile
@@ -0,0 +1 @@
+web: java $JAVA_OPTS -cp target/classes:target/dependency/*:target/* uk.co.compendiumdev.thingifier.application.Main  -model=simpleTodoList -noshutdown -autocleardown=10
diff --git a/thingifierapp/deploy.txt b/thingifierapp/deploy.txt
new file mode 100644
index 00000000..0ace89c5
--- /dev/null
+++ b/thingifierapp/deploy.txt
@@ -0,0 +1,6 @@
+For heroku:
+
+Deploy the restmud-web-games-bundle
+
+- cd thingifierapp
+- `heroku deploy:jar target/thingifierapp-1.5.2-full.jar --app apithingifier`
diff --git a/thingifierapp/pom.xml b/thingifierapp/pom.xml
index 8afe08a6..17ac9ece 100644
--- a/thingifierapp/pom.xml
+++ b/thingifierapp/pom.xml
@@ -103,7 +103,7 @@
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
                     <!-- rename the 'full' jar -->
-                    <finalName>thingifier-${project.version}-full</finalName>
+                    <finalName>thingifierapp-${project.version}-full</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                     <archive>
                         <manifest>
@@ -112,6 +112,21 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.heroku.sdk</groupId>
+                <artifactId>heroku-maven-plugin</artifactId>
+                <version>1.1.3</version>
+                <configuration>
+                    <jdkVersion>${java.version}</jdkVersion>
+                    <appName>apithingifier</appName>
+                    <processTypes>
+                        <!-- https://devcenter.heroku.com/articles/deploying-java-applications-with-the-heroku-maven-plugin -->
+                        <!-- Tell Heroku how to launch your application -->
+                        <!-- try from procfile -->
+                        <web>java $JAVA_OPTS -cp target/classes:target/dependency/* uk.co.compendiumdev.thingifier.application.Main -model=simpleTodoList -noshutdown -autocleardown=10</web>
+                    </processTypes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/thingifierapp/src/main/java/uk/co/compendiumdev/thingifier/application/ClearDataPreRequestHook.java b/thingifierapp/src/main/java/uk/co/compendiumdev/thingifier/application/ClearDataPreRequestHook.java
new file mode 100644
index 00000000..954402bc
--- /dev/null
+++ b/thingifierapp/src/main/java/uk/co/compendiumdev/thingifier/application/ClearDataPreRequestHook.java
@@ -0,0 +1,43 @@
+package uk.co.compendiumdev.thingifier.application;
+
+import spark.Request;
+import spark.Response;
+import uk.co.compendiumdev.thingifier.Thing;
+import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.generic.instances.ThingInstance;
+
+public class ClearDataPreRequestHook implements PreRequestHook{
+    private long lastReset;
+    private final int minutes;
+    private final Thingifier thingifier;
+    private final long maxgap;
+
+    public ClearDataPreRequestHook(final int minutes, Thingifier thingifier) {
+        this.minutes = minutes;
+        this.lastReset = System.currentTimeMillis();
+        this.thingifier = thingifier;
+        this.maxgap = minutes*60*1000;
+    }
+
+    @Override
+    public boolean run(final Request request, final Response response) {
+        long currentTime = System.currentTimeMillis();
+        long gap = currentTime-lastReset;
+        if(gap>maxgap){
+            // reset the thingifier data
+            this.lastReset=currentTime;
+            System.out.println("Clearing all data");
+            thingifier.clearAllData();
+            System.out.println("Cleared all data");
+
+            System.out.println("Adding test data");
+            final Thing todo = thingifier.getThingNamed("todo");
+            ThingInstance paperwork = todo.createInstance().setValue("title", "Scan my paperwork");
+            todo.addInstance(paperwork);
+
+            ThingInstance filework = todo.createInstance().setValue("title", "File my paperwork");
+            todo.addInstance(filework);
+        }
+        return false;
+    }
+}
diff --git a/thingifierapp/src/main/java/uk/co/compendiumdev/thingifier/application/Main.java b/thingifierapp/src/main/java/uk/co/compendiumdev/thingifier/application/Main.java
index f59d3916..23732e55 100644
--- a/thingifierapp/src/main/java/uk/co/compendiumdev/thingifier/application/Main.java
+++ b/thingifierapp/src/main/java/uk/co/compendiumdev/thingifier/application/Main.java
@@ -11,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static spark.Spark.*;
 
 /*
 
@@ -116,6 +115,11 @@ public static void main(String[] args) {
         // prevent shutdown verb as configurable through arguments e.g. -noshutdown
         Boolean allowShutdown = true;
 
+        // clear data every 10 minutes configuragle through arguments e.g. -autocleardown
+        // -autocleardown=15
+        Boolean clearDataPeriodically = false;
+        int clearDownMinutes=10;
+
         System.out.println("Valid Model Names -model=");
         for(String aModelName : validModelNames){
             System.out.println(aModelName);
@@ -150,6 +154,20 @@ public static void main(String[] args) {
             if (arg.startsWith("-noshutdown")) {
                 allowShutdown = false;
             }
+
+            if (arg.startsWith("-autocleardown")) {
+                clearDataPeriodically = true;
+                String[] details = arg.split("=");
+                if (details != null && details.length > 1) {
+                    String minutes = details[1].trim();
+                    try{
+                        clearDownMinutes = Integer.valueOf(minutes);
+                    }catch(Exception e){
+                        System.out.println("Invalid minutes " + minutes + " " +e.getMessage());
+                    }
+                    System.out.println(String.format("Will clear down every %d minutes", clearDownMinutes));
+                }
+            }
         }
 
 
@@ -176,15 +194,25 @@ public static void main(String[] args) {
         switch (modelName){
             case "simpleTodoList":
                 thingifier =  new TodoListThingifier().get();
+                break;
             case "todoListManager":
             default:
                 thingifier = new TodoManagerThingifier().get();
         }
 
+        thingifier.apiConfig().allowShowIdsInUrlsIfAvailable(true);
+        thingifier.apiConfig().allowShowIdsInResponsesIfAvailable(true);
+        thingifier.apiConfig().showSingleInstancesAsPlural(true);
+        thingifier.apiConfig().allowShowGuidsInResponses(false);
+
         additionalRoutes.addAll(new DefaultGUI(thingifier).
                                 configureRoutes().
                                 getRoutes());
 
+
+
+
+
         ThingifierRestServer restServer;
 
         switch (modelName){
@@ -200,7 +228,10 @@ public static void main(String[] args) {
                                         additionalRoutes);
         }
 
-
+        if(clearDataPeriodically) {
+            restServer.registerPreRequestHook(
+                    new ClearDataPreRequestHook(clearDownMinutes, thingifier));
+        }
 
         System.out.println("Running on " + Spark.port());
         System.out.println(" e.g. http://localhost:" + Spark.port());
diff --git a/thingifierapp/src/main/resources/public/index.html b/thingifierapp/src/main/resources/public/index.html
index 3665ac2e..ec01f37c 100644
--- a/thingifierapp/src/main/resources/public/index.html
+++ b/thingifierapp/src/main/resources/public/index.html
@@ -13,9 +13,49 @@
         </ul>
     </div>
 
-    <h1>Thingifier App</h1>
+<!--
+
+# Thingifier App
+
+This is the deployable version of Thingifier.
+
+When deployed to heroku at:
+
+- [https://apithingifier.herokuapp.com/](https://apithingifier.herokuapp.com/)
+
+The data will automatically clear down every 10 minutes.
+
+NOTE: We are not responsible for any data that
+you see on the _apithingifier.herokuapp.com_ site. This is
+publically available.
+
+We recommend that you download a local version of the application from:
+
+[https://github.com/eviltester/thingifier](https://github.com/eviltester/thingifier)
+
+We reserve the right to remove the cloud deploy or change the reset time if we discover it is being misused.
+
+---
+
+-->
+
+    <h1 id="thingifier-app">Thingifier App</h1>
+    <p>This is the deployable version of Thingifier.</p>
+    <p>When deployed to heroku at:</p>
+    <ul>
+        <li><a href="https://apithingifier.herokuapp.com/">https://apithingifier.herokuapp.com/</a></li>
+    </ul>
+    <p>The data will automatically clear down every 10 minutes.</p>
+    <p>NOTE: We are not responsible for any data that
+        you see on the <em>apithingifier.herokuapp.com</em> site. This is
+        publically available.</p>
+    <p>We recommend that you download a local version of the application from:</p>
+    <p><a href="https://github.com/eviltester/thingifier">https://github.com/eviltester/thingifier</a></p>
+    <p>We reserve the right to remove the cloud deploy or change the reset time if we discover it is being misused.</p>
+    <hr/>
+
+
 
-    <p>This is the deployable version of thingifier</p>
 
     <div class="footer"><p>Thingifier version 1.5, Copyright Alan Richardson, Compendium Developments Ltd 2020 </p>
         <ul class="footerlinks"><li><a href="https://github.com/eviltester/thingifier">Thingifier</a></li>