Merge remote-tracking branch 'origin/master'

This commit is contained in:
Yukino Song
2025-01-14 23:43:50 +08:00
91 changed files with 6764 additions and 2374 deletions

View File

@@ -94,6 +94,25 @@
</div>
</div>
</div>
<!-- Reset persistent display device settings -->
<div class="card p-2 my-4" v-if="platform === 'windows'">
<div class="card-body">
<h2 id="dd_reset">{{ $t('troubleshooting.dd_reset') }}</h2>
<br>
<p style="white-space: pre-line">{{ $t('troubleshooting.dd_reset_desc') }}</p>
<div class="alert alert-success" v-if="ddResetStatus === true">
{{ $t('troubleshooting.dd_reset_success') }}
</div>
<div class="alert alert-danger" v-if="ddResetStatus === false">
{{ $t('troubleshooting.dd_reset_error') }}
</div>
<div>
<button class="btn btn-warning" :disabled="ddResetPressed" @click="ddResetPersistence">
{{ $t('troubleshooting.dd_reset') }}
</button>
</div>
</div>
</div>
<!-- Logs -->
<div class="card p-2 my-4">
<div class="card-body">
@@ -127,12 +146,15 @@
clients: [],
closeAppPressed: false,
closeAppStatus: null,
ddResetPressed: false,
ddResetStatus: null,
logs: 'Loading...',
logFilter: null,
logInterval: null,
serverRestarting: false,
serverQuitting: false,
serverQuit: false
serverQuit: false,
platform: "",
};
},
computed: {
@@ -144,6 +166,12 @@
}
},
created() {
fetch("/api/config")
.then((r) => r.json())
.then((r) => {
this.platform = r.platform;
});
this.logInterval = setInterval(() => {
this.refreshLogs();
}, 5000);
@@ -221,7 +249,19 @@
this.serverQuit = true;
});
}
}
},
ddResetPersistence() {
this.ddResetPressed = true;
fetch("/api/reset-display-device-persistence", { method: "POST" })
.then((r) => r.json())
.then((r) => {
this.ddResetPressed = false;
this.ddResetStatus = r.status.toString() === "true";
setTimeout(() => {
this.ddResetStatus = null;
}, 5000);
});
},
},
});