Merge branch 'master' into default-notification

# Conflicts: # server/notification.js # src/components/NotificationDialog.vue
2025-08-11 23:52:31 +08:00 · 2021-09-07 23:40:42 +08:00
parent 4faa409027 5ca0dd628d
commit 0aeaf87f5b
40 changed files with 1082 additions and 785 deletions
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -85,7 +85,12 @@ export default {
                this.$root.toastRes(res)

                if (res.ok) {
-                    this.$router.push("/")
+                    this.processing = true;
+
+                    this.$root.login(this.username, this.password, (res) => {
+                        this.processing = false;
+                        this.$router.push("/")
+                    })
                }
            })
        },