From 770959137aa1dad0653779243407079613ec00a1 Mon Sep 17 00:00:00 2001 From: ro Date: Wed, 8 May 2024 13:23:42 -0600 Subject: [PATCH] removed nested buttons from href tags #105 main navigation had buttons nested inside of href tags to house previous font icons that were removed, so the nesting is no longer needed and it could introduce accessibility propblems, so it needed to be cleande up now they are hrefs styled as the previous buttons so there is no visual change in the UI --- public/assets/css/dash/frame.css | 22 ++++++++ public/assets/css/dash/icons.css | 1 - resources/views/includes/nav.blade.php | 52 ++++++++----------- .../views/includes/submenu-start.blade.php | 18 +++---- routes/web.php | 31 +++++++++++ 5 files changed, 83 insertions(+), 41 deletions(-) diff --git a/public/assets/css/dash/frame.css b/public/assets/css/dash/frame.css index 2c3f925..ecf001f 100644 --- a/public/assets/css/dash/frame.css +++ b/public/assets/css/dash/frame.css @@ -31,6 +31,28 @@ a.secondary { transition: all 0.2s linear; } +a.main-nav-primary { + height: 24px; + background: var(--primary); + display: inline-block; + vertical-align: top; + border-radius: 3px; + padding: 8px 0; + width: 40px; + text-align: center; +} + +a.main-nav-secondary-highlight { + height: 24px; + background: var(--secondary-highlight); + display: inline-block; + vertical-align: top; + border-radius: 3px; + padding: 8px 0; + width: 40px; + text-align: center; +} + img.logo-medium { width: 140px; } diff --git a/public/assets/css/dash/icons.css b/public/assets/css/dash/icons.css index 074a7d9..aee4899 100644 --- a/public/assets/css/dash/icons.css +++ b/public/assets/css/dash/icons.css @@ -3,7 +3,6 @@ svg.icon { fill: var(--secondary); width: 25px; height: 25px; - padding-top: 5px; color: var(--secondary); } diff --git a/resources/views/includes/nav.blade.php b/resources/views/includes/nav.blade.php index 9b69b08..fc292af 100644 --- a/resources/views/includes/nav.blade.php +++ b/resources/views/includes/nav.blade.php @@ -4,26 +4,20 @@ @elseif($title == "Start" ) @include('includes.submenu-start') @endif - - + - - + + + + - - + + + + @@ -37,19 +31,19 @@ @elseif($title == "Start" ) @include('includes.submenu-start') @endif - - + + + + - - + + + + - - + + + + diff --git a/resources/views/includes/submenu-start.blade.php b/resources/views/includes/submenu-start.blade.php index ab5c2b1..3c3ce1a 100644 --- a/resources/views/includes/submenu-start.blade.php +++ b/resources/views/includes/submenu-start.blade.php @@ -1,16 +1,12 @@
- - + - - + + + +
diff --git a/routes/web.php b/routes/web.php index 592cf28..e2218c5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,3 +17,34 @@ use App\Http\Controllers\RouteController; //routing needs a bit more nuance, so requests are sent to a controller to sort traffic Route::get("/{first?}/{second?}/{third?}/{four?}", [RouteController::class, 'get']); Route::post("/{first?}/{second?}/{third?}", [RouteController::class, 'post']); + +/* + +REFACTOR: Routing should be handled here instead of a seperate controller, so this needs to be reworked +KEEP FOR REFERENCE FOR REBUILD + +Route::get("/", [StartController::class, 'index']); + +//DASHBOARD + +//login stuff +Route::get("/dashboard", [IndexController::class, 'login']); +Route::post("/login", [AuthController::class, 'enter']); + +//back +Route::group(['prefix' => 'dashboard', 'middleware' => 'member.check'], function () { + Route::get("/start", [IndexController::class, 'start'])->name('start'); + Route::get("/pages/{pageFilter?}/{pageNum?}", [IndexController::class, 'book']); + Route::get("/page/{mode}/{uuid}", [IndexController::class, 'page']); + Route::get("/settings", [IndexController::class, 'settings']); + Route::get("/navigation", [IndexController::class, 'navigation']); + Route::get("/logout", [AuthController::class, 'exit']); +}); + +//theme kit +Route::group(['prefix' => 'theme', 'middleware' => 'member.check'], function () { + Route::get("/", [ThemeController::class, 'start']); + Route::get("/view/{view?}", [ThemeController::class, 'getView']); +}); + +*/