Updated the sidebar open/close functionality

scify · Oct 25, 2024 · 46ffe8b · 46ffe8b
1 parent d89f2f7
commit 46ffe8b
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 89 deletions.
diff --git a/app/Http/Controllers/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemController.php b/app/Http/Controllers/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemController.php
@@ -68,7 +68,7 @@ public function store(Request $request) {
             'problem-description' => ['required'],
             'problem-status' => ['required'], // bookmark2
             'problem-default-language' => ['required'], // bookmark2
-            'problem-slug' => ['required','unique:crowd_sourcing_project_problems,slug'],
+            'problem-slug' => ['required', 'unique:crowd_sourcing_project_problems,slug'],
         ]);
 
         $crowdSourcingProjectProblem = CrowdSourcingProjectProblem::create([

diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
@@ -12,8 +12,6 @@ class ComposerServiceProvider extends ServiceProvider {
      * @return void
      */
     public function boot() {
-        View::composer('loggedin-environment.partials.menu', 'App\ViewComposers\MenuComposer');
-
         View::composer('errors::layout', 'App\ViewComposers\ErrorPagesComposer');
 
         View::composer('partials.language-selector', 'App\ViewComposers\LanguageSelectorComposer');

diff --git a/app/ViewComposers/MenuComposer.php b/app/ViewComposers/MenuComposer.php
diff --git a/resources/assets/sass/sidebar.scss b/resources/assets/sass/sidebar.scss
@@ -67,14 +67,16 @@
 .sidebar-menu-toggler-container {
 	background-color: var(--clr-secondary-grey);
 	border-radius: 100%;
-	width: 60px;
-	height: 60px;
+	width: 55px;
+	height: 55px;
 	padding: 10px;
 	#sidebar-menu-toggler {
 		text-align: center;
+		width: 100%;
+		height: 100%;
 		i {
 			color: var(--clr-secondary-light-grey);
-			font-size: 40px;
+			font-size: 33px;
 			width: 100%;
 			height: 100%;
 		}

diff --git a/resources/views/loggedin-environment/layout.blade.php b/resources/views/loggedin-environment/layout.blade.php
@@ -23,7 +23,10 @@
 </head>
 <body class="logged-in-env {{ !app(Gate::class)->check("moderate-content-by-users")? "no-sidebar": ""  }} hold-transition skin-white sidebar-mini layout-fixed layout-navbar-fixed @yield('body_class')">
 <div id="app" class="wrapper">
-    @include("loggedin-environment.partials.menu")
+    @include("loggedin-environment.partials.header-controls")
+    @canany(['moderate-content-by-users'])
+        @include("loggedin-environment.partials.sidebar-menu")
+    @endcanany
     <div class="content-wrapper">
         <section class="content">
             <div class="container" id="main-content">

diff --git a/resources/views/loggedin-environment/partials/header-controls.blade.php b/resources/views/loggedin-environment/partials/header-controls.blade.php
@@ -27,12 +27,10 @@ class="fa fa-chevron-left"></i></a>
             <li class="nav-item {{ UrlMatchesMenuItem('my-dashboard') }}">
                 <a class="nav-link" href="{{ route('my-dashboard') }}"> {{ __('menu.my_dashboard') }} </a>
             </li>
-            @if($userHasContributedToAProject)
-                <li class="nav-item {{ UrlMatchesMenuItem('my-contributions') }}">
-                    <a class="nav-link"
-                       href="{{ route('my-contributions') }}"> {{ __('my-history.my_contributions') }} </a>
-                </li>
-            @endif
+            <li class="nav-item {{ UrlMatchesMenuItem('my-contributions') }}">
+                <a class="nav-link"
+                   href="{{ route('my-contributions') }}"> {{ __('my-history.my_contributions') }} </a>
+            </li>
             <li class="nav-item dropdown user user-menu">
                 <a class="nav-link dropdown-toggle" href="#" id="userMenu" data-toggle="dropdown" aria-haspopup="true"
                    aria-expanded="false">

diff --git a/resources/views/loggedin-environment/partials/menu.blade.php b/resources/views/loggedin-environment/partials/menu.blade.php
diff --git a/resources/views/loggedin-environment/partials/sidebar-menu.blade.php b/resources/views/loggedin-environment/partials/sidebar-menu.blade.php
@@ -0,0 +1,52 @@
+<aside class="main-sidebar sidebar-dark-primary elevation-4">
+    <div class="sidebar">
+        <nav class="mt-2">
+            <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu">
+                @can("manage-platform-content")
+                    <li class="nav-header">CONTENT MANAGEMENT</li>
+
+                    <li class="nav-item {{UrlMatchesMenuItem('projects')}}">
+                        <a class="nav-link" href="{{ route('projects.index') }}"><i
+                                    class="nav-icon fa fa-list "></i>
+                            <p>See all Projects</p></a>
+                    </li>
+                    <li class="nav-item {{UrlMatchesMenuItem('projects/create')}}">
+                        <a class="nav-link" href="{{ route('projects.create') }}"><i
+                                    class="nav-icon fa fa-plus "></i>
+                            <p>Create new Project</p></a>
+                    </li>
+                @endcan
+                @can("moderate-content-by-users")
+                    <li class="nav-item {{UrlMatchesMenuItem("questionnaires")}}">
+                        <a class="nav-link" href="{{ route('questionnaires.all') }}"><i
+                                    class="nav-icon fa fa-question-circle "></i>
+                            <p>Questionnaires</p></a>
+                    </li>
+                    <li class="nav-item {{UrlMatchesMenuItem("questionnaires/reports")}}">
+                        <a class="nav-link" href="{{ route('questionnaires.reports') }}"><i
+                                    class="nav-icon fa fa-question-circle "></i>
+                            <p>Responses</p></a>
+                    </li>
+                @endcan
+                @can("manage-platform")
+                    <li class="nav-header">COMMUNICATION</li>
+
+                    <li class="nav-item {{UrlMatchesMenuItem("communication/mailchimp")}}">
+                        <a class="nav-link" href="{{ route('mailchimp-integration.get') }}"><i
+                                    class="nav-icon fa fa-envelope"></i>
+                            <p>MailChimp</p></a>
+                    </li>
+                @endcan
+                @can("manage-users")
+                    <li class="nav-header">PLATFORM MANAGEMENT</li>
+
+                    <li class="nav-item {{UrlMatchesMenuItem("admin/manage-users")}}">
+                        <a class="nav-link" href="{{ url("admin/manage-users") }}"><i
+                                    class="nav-icon fa fa-users"></i>
+                            <p>Manage Users</p></a>
+                    </li>
+                @endcan
+            </ul>
+        </nav>
+    </div>
+</aside>