github-migration
/
hugo-sandstorm
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

0.69.0 review fixes #2

Merged
johnbintz merged 2 commits from 0.69.0-review-fixes into master 2020-04-21 11:35:06 +00:00
Conversation 0 Commits 2 Files Changed 7 +9 -8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d164fedb9d - Show all commits

6
.sandstorm/sandstorm-files.list
View File

@ -90,13 +90,13 @@ lib64/ld-linux-x86-64.so.2
opt/app opt/app
opt/app/.babelrc opt/app/.babelrc
opt/app/.cloudcmd.menu.js opt/app/.cloudcmd.menu.js
opt/app/.nuxt/dist/0.nuxt.bundle.f2f0f05da0a6a435ee4c.js opt/app/.nuxt/dist/0.nuxt.bundle.ef50340c3600ea7e30a7.js
opt/app/.nuxt/dist/1.nuxt.bundle.89a9958091c34dcc68ed.js opt/app/.nuxt/dist/1.nuxt.bundle.89a9958091c34dcc68ed.js
opt/app/.nuxt/dist/index.html opt/app/.nuxt/dist/index.html
opt/app/.nuxt/dist/manifest.1e9ee1e14867bf29e7ca.js opt/app/.nuxt/dist/manifest.7c112ec70f8b3c557a15.js
opt/app/.nuxt/dist/nuxt.bundle.dbf51a8ed53569a6c1b0.js opt/app/.nuxt/dist/nuxt.bundle.dbf51a8ed53569a6c1b0.js
opt/app/.nuxt/dist/server-bundle.json opt/app/.nuxt/dist/server-bundle.json
opt/app/.nuxt/dist/vendor.bundle.1e9ee1e14867bf29e7ca.js opt/app/.nuxt/dist/vendor.bundle.7c112ec70f8b3c557a15.js
opt/app/.sandstorm/launcher.sh opt/app/.sandstorm/launcher.sh
opt/app/README.md opt/app/README.md
opt/app/node_modules/.bin/babel-node opt/app/node_modules/.bin/babel-node

11
pages/index.vue
View File

@ -2,13 +2,14 @@
<div> <div>
<template v-if="isLoading"> <template v-if="isLoading">
<p> <p>
Loading public site information... Loading public site information. This may take a while!
This is <a href="https://github.com/sandstorm-io/sandstorm/pull/3292" target="_blank" rel="noopener">a known bug</a>.
</p> </p>
</template> </template>
<template v-else-if="loadError"> <template v-else-if="loadError">
<p> <p>
Unable to load public site information! Try restarting the grain. Unable to load public site information! Try restarting the grain.
This is a known bug. This is <a href="https://github.com/sandstorm-io/sandstorm/pull/3292" target="_blank" rel="noopener">a known bug</a>.
</p> </p>
</template> </template>
<template v-else> <template v-else>
@ -135,6 +136,8 @@ unsafe= true
} }
} }
this.isLoading = false
setInterval(this.checkDirty, 5000) setInterval(this.checkDirty, 5000)
}, },
head: { head: {
@ -153,9 +156,7 @@ unsafe= true
this.domain = jsonResult.domain this.domain = jsonResult.domain
} catch (e) { } catch (e) {
console.error(e) console.error(e)
this.loadError = e throw e
} finally {
this.isLoading = false
} }
}, },
async commitLocal () { async commitLocal () {