diff --git a/donjo-app/Views/init.php b/donjo-app/Views/install/done.php similarity index 100% rename from donjo-app/Views/init.php rename to donjo-app/Views/install/done.php diff --git a/donjo-app/Views/install.php b/donjo-app/Views/install/index.php similarity index 94% rename from donjo-app/Views/install.php rename to donjo-app/Views/install/index.php index 033e306ab..9dc5f4a09 100644 --- a/donjo-app/Views/install.php +++ b/donjo-app/Views/install/index.php @@ -51,7 +51,7 @@

Klik “Lanjut” untuk memulai proses instalasi database SID. Proses instalasi memerlukan waktu singkat. Setelah selesai, Anda akan mendapatkan “username” dan “password”. Catat/simpan “username” dan “password” sebelum meneruskan ke langkah selanjutnya.


- Lanjut      + Lanjut     
diff --git a/donjo-app/controllers/Main.php b/donjo-app/controllers/Main.php index 6b597faf5..3e23947d9 100644 --- a/donjo-app/controllers/Main.php +++ b/donjo-app/controllers/Main.php @@ -46,13 +46,18 @@ public function index() redirect('first'); } } else { - redirect('main/initial'); + redirect(route('install.view')); } } + /** + * View halaman install + * + * @return string + */ public function initial() { - view('install'); + return view('install/index'); } public function install() @@ -61,15 +66,10 @@ public function install() $out = $install->run(); if (null === $out) { - redirect('/'); + redirect(route_to('index')); } - view('init', $out); - } - - public function init($out = null) - { - view('init', $out); + view('install/done', $out); } public function auth() diff --git a/donjo-app/helpers/donjolib_helper.php b/donjo-app/helpers/donjolib_helper.php index e368f74d5..533e3128c 100644 --- a/donjo-app/helpers/donjolib_helper.php +++ b/donjo-app/helpers/donjolib_helper.php @@ -14,7 +14,7 @@ function route_to(string $route_name, ...$args) $urlParts = parse_url($route); if ($urlParts !== false && isset($urlParts['path'])) { - return trim($urlParts['path'], '/'); + return $urlParts['path']; } return $route; diff --git a/donjo-app/routes/cli.php b/donjo-app/routes/cli.php index 16f3c5621..7dfb15fbe 100644 --- a/donjo-app/routes/cli.php +++ b/donjo-app/routes/cli.php @@ -11,4 +11,3 @@ // Luthier\Cli::maker(); // Luthier\Cli::migrations(); - diff --git a/donjo-app/routes/web.php b/donjo-app/routes/web.php index 09d52ffbd..c729c2781 100644 --- a/donjo-app/routes/web.php +++ b/donjo-app/routes/web.php @@ -1,3 +1,8 @@ name('index'); + +Route::group('install', static function () { + Route::get('/', 'main@initial')->name('install.view'); + Route::get('run', 'main@install')->name('install.run'); +});