Hide floating button

Geeksltd · Aug 30, 2022 · 9c02738 · 9c02738
1 parent 43f17a0
commit 9c02738
Show file tree

Hide file tree

Showing 9 changed files with 162 additions and 5 deletions.
diff --git a/App_Start/Extensions/FeatureRequestHandler.cs b/App_Start/Extensions/FeatureRequestHandler.cs
@@ -66,6 +66,7 @@ async Task<ActionResult> Execute(ViewModel.FeatureView info)
             //    return Redirect(info.RequestPath.Substring(4));
 
             ViewData["Title"] = info.Item?.GetFullPath();
+            Log.Error(info.RequestPath + " | " + Request.ToPathAndQuery() + " | " + Request.ToRawUrl());
 
             if (info.Item == null)
             {

diff --git a/Controllers/Modules/Components/ProjectFrameModule.cs b/Controllers/Modules/Components/ProjectFrameModule.cs
@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Olive.Mvc;
+using vm = ViewModel;
+
+namespace ViewComponents
+{
+
+
+    public partial class ProjectFrameModule : ViewComponent
+    {
+        public async Task<IViewComponentResult> InvokeAsync(vm.ProjectFrameModule info)
+        {
+            return View(await Bind<vm.ProjectFrameModule>(info));
+        }
+    }
+}
+
+namespace Controllers
+{
+
+
+    public partial class ProjectFrameModuleController : BaseController
+    {
+    }
+}
+
+namespace ViewModel
+{
+
+
+    [BindingController(typeof(Controllers.ProjectFrameModuleController))]
+    public partial class ProjectFrameModule : IViewModel
+    {
+    }
+}
diff --git a/Controllers/Modules/Components/SideBarRightModule.cs b/Controllers/Modules/Components/SideBarRightModule.cs
@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Olive.Mvc;
+using vm = ViewModel;
+
+namespace ViewComponents
+{
+
+#pragma warning disable
+    public partial class SideBarRightModule : ViewComponent
+    {
+        public async Task<IViewComponentResult> InvokeAsync(vm.SideBarRightModule info)
+        {
+            return View(await Bind<vm.SideBarRightModule>(info));
+        }
+    }
+}
+
+namespace Controllers
+{
+
+#pragma warning disable
+    public partial class SideBarRightModuleController : BaseController
+    {
+    }
+}
+
+namespace ViewModel
+{
+
+#pragma warning disable
+    [BindingController(typeof(Controllers.SideBarRightModuleController))]
+    public partial class SideBarRightModule : IViewModel
+    {
+    }
+}
diff --git a/Controllers/Modules/Components/TaskFrameModule.cs b/Controllers/Modules/Components/TaskFrameModule.cs
@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Olive.Mvc;
+using vm = ViewModel;
+
+namespace ViewComponents
+{
+
+
+    public partial class TaskFrameModule : ViewComponent
+    {
+        public async Task<IViewComponentResult> InvokeAsync(vm.TaskFrameModule info)
+        {
+            return View(await Bind<vm.TaskFrameModule>(info));
+        }
+    }
+}
+
+namespace Controllers
+{
+
+
+    public partial class TaskFrameModuleController : BaseController
+    {
+    }
+}
+
+namespace ViewModel
+{
+
+
+    [BindingController(typeof(Controllers.TaskFrameModuleController))]
+    public partial class TaskFrameModule : IViewModel
+    {
+    }
+}
diff --git a/Olive.Microservices.Hub.csproj b/Olive.Microservices.Hub.csproj
@@ -8,7 +8,7 @@
 		<Authors>Geeks Ltd</Authors>
 		<RepositoryUrl>https://github.com/Geeksltd/Olive.Microservices.Hub/tree/master/Olive.Microservices.Hub</RepositoryUrl>
 		<PackageIcon>icon.png</PackageIcon>
-		<Version>1.3.51</Version>
+		<Version>1.3.55</Version>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
 	</PropertyGroup>

diff --git a/Views/Layouts/Default.Container.cshtml b/Views/Layouts/Default.Container.cshtml
@@ -74,6 +74,9 @@
                     @(await Component.InvokeAsync<ViewComponents.SideBarTopModule>())
                     @(await Component.InvokeAsync(leftMenu))
                     @(await Component.InvokeAsync<Footer>())
+                    <a href="https://auditlog.app.geeks.ltd/improvement" target="$modal" class="float no-print" title="Request a system improvement">
+                        <i class="fas fa-comment-medical my-float" title="Request a system improvement"></i>
+                    </a>
                 </div>
             }
 
@@ -99,17 +102,17 @@
                 </div>
             </div>
 
-            @*@if (leftMenu.HasValue())
+            @if (leftMenu.HasValue())
             {
                 @(await Component.InvokeAsync<SideBarRightModule>())
-            }*@
+            }
         </div>
     </div>
     @Html.DevCommandsWidget()
-    @if (User.Identity.IsAuthenticated){
+   @* @if (User.Identity.IsAuthenticated){
         <a href="https://auditlog.app.geeks.ltd/improvement" target="$modal" class="float no-print" title="Request a system improvement">
             <i class="fas fa-comment-medical my-float" title="Request a system improvement"></i>
         </a>
-    }
+    }*@
 </body>
 </html>
diff --git a/Views/Modules/Components/ProjectFrameModule/Default.cshtml b/Views/Modules/Components/ProjectFrameModule/Default.cshtml
@@ -0,0 +1,15 @@
+@model ViewModel.ProjectFrameModule
+@(Layout = null)
+<!-- «Start| TaskFrameModule» -->
+<div data-module="ProjectFrameModule" class="w-100">
+    @Html.StartupActionsJson()
+    <div id='projectiFram-container'
+         data-src='@(Service.FindByName("Projects").BaseUrl)/recent-projects' >
+        @*<button type='button' id='taskBarCollapse' class='navbar-btn d-none d-lg-block @(Request.Cookies[".task-bar"].OrEmpty() == "collapsed" ? "collapse" : string.Empty ) '>
+            <i class='fa @(Request.Cookies[".task-bar"].OrEmpty() == "collapsed" ? "fa-chevron-left" : "fa-chevron-right")' aria-hidden='true'></i>
+        </button>*@
+        <div class='module-content'>
+        </div>
+    </div>
+</div>
+<!-- «End| TaskFrameModule» -->
diff --git a/Views/Modules/Components/SideBarRightModule/Default.cshtml b/Views/Modules/Components/SideBarRightModule/Default.cshtml
@@ -0,0 +1,15 @@
+@model ViewModel.SideBarRightModule
+@(Layout = null)
+
+<!-- «Start| SideBarRightModule» -->
+<div data-module="SideBarRightModule" class="task-bar d-none d-lg-flex p-0 @(Request.Cookies[".task-bar"].OrEmpty() == "collapsed" ? "collapsed" : string.Empty )">
+    @Html.StartupActionsJson()
+    <button type='button' id='taskBarCollapse' class='navbar-btn d-none d-lg-block @(Request.Cookies[".task-bar"].OrEmpty() == "collapsed" ? "collapse" : string.Empty ) '>
+        <i class='fa @(Request.Cookies[".task-bar"].OrEmpty() == "collapsed" ? "fa-chevron-left" : "fa-chevron-right")' aria-hidden='true'></i>
+    </button>
+    @(await Component.InvokeAsync<ProjectFrameModule>())
+    @(await Component.InvokeAsync<TaskFrameModule>())
+
+</div>
+<!-- «End| SideBarRightModule» -->
+
diff --git a/Views/Modules/Components/TaskFrameModule/Default.cshtml b/Views/Modules/Components/TaskFrameModule/Default.cshtml
@@ -0,0 +1,15 @@
+@model ViewModel.TaskFrameModule
+@(Layout = null)
+<!-- «Start| TaskFrameModule» -->
+<div data-module="TaskFrameModule" >
+    @Html.StartupActionsJson()
+    <div id='taskiFram-container'
+         data-src='@(Service.FindByName("Tasks").BaseUrl)/widget-my-priority/@User.GetId()' >
+        @*<button type='button' id='taskBarCollapse' class='navbar-btn d-none d-lg-block @(Request.Cookies[".task-bar"].OrEmpty() == "collapsed" ? "collapse" : string.Empty ) '>
+            <i class='fa @(Request.Cookies[".task-bar"].OrEmpty() == "collapsed" ? "fa-chevron-left" : "fa-chevron-right")' aria-hidden='true'></i>
+        </button>*@
+        <div class='module-content'>
+        </div>
+    </div>
+</div>
+<!-- «End| TaskFrameModule» -->