From 2454d8b2df13d3c6acbd2b7755cba87b525fe814 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 14 Dec 2020 03:03:26 -0700
Subject: [PATCH] Update nav menu

---
 resources/assets/js/components/Timeline.vue   |  2 +-
 resources/views/layouts/partial/nav.blade.php | 46 +++++++------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index a185005ab..39cc036bd 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -6,7 +6,7 @@
 				<button class="btn btn-dark px-4 rounded-pill font-weight-bold shadow" @click="syncNewPosts">Load New Posts</button>
 			</p>
 		</div>
-		<div class="d-none d-md-block col-12 pl-3 pl-md-0 pt-3 pl-0">
+		<div class="d-none col-12 pl-3 pl-md-0 pt-3 pl-0">
 			<div class="d-none d-md-flex justify-content-between align-items-center">
 				<p class="lead text-muted mb-0"><i :class="[scope == 'home' ? 'fas fa-home':'fas fa-stream']"></i> &nbsp; {{scope == 'local' ? 'Public' : 'Home'}} Timeline</p>
 				<p class="mb-0">
diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index 6dca08e36..dbd93068b 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -33,40 +33,45 @@
                 <div class="ml-auto">
                     <ul class="navbar-nav align-items-center">
                         <li class="nav-item px-md-2 d-none d-md-block">
-                            <a class="nav-link font-weight-bold text-muted" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
-                                <i class="far fa-compass fa-lg"></i>
-                                <span class="sr-only">Discover</span>
+                            <a class="nav-link font-weight-bold text-dark" href="/" title="Home" data-toggle="tooltip" data-placement="bottom">
+                                <i class="fas fa-home fa-lg"></i>
+                                <span class="sr-only">Home</span>
+                            </a>
+                        </li>
+                        <li class="nav-item px-md-2 d-none d-md-block">
+                            <a class="nav-link font-weight-bold text-dark" href="/?a=co" title="Compose" data-toggle="tooltip" data-placement="bottom">
+                                <i class="far fa-plus-square fa-lg"></i>
+                                <span class="sr-only">Compose</span>
                             </a>
                         </li>
                         <li class="nav-item px-md-2">
-                            <a class="nav-link font-weight-bold text-muted" href="/account/direct" title="Direct" data-toggle="tooltip" data-placement="bottom">
+                            <a class="nav-link font-weight-bold text-dark" href="/account/direct" title="Direct" data-toggle="tooltip" data-placement="bottom">
                                 <i class="far fa-comment-dots fa-lg"></i>
                                 <span class="sr-only">Direct</span>
                             </a>
                         </li>
                         <li class="nav-item px-md-2 d-none d-md-block">
-                            <a class="nav-link font-weight-bold text-muted" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
+                            <a class="nav-link font-weight-bold text-dark" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
                                 <i class="far fa-bell fa-lg"></i>
                                 <span class="sr-only">Notifications</span>
                             </a>
                         </li>
                         <li class="nav-item dropdown ml-2">
                             <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom">
-                                <i class="far fa-user fa-lg text-muted"></i>
+                                <i class="far fa-user fa-lg text-dark"></i>
                                 <span class="sr-only">User Menu</span>
                                 <img class="d-none" src="/storage/avatars/default.png?v=0" class="rounded-circle border shadow" width="34" height="34" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=0';">
                             </a>
 
                             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-                                <div class="dropdown-item font-weight-bold cursor-pointer" onclick="App.util.compose.post()">
-                                    <span class="fas fa-camera pr-2 text-primary"></span>
-                                    New Post
-                                </div>
-                                <div class="dropdown-divider"></div>
-                                <a class="dropdown-item font-weight-bold" href="/">
+                                <a class="d-block d-md-none dropdown-item font-weight-bold" href="/">
                                     <span class="fas fa-home pr-2 text-lighter"></span>
                                     Home
                                 </a>
+                                <a class="dropdown-item font-weight-bold" href="{{route('discover')}}">
+                                    <span class="far fa-compass pr-2 text-lighter"></span>
+                                    {{__('navmenu.discover')}}
+                                </a>
                                 <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
                                     <span class="fas fa-stream pr-2 text-lighter"></span>
                                     Public
@@ -75,33 +80,16 @@
                                     <span class="fas fa-history text-lighter pr-2"></span>
                                     Stories
                                 </a>
-                                {{-- <a class="dropdown-item font-weight-bold" href="#">
-                                    <span class="fas fa-circle-notch pr-2 text-lighter"></span>
-                                    Circles
-                                </a> --}}
-                                {{-- <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
-                                    <span class="fas fa-project-diagram fa-sm pr-2 text-lighter"></span>
-                                    Network
-                                </a> --}}
                                 <div class="dropdown-divider"></div>
                                 <a class="dropdown-item font-weight-bold" href="/i/me">
                                     <span class="far fa-user pr-2 text-lighter"></span>
                                     {{__('navmenu.myProfile')}}
                                 </a>
-                                <a class="d-block d-md-none dropdown-item font-weight-bold" href="{{route('discover')}}">
-                                    <span class="far fa-compass pr-2 text-lighter"></span>
-                                    {{__('navmenu.discover')}}
-                                </a>
-                                <a class="dropdown-item font-weight-bold" href="{{route('notifications')}}">
-                                    <span class="far fa-bell pr-2 text-lighter"></span>
-                                    Notifications
-                                </a>
                                 <a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
                                     <span class="fas fa-cog pr-2 text-lighter"></span>
                                     {{__('navmenu.settings')}}
                                 </a>
                                 @if(Auth::user()->is_admin == true)
-                                <div class="dropdown-divider"></div>
                                 <a class="dropdown-item font-weight-bold" href="{{ route('admin.home') }}">
                                     <span class="fas fa-shield-alt fa-sm pr-2 text-lighter"></span>
                                     {{__('navmenu.admin')}}