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
Showing only changes of commit c0c70758c6 - Show all commits

View File

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