From f1508ecb97619ea73d26cddd5a0a8ed09f2ef31d Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 26 Jan 2022 11:53:04 +0100
Subject: [PATCH] Update x link corretto QRCode + button in home

---
 GWMS.UI/GWMS.UI.csproj              |  2 +-
 GWMS.UI/Pages/Index.razor           | 63 ++++++++++++++++++++---------
 GWMS.UI/Pages/UserAdmin.razor.cs    |  3 +-
 GWMS.UI/appsettings.Production.json |  1 +
 GWMS.UI/appsettings.json            |  1 +
 Resources/ChangeLog.html            |  2 +-
 Resources/VersNum.txt               |  2 +-
 Resources/manifest.xml              |  2 +-
 8 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj
index feb5e1d..4e95372 100644
--- a/GWMS.UI/GWMS.UI.csproj
+++ b/GWMS.UI/GWMS.UI.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net5.0</TargetFramework>
-		<Version>1.0.2201.2112</Version>
+		<Version>1.0.2201.2611</Version>
 		<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
diff --git a/GWMS.UI/Pages/Index.razor b/GWMS.UI/Pages/Index.razor
index 062ab83..b6f2344 100644
--- a/GWMS.UI/Pages/Index.razor
+++ b/GWMS.UI/Pages/Index.razor
@@ -11,17 +11,21 @@
 
 @attribute [AllowAnonymous]
 
-<div class="jumbotron py-4">
+<div class="jumbotron py-3">
     <div class="row">
-        <div class="col-12 col-lg-4">
+        <div class="col-6 col-md-8 pr-0">
             <h1>GWMS</h1>
             <div>
                 GAS WareHouse Management System
             </div>
         </div>
-        <div class="col-12 col-lg-8 text-right">
-            <div class="text-light h1 d-none d-md-block">
-                <span class="fas fa-home" aria-hidden="true"></span> | <span class="fas fa-gas-pump" aria-hidden="true"></span> | <span class="fas fa-file-invoice" aria-hidden="true"></span> | <span class="fas fa-industry" aria-hidden="true"></span> | <span class="fas fa-truck-moving" aria-hidden="true"></span> | <span class="fas fa-wrench" aria-hidden="true"></span>
+        <div class="col-6 col-md-4 text-right pl-0">
+            <div class="d-flex flex-row-reverse">
+                <div class="px-2 badge badge-pill badge-dark my-4">
+                    <div class="p-2" style="font-size: 1.5em;">
+                        <a class="text-light" href="https://www.egalware.com/" target="_blank">powered by&nbsp;EgalWare <img width="32" class="img-fluid" src="img/LogoBlu.svg" /></a>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -32,20 +36,43 @@
             <div class="col-12 my-lg-5">
                 <SetupDiagnostics></SetupDiagnostics>
             </div>
-            <div class="col-12 text-center">
-                <img class="img-fluid mb-3" src="./img/LogoPizzaferri.png" />
-                <h4>
-                    Sistema di gestione e pianificazione logistica impianti distribuzione metano
-                </h4>
+            <div class="col-3"></div>
+            <div class="col-6 text-center">
+                <img class="img-fluid mb-1" src="./img/LogoPizzaferri.png" />
             </div>
-            <div class="col-12 text-center mt-5">
-                <div class="col-4"></div>
-                <div class="col-4"></div>
-                <div class="col-4 badge badge-pill badge-dark">
-                    <div class="px-1">
-                        <a class="text-light" href="https://www.egalware.com/" target="_blank">powered by&nbsp;EgalWare <img width="24" class="img-fluid" src="img/LogoBlu.svg" /></a>
-                    </div>
-                </div>
+            <div class="col-3"></div>
+            <div class="col-12 text-center">
+                <b>
+                    Sistema di gestione e pianificazione logistica impianti distribuzione metano
+                </b>
+            </div>
+            <div class="col-12 text-center mt-2">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-6 col-md-4 col-lg-3">
+                <AuthorizeView Roles="SuperAdmin, Admin, ExtTransp">
+                    <Authorized>
+                        <div class="btn btn-block btn-primary text-light py-3" title="Scheda Trasportatore">
+                            <NavLink class="text-light" href="Transporters">
+                                <i class="fas fa-2x fa-truck-moving pr-2" aria-hidden="true"></i>
+                                <h5>Scheda Trasportatore</h5>
+                            </NavLink>
+                        </div>
+                    </Authorized>
+                </AuthorizeView>
+            </div>
+            <div class="col-6 col-md-4 col-lg-3">
+                <AuthorizeView Roles="SuperAdmin, Admin, ExtUser">
+                    <Authorized>
+                        <div class="btn btn-block btn-primary text-light py-3" title="Scheda Fornitore">
+                            <NavLink class="text-light" href="Suppliers">
+                                <i class="fas fa-2x fa-industry pr-2" aria-hidden="true"></i>
+                                <h5>Scheda Fornitore</h5>
+                            </NavLink>
+                        </div>
+                    </Authorized>
+                </AuthorizeView>
             </div>
         </div>
     </div>
diff --git a/GWMS.UI/Pages/UserAdmin.razor.cs b/GWMS.UI/Pages/UserAdmin.razor.cs
index 12f1138..f188601 100644
--- a/GWMS.UI/Pages/UserAdmin.razor.cs
+++ b/GWMS.UI/Pages/UserAdmin.razor.cs
@@ -380,6 +380,7 @@ namespace GWMS.UI.Pages
 
                     string baseUrl = Configuration["BaseUrl"];
                     string baseAppPath = Configuration["BaseAppPath"];
+                    string redirPage = Configuration["QrRedirPage"];
                     if (!string.IsNullOrEmpty(baseAppPath))
                     {
                         if (baseUrl.EndsWith("/"))
@@ -388,7 +389,7 @@ namespace GWMS.UI.Pages
                         }
                         baseUrl = $"{baseUrl}{baseAppPath}";
                     }
-                    qrCodeVal = $"{baseUrl}Identity/Account/LogIn?uid={user.Id}&uem={user.Email}&pag=Transporters";
+                    qrCodeVal = $"{baseUrl}Identity/Account/LogIn?uid={user.Id}&uem={user.Email}&pag={redirPage}";
                 }
             });
             pUpd.Wait();
diff --git a/GWMS.UI/appsettings.Production.json b/GWMS.UI/appsettings.Production.json
index 6f50518..153dff4 100644
--- a/GWMS.UI/appsettings.Production.json
+++ b/GWMS.UI/appsettings.Production.json
@@ -21,5 +21,6 @@
   "ZCodeUrl": "https://qrcode.steamware.net/",
   "BaseUrl": "https://gwms.egalware.com/",
   "BaseAppPath": "/pizzaferri/",
+  "QrRedirPage": "/pizzaferri/",
   "jumpRedir": "~/../"
 }
\ No newline at end of file
diff --git a/GWMS.UI/appsettings.json b/GWMS.UI/appsettings.json
index 683b813..3d68f24 100644
--- a/GWMS.UI/appsettings.json
+++ b/GWMS.UI/appsettings.json
@@ -38,6 +38,7 @@
   "ChartWaitDelay": 10,
   "BaseUrl": "https://localhost:44339/",
   "BaseAppPath": "",
+  "QrRedirPage": "",
   "jumpRedir": "~/../../",
   "logo": "img/LogoPizzaferri.jpg",
   "ReloadParamTimer": 15000,
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index ccedf04..7b75fc7 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2201.2112</h4>
+    <h4>Versione: 1.0.2201.2611</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 8387f5c..7c22246 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2201.2112
+1.0.2201.2611
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 9e20842..ed1a1fb 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2201.2112</version>
+  <version>1.0.2201.2611</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>