Skip to content

Ci fixes #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SachsKaylee merged 3 commits into from
Mar 13, 2019
Merged

Ci fixes #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aa59dd
No more root where not needed
Mar 13, 2019
7eb5694
Temp only: Depoly ci-fixes
Mar 13, 2019
1655695
Reset travis yml
Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"sizes": "512x512"
}
],
"start_url": "/",
"start_url": "",
"background_color": "#212121",
"display": "standalone",
"scope": "/",
"scope": "",
"theme_color": "#212121"
}
6 changes: 1 addition & 5 deletions src/components/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<v-list class="pa-0">
<v-list-tile avatar>
<v-list-tile-avatar>
<img :src="`${root}/assets/images/icons/favicon.ico`">
<img src="assets/images/icons/favicon.ico">
</v-list-tile-avatar>

<v-list-tile-content>
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/register-serviceworker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions src/scenes/TreeDesignerScene.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down