diff --git a/challenger/Procfile b/challenger/Procfile index 6910c2df..a771bb7c 100644 --- a/challenger/Procfile +++ b/challenger/Procfile @@ -1 +1 @@ -web: java $JAVA_OPTS -cp target/classes:target/dependency/*:target/* uk.co.compendiumdev.challenge.ChallengeMain -model=challengeapi -noshutdown -autocleardown=10 -multiplayer -cloudstorage +web: java $JAVA_OPTS -cp target/classes:target/dependency/*:target/* uk.co.compendiumdev.challenge.ChallengeMain -model=challengeapi -noshutdown -multiplayer -cloudstorage diff --git a/challenger/deploy.txt b/challenger/deploy.txt index 05c800f9..17781299 100644 --- a/challenger/deploy.txt +++ b/challenger/deploy.txt @@ -14,6 +14,8 @@ i.e. https://medium.com/@devkosal/switching-java-jdk-versions-on-macos-80bc868e6 For heroku: +NOTE: need to have `heroku plugins:install java` for the `deploy:jar` to be recognised - more info https://devcenter.heroku.com/articles/deploying-executable-jar-files + Deploy the challenger app full jar - have the deployment page open in case we need to rollback diff --git a/challenger/src/main/java/uk/co/compendiumdev/challenge/gui/ChallengerWebGUI.java b/challenger/src/main/java/uk/co/compendiumdev/challenge/gui/ChallengerWebGUI.java index fa46cf6e..d98afe3b 100644 --- a/challenger/src/main/java/uk/co/compendiumdev/challenge/gui/ChallengerWebGUI.java +++ b/challenger/src/main/java/uk/co/compendiumdev/challenge/gui/ChallengerWebGUI.java @@ -279,7 +279,8 @@ private String showPreviousGuids() { "var guids = localStorage.getItem('challenges-guids') || '';" + "var guidsArray = guids.match(/\\|([^|]*)\\|/g);" + "currGuid = getCookie('X-THINGIFIER-DATABASE-NAME');" + - "if(currGuid!='' && !guidsArray.includes(`|${currGuid}|`)){guidsArray.push(`|${currGuid}|`)}" + + "if(currGuid && !guidsArray){guidsArray=[];}" + + "if(currGuid && guidsArray && currGuid!='' && !guidsArray.includes(`|${currGuid}|`)){guidsArray.push(`|${currGuid}|`)}" + "if(guidsArray!=null && guidsArray.length>0){document.writeln('
Previously Used
')}" + "for(guidItem in guidsArray){" + "var myguid = guidsArray[guidItem].replace(/\\|/g,'');" + diff --git a/challengerAuto/pom.xml b/challengerAuto/pom.xml index 07ce254a..2a9252f1 100644 --- a/challengerAuto/pom.xml +++ b/challengerAuto/pom.xml @@ -20,7 +20,7 @@