improve setup and DB initialization

2022-01-26 09:51:42 +01:00
parent 5a3ff7564d
commit 55c066b845
13 changed files with 96 additions and 57 deletions
--- a/middleware/setup.js
+++ b/middleware/setup.js
@@ -1,9 +1,14 @@
-export default function ({ req, redirect, route }) {
+export default async function ({ $config, req, redirect, route, error }) {
  if (process.server) {
-    if (req.firstrun && route.path !== '/setup') {
-      return redirect('/setup')
+    if (req.status === 'SETUP' && route.path !== '/setup/0') {
+      return redirect('/setup/0')
    }
-    if (!req.firstrun && route.path === '/setup') {
+
+    if (req.status === 'DBCONF' && route.path !== '/setup/1') {
+      return redirect('/setup/1')
+    }
+    
+    if (req.status === 'READY' && route.path.startsWith('/setup')) {
      return redirect('/')
    }
  }