Rearranged main components

This commit is contained in:
Joel Collins 2020-10-27 14:52:27 +00:00
parent 250fd07e9a
commit eff03bfa2c
34 changed files with 734 additions and 938 deletions

View file

@ -0,0 +1,61 @@
<template>
<div
id="stream-display"
ref="streamDisplay"
v-observe-visibility="visibilityChanged"
class="stream-display uk-width-1-1 uk-height-1-1 scrollTarget"
>
<img
v-if="isVisible"
ref="click-frame"
class="uk-align-center uk-margin-remove-bottom"
:src="streamImgUri"
alt="Stream"
/>
</div>
</template>
<script>
// Export main app
export default {
name: "MiniStreamDisplay",
data: function() {
return {
isVisible: false
};
},
computed: {
streamImgUri: function() {
return `${this.$store.getters.baseUri}/api/v2/streams/mjpeg`;
}
},
methods: {
visibilityChanged(isVisible) {
this.isVisible = isVisible;
}
}
};
</script>
<style scoped lang="less">
.stream-display img {
text-align: center;
object-fit: contain;
border: 1px solid #555;
}
.stream-display {
width: 100%;
height: 100%;
}
.position-relative {
position: relative !important;
}
.text-center {
text-align: center;
}
</style>

View file

@ -200,13 +200,13 @@ export default {
// If task ends with an error
else if (result == "error") {
// Pass the error string back with reject
console.log("Rejecting pollTask due to error")
console.log("Rejecting pollTask due to error");
reject(new Error(response.data.output));
}
// If task ends with termination
else if (result == "cancelled") {
// Pass a generic termination error back with reject
console.log("Rejecting pollTask due to cancellation")
console.log("Rejecting pollTask due to cancellation");
reject(new Error("Task cancelled"));
} else {
// Since the task is still running, we can update the progress bar