studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 64 Pull Requests 5 Releases Wiki Activity

Sync branch magefile with main #104308

Merged
Sybren A. Stüvel merged 85 commits from abelli/flamenco:magefile into magefile 2024-05-13 16:26:32 +02:00
Conversation 0 Commits 85 Files Changed 145 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c0c70758c6 - Show all commits

4
web/app/src/App.vue
View File

@ -17,7 +17,7 @@
</li> </li>
</ul> </ul>
</nav> </nav>
<farm-status :status="farmStatus.status()" /> <farm-status v-if="socketIOConnected" :status="farmStatus.status()" />
<api-spinner /> <api-spinner />
<span class="app-version"> <span class="app-version">
<a :href="backendURL('/flamenco-addon.zip')">add-on</a> <a :href="backendURL('/flamenco-addon.zip')">add-on</a>
@ -51,6 +51,7 @@ export default {
flamencoVersion: DEFAULT_FLAMENCO_VERSION, flamencoVersion: DEFAULT_FLAMENCO_VERSION,
backendURL: backendURL, backendURL: backendURL,
farmStatus: useFarmStatus(), farmStatus: useFarmStatus(),
socketIOConnected: false,
}), }),
mounted() { mounted() {
window.app = this; window.app = this;
@ -61,6 +62,7 @@ export default {
this.$watch( this.$watch(
() => sockStatus.isConnected, () => sockStatus.isConnected,
(isConnected) => { (isConnected) => {
this.socketIOConnected = isConnected;
if (!isConnected) return; if (!isConnected) return;
if (!sockStatus.wasEverDisconnected) return; if (!sockStatus.wasEverDisconnected) return;
this.socketIOReconnect(); this.socketIOReconnect();