From 3aa59ddc189565fb43dffd3471f8495ffca615de Mon Sep 17 00:00:00 2001 From: PatrickSachs Date: Wed, 13 Mar 2019 20:41:33 +0100 Subject: [PATCH 1/3] No more root where not needed --- .travis.yml | 10 +++++----- manifest.json | 4 ++-- src/components/App.vue | 6 +----- src/register-serviceworker.ts | 2 +- src/scenes/TreeDesignerScene.ts | 12 ++++++------ 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3e2cac..0b561ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ deploy: skip-cleanup: true github-token: $GITHUB_TOKEN keep-history: true - on: - branch: master -branches: - only: - - master +# on: +# branch: master +#branches: +# only: +# - master diff --git a/manifest.json b/manifest.json index 3b8d439..ffad3fb 100644 --- a/manifest.json +++ b/manifest.json @@ -13,9 +13,9 @@ "sizes": "512x512" } ], - "start_url": "/", + "start_url": "", "background_color": "#212121", "display": "standalone", - "scope": "/", + "scope": "", "theme_color": "#212121" } \ No newline at end of file diff --git a/src/components/App.vue b/src/components/App.vue index 162beed..742165c 100644 --- a/src/components/App.vue +++ b/src/components/App.vue @@ -6,7 +6,7 @@ - + @@ -242,10 +242,6 @@ export default class STApp extends Vue { private oldSavegameVersion: boolean = false; private errorMessage: string = ""; - private get root() { - return process.env.ROOT; - } - /** * Called when the component is ready to be used, but has no HTMl elements yet. * Useful for non-visual initialization. diff --git a/src/register-serviceworker.ts b/src/register-serviceworker.ts index 73e5ae0..fdbfb76 100644 --- a/src/register-serviceworker.ts +++ b/src/register-serviceworker.ts @@ -3,7 +3,7 @@ if ('serviceWorker' in navigator) { if (process.env.SERVICE_WORKER === "true") { // Use the window load event to keep the page load performant window.addEventListener('load', () => { - navigator.serviceWorker.register(process.env.ROOT + '/serviceworker.js').then(registration => { + navigator.serviceWorker.register('serviceworker.js').then(registration => { console.log('SW registered: ', registration); }).catch(registrationError => { console.log('SW registration failed: ', registrationError); diff --git a/src/scenes/TreeDesignerScene.ts b/src/scenes/TreeDesignerScene.ts index d0dc4a1..50904f3 100644 --- a/src/scenes/TreeDesignerScene.ts +++ b/src/scenes/TreeDesignerScene.ts @@ -49,17 +49,17 @@ export default class TreeDesignerScene extends Phaser.Scene implements ISaveable preload() { this._application = this.game as SlowTreeGame; // Test images - this.load.image("phaser", process.env.ROOT + "assets/images/phaser.png"); - this.load.image("marker", process.env.ROOT + "assets/images/marker.png"); + this.load.image("phaser", "assets/images/phaser.png"); + this.load.image("marker", "assets/images/marker.png"); // Tree images for (const treeType of TreeType.ALL_TREES) { - this.load.image(`tree/${treeType.id}/trunk`, `${process.env.ROOT}assets/images/tree/${treeType.id}/trunk.png`); - this.load.image(`tree/${treeType.id}/branch`, `${process.env.ROOT}assets/images/tree/${treeType.id}/branch.png`); - this.load.image(`tree/${treeType.id}/leaves`, `${process.env.ROOT}assets/images/tree/${treeType.id}/leaves.png`); + this.load.image(`tree/${treeType.id}/trunk`, `assets/images/tree/${treeType.id}/trunk.png`); + this.load.image(`tree/${treeType.id}/branch`, `assets/images/tree/${treeType.id}/branch.png`); + this.load.image(`tree/${treeType.id}/leaves`, `assets/images/tree/${treeType.id}/leaves.png`); } // Backgrounds for (const background of BackgroundSkin.ALL_BACKGROUNDS) { - this.load.image(background.id, process.env.ROOT + background.path); + this.load.image(background.id, background.path); } } From 7eb5694c2cc9eafd96bf9178e8c5968bcbb6ad1d Mon Sep 17 00:00:00 2001 From: PatrickSachs Date: Wed, 13 Mar 2019 20:45:02 +0100 Subject: [PATCH 2/3] Temp only: Depoly ci-fixes --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b561ca..c4f1445 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ deploy: skip-cleanup: true github-token: $GITHUB_TOKEN keep-history: true -# on: -# branch: master + on: + branch: ci-fixes #branches: # only: # - master From 16556950c24b5e3e72e81165632dc7f7ce1dce55 Mon Sep 17 00:00:00 2001 From: PatrickSachs Date: Wed, 13 Mar 2019 20:48:41 +0100 Subject: [PATCH 3/3] Reset travis yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4f1445..d3e2cac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ deploy: github-token: $GITHUB_TOKEN keep-history: true on: - branch: ci-fixes -#branches: -# only: -# - master + branch: master +branches: + only: + - master