From e75f5db9bf05462cf2b7f40cfd666cba64f802b5 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 27 Apr 2021 16:24:49 +0200
Subject: [PATCH] FIx home buttons + nav

---
 Jenkinsfile                                   |  2 +-
 .../{Pages => Components}/HomeButton.razor    |  0
 SHERPA.BBM.UI/Pages/Baskets.razor             |  2 +-
 SHERPA.BBM.UI/Pages/Index.razor               | 12 +++---
 SHERPA.BBM.UI/Pages/Negotiations.razor        |  2 +-
 SHERPA.BBM.UI/Shared/NavMenu.razor            | 40 +++++++++----------
 6 files changed, 30 insertions(+), 28 deletions(-)
 rename SHERPA.BBM.UI/{Pages => Components}/HomeButton.razor (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7129c20..1c38549 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
       steps {
 				/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
 				script {
-					withEnv(['NEXT_BUILD_NUMBER=95']) {
+					withEnv(['NEXT_BUILD_NUMBER=96']) {
 						// env.versionNumber = VersionNumber(versionNumberString : '1.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
 						env.versionNumber = VersionNumber(versionNumberString : '1.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
     					env.APP_NAME = 'SHERPA'
diff --git a/SHERPA.BBM.UI/Pages/HomeButton.razor b/SHERPA.BBM.UI/Components/HomeButton.razor
similarity index 100%
rename from SHERPA.BBM.UI/Pages/HomeButton.razor
rename to SHERPA.BBM.UI/Components/HomeButton.razor
diff --git a/SHERPA.BBM.UI/Pages/Baskets.razor b/SHERPA.BBM.UI/Pages/Baskets.razor
index bda3f5e..4ed8eb2 100644
--- a/SHERPA.BBM.UI/Pages/Baskets.razor
+++ b/SHERPA.BBM.UI/Pages/Baskets.razor
@@ -1,7 +1,7 @@
 @page "/baskets"
 
 @using SHERPA.BBM.UI.Data
-@using SHERPA.BBM.UI.Components;
+@using SHERPA.BBM.UI.Components
 
 @inject IJSRuntime JSRuntime
 @inject BBM_EFService BBMService
diff --git a/SHERPA.BBM.UI/Pages/Index.razor b/SHERPA.BBM.UI/Pages/Index.razor
index 469fcf4..64e6aad 100644
--- a/SHERPA.BBM.UI/Pages/Index.razor
+++ b/SHERPA.BBM.UI/Pages/Index.razor
@@ -1,5 +1,7 @@
 @page "/"
 
+@using SHERPA.BBM.UI.Components
+
 <div class="jumbotron">
     <h1>SHERPA BBM</h1>
 
@@ -9,11 +11,11 @@
 <div class="shortcuts mt-2">
     <div class="row">
         <div class="col-12">
-            @*<HomeButton NavLink="baskets" Icon="oi-basket" Descript="Baskets" />
-                <HomeButton NavLink="negotiations" Icon="oi-cart" Descript="Negoziazioni" />
-                <HomeButton NavLink="docs" Icon="oi-document" Descript="Documenti" />
-                <HomeButton NavLink="resources" Icon="oi-puzzle-piece" Descript="Risorse" />
-                <HomeButton NavLink="items" Icon="oi-badge" Descript="Items" />*@
+            <HomeButton NavLink="baskets" Icon="oi-basket" Descript="Baskets" />
+            <HomeButton NavLink="negotiations" Icon="oi-cart" Descript="Negoziazioni" />
+            <HomeButton NavLink="docs" Icon="oi-document" Descript="Documenti" />
+            <HomeButton NavLink="resources" Icon="oi-puzzle-piece" Descript="Risorse" />
+            <HomeButton NavLink="items" Icon="oi-badge" Descript="Items" />
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/SHERPA.BBM.UI/Pages/Negotiations.razor b/SHERPA.BBM.UI/Pages/Negotiations.razor
index c6dd72c..a9c051e 100644
--- a/SHERPA.BBM.UI/Pages/Negotiations.razor
+++ b/SHERPA.BBM.UI/Pages/Negotiations.razor
@@ -1,7 +1,7 @@
 @page "/negotiations"
 
 @using SHERPA.BBM.UI.Data
-@using SHERPA.BBM.UI.Components;
+@using SHERPA.BBM.UI.Components
 
 @inject IJSRuntime JSRuntime
 @inject BBM_EFService BBMService
diff --git a/SHERPA.BBM.UI/Shared/NavMenu.razor b/SHERPA.BBM.UI/Shared/NavMenu.razor
index f9720e3..023d7c5 100644
--- a/SHERPA.BBM.UI/Shared/NavMenu.razor
+++ b/SHERPA.BBM.UI/Shared/NavMenu.razor
@@ -37,26 +37,26 @@
                 <span class="oi oi-badge" aria-hidden="true"></span> Items
             </NavLink>
         </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="test">
-                <span class="oi oi-badge" aria-hidden="true"></span> Test
-            </NavLink>
-        </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="todo">
-                <span class="oi oi-badge" aria-hidden="true"></span> ToDo
-            </NavLink>
-        </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
-            </NavLink>
-        </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
-            </NavLink>
-        </li>
+        @*<li class="nav-item px-3">
+                <NavLink class="nav-link" href="test">
+                    <span class="oi oi-badge" aria-hidden="true"></span> Test
+                </NavLink>
+            </li>
+            <li class="nav-item px-3">
+                <NavLink class="nav-link" href="todo">
+                    <span class="oi oi-badge" aria-hidden="true"></span> ToDo
+                </NavLink>
+            </li>
+            <li class="nav-item px-3">
+                <NavLink class="nav-link" href="counter">
+                    <span class="oi oi-plus" aria-hidden="true"></span> Counter
+                </NavLink>
+            </li>
+            <li class="nav-item px-3">
+                <NavLink class="nav-link" href="fetchdata">
+                    <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
+                </NavLink>
+            </li>*@
     </ul>
 </div>