From 82db115bafc5571c9888d3d259e78276ae5be3c1 Mon Sep 17 00:00:00 2001 From: ro Date: Tue, 27 May 2025 12:58:04 -0600 Subject: [PATCH] patch for site initialization still finding bugs related to the big routing rewrite, this one being an error when starting a new set up. fortunately, it was just a matter of getting the redirects pointing to where they should, so it's a small fix --- app/Http/Controllers/FrontController.php | 23 +++++++++++++++-------- routes/web.php | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php index a20d7fd..a43fd46 100644 --- a/app/Http/Controllers/FrontController.php +++ b/app/Http/Controllers/FrontController.php @@ -9,6 +9,7 @@ use App\Services\Data\SortingService; use App\Services\Upkeep\InitService; use App\Http\Controllers\DashController; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Redirect; use function _\find; @@ -53,7 +54,7 @@ class FrontController extends Controller $template = $currentTheme . '.index'; return view($template, $pageData); } else { - return response()->file('../public/index.html'); + return view('back.init', ["status" => false, "title" => "Set Up"]); } } } @@ -127,14 +128,20 @@ class FrontController extends Controller public static function items() { - //set permanent links - $items = ['archive', 'archives', 'tags']; - //grab menu items and set to array so router knows to look for them - $settings = json_decode(file_get_contents(env('SETTINGS_PATH')), true); - foreach ($settings['menu'] as $item) { - array_push($items, $item['slug']); + if (file_exists(env('SETTINGS_PATH'))) { + //set permanent links + $items = ['archive', 'archives', 'tags']; + //grab menu items and set to array so router knows to look for them + $settings = json_decode(file_get_contents(env('SETTINGS_PATH')), true); + foreach ($settings['menu'] as $item) { + array_push($items, $item['slug']); + } + return $items; + } else { + //return view('back.init', ["status" => false, "title" => "Set Up"]); + // return redirect()->route('start'); + return []; } - return $items; } //setup up a new site or restore from back up diff --git a/routes/web.php b/routes/web.php index cd602b7..e886838 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,7 +14,7 @@ use App\Http\Controllers\RSSController; Route::prefix('/') ->controller(FrontController::class) ->group(function () { - Route::get("/", 'start'); + Route::get("/", 'start')->name('start'); Route::get("/{year}/{month}/{slug}", 'page') ->where(['year' => '[0-9]+', 'month' => '[0-9]+', 'slug' => '[A-Za-z0-9-]+']); Route::get("/{slug}/{option?}", 'menu')