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

@@ -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;
 }

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);
 }
 

resources/views/includes/nav.blade.php

@@ -4,26 +4,20 @@
     @elseif($title == "Start" )
         @include('includes.submenu-start')
     @endif
-    <a id="settings" href="/dashboard/settings" title="settings">
+    <a id="settings" class="main-nav-secondary-highlight" href="/dashboard/settings" title="settings">
-        <button>
         <svg id="nav-settings-icon" class="icon">
                 <use id="nav-settings-icon" xlink:href="/assets/images/global/sprite.svg#entypo-cog"/>
         </svg>
-        </button>
     </a>
-    <a id="navigation" href="/dashboard/navigation" title="edit navigation">
+    <a id="navigation" class="main-nav-secondary-highlight" href="/dashboard/navigation" title="edit navigation">
-        <button>
         <svg id="nav-menu-icon" class="icon">
             <use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-menu"/>
         </svg>
-        </button>
     </a>
-    <a id="navigation" href="/dashboard/logout" title="log out">
+    <a id="navigation" class="main-nav-secondary-highlight" href="/dashboard/logout" title="log out">
-        <button>
         <svg id="nav-logout-icon" class="icon">
             <use id="nav-logout-icon" xlink:href="/assets/images/global/sprite.svg#entypo-log-out"/>
         </svg>
-        </button>
     </a>
 </div>
 
@@ -37,19 +31,19 @@
     @elseif($title == "Start" )
         @include('includes.submenu-start')
     @endif
-    <a id="settings" href="/dashboard/settings" title="settings">
+    <a id="settings" class="main-nav-secondary-highlight" href="/dashboard/settings" title="settings">
-        <button>
+        <svg id="nav-settings-icon" class="icon">
-            <i class="ti ti-home-cog"></i>
+                <use id="nav-settings-icon" xlink:href="/assets/images/global/sprite.svg#entypo-cog"/>
-        </button>
+        </svg>
     </a>
-    <a id="navigation" href="/dashboard/navigation" title="edit navigation">
+    <a id="navigation" class="main-nav-secondary-highlight" href="/dashboard/navigation" title="edit navigation">
-        <button>
+        <svg id="nav-menu-icon" class="icon">
-            <i class="ti ti-arrow-autofit-height"></i>
+            <use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-menu"/>
-        </button>
+        </svg>
     </a>
-    <a id="navigation" href="/dashboard/logout" title="log out">
+    <a id="navigation" class="main-nav-secondary-highlight" href="/dashboard/logout" title="log out">
-        <button>
+        <svg id="nav-logout-icon" class="icon">
-            <i class="ti ti-logout"></i>
+            <use id="nav-logout-icon" xlink:href="/assets/images/global/sprite.svg#entypo-log-out"/>
-        </button>
+        </svg>
     </a>
 </div>

resources/views/includes/submenu-start.blade.php

@@ -1,16 +1,12 @@
 <div class="submenu">
-    <a href='/dashboard/pages' title="view pages">
+    <a class="main-nav-primary" href='/dashboard/pages' title="view pages">
-        <button>
         <svg id="option-menu-pin" class="icon">
                 <use id="option-menu-pin" xlink:href="/assets/images/global/sprite.svg#minicute-book"/>
         </svg>
-        </button>
     </a>
-    <a href='/dashboard/page/add/new' title="add new page">
+    <a class="main-nav-primary" href='/dashboard/page/add/new' title="add new page">
-        <button>
         <svg id="option-menu-pin" class="icon">
             <use id="option-menu-pin" xlink:href="/assets/images/global/sprite.svg#entypo-squared-plus"/>
         </svg>
-        </button>
     </a>
 </div>

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']);
+});
+
+*/