From 2268ab40b38ede7d34893a814505655e9edeb928 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 26 Dec 2019 18:48:33 +0100 Subject: [PATCH] use the invaders game as 'loading screen' --- .../visualization-page.component.ts | 3 +++ .../src/assets}/css/invaders.css | 0 .../src/assets}/img/city_silhouette.png | Bin .../resources => pdb-js/src/assets}/js/invaders.js | 0 pdb-js/src/index.html | 11 +++++++++++ .../src/main/resources/resources/fonts/.gitignore | 2 -- pdb-ui/src/main/resources/resources/js/.gitignore | 5 ----- 7 files changed, 14 insertions(+), 7 deletions(-) rename {pdb-ui/src/main/resources/resources => pdb-js/src/assets}/css/invaders.css (100%) rename {pdb-ui/src/main/resources/resources => pdb-js/src/assets}/img/city_silhouette.png (100%) rename {pdb-ui/src/main/resources/resources => pdb-js/src/assets}/js/invaders.js (100%) delete mode 100644 pdb-ui/src/main/resources/resources/fonts/.gitignore delete mode 100644 pdb-ui/src/main/resources/resources/js/.gitignore diff --git a/pdb-js/src/app/visualization-page/visualization-page.component.ts b/pdb-js/src/app/visualization-page/visualization-page.component.ts index 13ea687..0d4b3a9 100644 --- a/pdb-js/src/app/visualization-page/visualization-page.component.ts +++ b/pdb-js/src/app/visualization-page/visualization-page.component.ts @@ -107,16 +107,19 @@ export class VisualizationPageComponent implements OnInit { that.plotView.imageUrl = ''; that.galleryView.show=false; + document.dispatchEvent(new Event("invadersStart", {})); const request = this.createPlotRequest(); this.plotService.sendPlotRequest(request).subscribe(function(plotResponse){ console.log("response: " + JSON.stringify(plotResponse)); that.plotView.imageUrl = "http://"+window.location.hostname+':8080/'+plotResponse.imageUrl; + document.dispatchEvent(new Event("invadersPause", {})); }, error => { that.plotView.imageUrl = ''; that.showError(error.error.message); + document.dispatchEvent(new Event("invadersPause", {})); }); } diff --git a/pdb-ui/src/main/resources/resources/css/invaders.css b/pdb-js/src/assets/css/invaders.css similarity index 100% rename from pdb-ui/src/main/resources/resources/css/invaders.css rename to pdb-js/src/assets/css/invaders.css diff --git a/pdb-ui/src/main/resources/resources/img/city_silhouette.png b/pdb-js/src/assets/img/city_silhouette.png similarity index 100% rename from pdb-ui/src/main/resources/resources/img/city_silhouette.png rename to pdb-js/src/assets/img/city_silhouette.png diff --git a/pdb-ui/src/main/resources/resources/js/invaders.js b/pdb-js/src/assets/js/invaders.js similarity index 100% rename from pdb-ui/src/main/resources/resources/js/invaders.js rename to pdb-js/src/assets/js/invaders.js diff --git a/pdb-js/src/index.html b/pdb-js/src/index.html index a91eb0c..dd63799 100644 --- a/pdb-js/src/index.html +++ b/pdb-js/src/index.html @@ -10,7 +10,9 @@ + + @@ -42,6 +44,15 @@ 'Last Year': [moment().subtract(1, 'year').startOf('year'),moment().subtract(1, 'year').endOf('year')], }, }); + + + initInvaders('results'); + document.addEventListener("invadersPause", function(event) { + pauseInvaders(); + }); + document.addEventListener("invadersStart", function(event) { + startInvaders(); + }); }); diff --git a/pdb-ui/src/main/resources/resources/fonts/.gitignore b/pdb-ui/src/main/resources/resources/fonts/.gitignore deleted file mode 100644 index 58e268e..0000000 --- a/pdb-ui/src/main/resources/resources/fonts/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/font-awesome-4.7.0/ -/font-awesome-4.7.0.zip diff --git a/pdb-ui/src/main/resources/resources/js/.gitignore b/pdb-ui/src/main/resources/resources/js/.gitignore deleted file mode 100644 index 17796fe..0000000 --- a/pdb-ui/src/main/resources/resources/js/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/horsey-master/ -/horsey-master.zip -/autocomplete.js-2.1.0/ -/autocomplete.js-2.1.0.zip -/search.js