From 7ede8577b442ae7203221da970f4f420de994b2a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 5 Jul 2023 17:56:11 +0200 Subject: [PATCH] Refresh grafico x SHERPA --- SHERPA.AD/Shared/NavMenu.razor | 2 +- SHERPA.AD/Shared/NavMenu.razor.cs | 25 ++---- SHERPA.AD/Shared/NavMenu.razor.css | 4 +- SHERPA.AD/Shared/NavMenu.razor.less | 4 +- SHERPA.AD/Shared/NavMenu.razor.min.css | 2 +- SHERPA.BBM.CORE/SHERPA.BBM.CORE.csproj | 70 ++++++++++++++++ SHERPA.BBM.UI/SHERPA.BBM.UI.csproj | 2 +- SHERPA.BBM.UI/Shared/NavMenu.razor | 19 +++-- SHERPA.BBM.UI/Shared/NavMenu.razor.cs | 17 ++++ SHERPA.BBM.UI/Shared/NavMenu.razor.css | 92 +++++++++++----------- SHERPA.BBM.UI/Shared/NavMenu.razor.less | 71 +++++++++++++++++ SHERPA.BBM.UI/Shared/NavMenu.razor.min.css | 1 + SHERPA.BBM.UI/compilerconfig.json | 4 + SHERPA.OAuth/Pages/Quickstart.cshtml.cs | 2 +- 14 files changed, 235 insertions(+), 80 deletions(-) create mode 100644 SHERPA.BBM.UI/Shared/NavMenu.razor.less create mode 100644 SHERPA.BBM.UI/Shared/NavMenu.razor.min.css diff --git a/SHERPA.AD/Shared/NavMenu.razor b/SHERPA.AD/Shared/NavMenu.razor index 2c9985c..a74d3ab 100644 --- a/SHERPA.AD/Shared/NavMenu.razor +++ b/SHERPA.AD/Shared/NavMenu.razor @@ -2,7 +2,7 @@
@if (!showText) { - SA + AD } else { diff --git a/SHERPA.AD/Shared/NavMenu.razor.cs b/SHERPA.AD/Shared/NavMenu.razor.cs index b88c67d..8d04489 100644 --- a/SHERPA.AD/Shared/NavMenu.razor.cs +++ b/SHERPA.AD/Shared/NavMenu.razor.cs @@ -11,23 +11,6 @@ namespace SHERPA.AD.Shared #endregion Public Properties - #region Protected Properties - - protected string hideText { get => showText ? "" : "invisible"; } - protected bool showText { get; set; } = true; - - #endregion Protected Properties - - #region Protected Methods - - protected void ToggleCompress() - { - showText = !showText; - EC_compressUpdated.InvokeAsync(showText); - } - - #endregion Protected Methods - #region Private Fields private bool collapseNavMenu = true; @@ -36,12 +19,20 @@ namespace SHERPA.AD.Shared #region Private Properties + private string hideText { get => showText ? "" : "invisible"; } private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; + private bool showText { get; set; } = true; #endregion Private Properties #region Private Methods + private void ToggleCompress() + { + showText = !showText; + EC_compressUpdated.InvokeAsync(showText); + } + private void ToggleNavMenu() { collapseNavMenu = !collapseNavMenu; diff --git a/SHERPA.AD/Shared/NavMenu.razor.css b/SHERPA.AD/Shared/NavMenu.razor.css index 6b6b8cf..88db450 100644 --- a/SHERPA.AD/Shared/NavMenu.razor.css +++ b/SHERPA.AD/Shared/NavMenu.razor.css @@ -6,9 +6,7 @@ } .top-row { height: 3.5rem; - /*background-color: rgb(247, 223, 199)*/ - /*background: linear-gradient(135deg, #c8850c 0%, #F7EF99 30%, #c8850c 100%);*/ - background: #2E2E2E; + background: linear-gradient(90deg, #000000 0%, #212121 60%, #2E2E2E 100%); } .navbar-brand { font-size: 1.5rem; diff --git a/SHERPA.AD/Shared/NavMenu.razor.less b/SHERPA.AD/Shared/NavMenu.razor.less index 69707f4..9e6c22f 100644 --- a/SHERPA.AD/Shared/NavMenu.razor.less +++ b/SHERPA.AD/Shared/NavMenu.razor.less @@ -8,9 +8,7 @@ .top-row { height: 3.5rem; - /*background-color: rgb(247, 223, 199)*/ - /*background: linear-gradient(135deg, #c8850c 0%, #F7EF99 30%, #c8850c 100%);*/ - background: #2E2E2E; + background: linear-gradient(90deg, #000000 0%, #212121 60%, #2E2E2E 100%); } .navbar-brand { diff --git a/SHERPA.AD/Shared/NavMenu.razor.min.css b/SHERPA.AD/Shared/NavMenu.razor.min.css index 9bef6ec..8de25c8 100644 --- a/SHERPA.AD/Shared/NavMenu.razor.min.css +++ b/SHERPA.AD/Shared/NavMenu.razor.min.css @@ -1 +1 @@ -.navbar-toggler{background-color:rgba(255,255,255,.1);}.navbar-home{background-color:#f7dfc7;}.top-row{height:3.5rem;background:#2e2e2e;}.navbar-brand{font-size:1.5rem;font-weight:bold;background:-webkit-linear-gradient(135deg,#d8951c 0%,#faf2a2 30%,#c8850c 100%);-webkit-background-clip:text;-webkit-text-fill-color:transparent;}.oi{width:2rem;font-size:1.1rem;vertical-align:text-top;top:-2px;}.nav-item{font-size:.9rem;padding-bottom:.5rem;}.nav-item:first-of-type{padding-top:1rem;}.nav-item:last-of-type{padding-bottom:1rem;}.nav-item ::deep a{color:#d7d7d7;border-radius:4px;height:3rem;display:flex;align-items:center;line-height:3rem;}.nav-item ::deep a.active{background-color:rgba(255,255,255,.25);color:#fff;}.nav-item ::deep a:hover{background-color:rgba(255,255,255,.1);color:#fff;}@media(min-width:641px){.navbar-toggler{display:none;}.collapse{display:block;}} \ No newline at end of file +.navbar-toggler{background-color:rgba(255,255,255,.1);}.navbar-home{background-color:#f7dfc7;}.top-row{height:3.5rem;background:linear-gradient(90deg,#000 0%,#212121 60%,#2e2e2e 100%);}.navbar-brand{font-size:1.5rem;font-weight:bold;background:-webkit-linear-gradient(135deg,#d8951c 0%,#faf2a2 30%,#c8850c 100%);-webkit-background-clip:text;-webkit-text-fill-color:transparent;}.oi{width:2rem;font-size:1.1rem;vertical-align:text-top;top:-2px;}.nav-item{font-size:.9rem;padding-bottom:.5rem;}.nav-item:first-of-type{padding-top:1rem;}.nav-item:last-of-type{padding-bottom:1rem;}.nav-item ::deep a{color:#d7d7d7;border-radius:4px;height:3rem;display:flex;align-items:center;line-height:3rem;}.nav-item ::deep a.active{background-color:rgba(255,255,255,.25);color:#fff;}.nav-item ::deep a:hover{background-color:rgba(255,255,255,.1);color:#fff;}@media(min-width:641px){.navbar-toggler{display:none;}.collapse{display:block;}} \ No newline at end of file diff --git a/SHERPA.BBM.CORE/SHERPA.BBM.CORE.csproj b/SHERPA.BBM.CORE/SHERPA.BBM.CORE.csproj index cf1735b..cd5410a 100644 --- a/SHERPA.BBM.CORE/SHERPA.BBM.CORE.csproj +++ b/SHERPA.BBM.CORE/SHERPA.BBM.CORE.csproj @@ -4,6 +4,76 @@ net6.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj index cfa4b52..e9299da 100644 --- a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj +++ b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj @@ -4,7 +4,7 @@ net6.0 60fcdaab-6c1e-4bec-9d88-f7727ef1c12c wwwroot\favicon.ico - 1.0.2307.0508 + 1.0.2307.0517 enable enable Egalware 2021+ diff --git a/SHERPA.BBM.UI/Shared/NavMenu.razor b/SHERPA.BBM.UI/Shared/NavMenu.razor index b7e7c67..110e649 100644 --- a/SHERPA.BBM.UI/Shared/NavMenu.razor +++ b/SHERPA.BBM.UI/Shared/NavMenu.razor @@ -1,8 +1,17 @@ -
- SHERPA.BBM.UI - +
+
+ @if (!showText) + { + BBM + } + else + { + SHERPA.BBM + } + +
    diff --git a/SHERPA.BBM.UI/Shared/NavMenu.razor.cs b/SHERPA.BBM.UI/Shared/NavMenu.razor.cs index e0ed534..14d1d79 100644 --- a/SHERPA.BBM.UI/Shared/NavMenu.razor.cs +++ b/SHERPA.BBM.UI/Shared/NavMenu.razor.cs @@ -1,7 +1,16 @@ +using Microsoft.AspNetCore.Components; + namespace SHERPA.BBM.UI.Shared { public partial class NavMenu { + #region Public Properties + + [Parameter] + public EventCallback EC_compressUpdated { get; set; } + + #endregion Public Properties + #region Private Fields private bool collapseNavMenu = true; @@ -10,12 +19,20 @@ namespace SHERPA.BBM.UI.Shared #region Private Properties + private string hideText { get => showText ? "" : "invisible"; } private string NavMenuCssClass => collapseNavMenu ? "collapse" : ""; + private bool showText { get; set; } = true; #endregion Private Properties #region Private Methods + private void ToggleCompress() + { + showText = !showText; + EC_compressUpdated.InvokeAsync(showText); + } + private void ToggleNavMenu() { collapseNavMenu = !collapseNavMenu; diff --git a/SHERPA.BBM.UI/Shared/NavMenu.razor.css b/SHERPA.BBM.UI/Shared/NavMenu.razor.css index acc5f9f..88db450 100644 --- a/SHERPA.BBM.UI/Shared/NavMenu.razor.css +++ b/SHERPA.BBM.UI/Shared/NavMenu.razor.css @@ -1,62 +1,58 @@ -.navbar-toggler { - background-color: rgba(255, 255, 255, 0.1); +.navbar-toggler { + background-color: rgba(255, 255, 255, 0.1); +} +.navbar-home { + background-color: #f7dfc7; } - .top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); + height: 3.5rem; + background: linear-gradient(90deg, #000000 0%, #212121 60%, #2E2E2E 100%); } - .navbar-brand { - font-size: 1.1rem; + font-size: 1.5rem; + font-weight: bold; + background: -webkit-linear-gradient(135deg, #D8951C 0%, #FAF2A2 30%, #c8850c 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; } - .oi { - width: 2rem; - font-size: 1.1rem; - vertical-align: text-top; - top: -2px; + width: 2rem; + font-size: 1.1rem; + vertical-align: text-top; + top: -2px; } - .nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; + font-size: 0.9rem; + padding-bottom: 0.5rem; +} +.nav-item:first-of-type { + padding-top: 1rem; +} +.nav-item:last-of-type { + padding-bottom: 1rem; +} +.nav-item ::deep a { + color: #d7d7d7; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; } - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item ::deep a { - color: #d7d7d7; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - } - .nav-item ::deep a.active { - background-color: rgba(255,255,255,0.25); - color: white; + background-color: rgba(255, 255, 255, 0.25); + color: white; } - .nav-item ::deep a:hover { - background-color: rgba(255,255,255,0.1); - color: white; + background-color: rgba(255, 255, 255, 0.1); + color: white; } - @media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .collapse { - /* Never collapse the sidebar for wide screens */ - display: block; - } -} + .navbar-toggler { + display: none; + } + .collapse { + /* Never collapse the sidebar for wide screens */ + display: block; + } +} \ No newline at end of file diff --git a/SHERPA.BBM.UI/Shared/NavMenu.razor.less b/SHERPA.BBM.UI/Shared/NavMenu.razor.less new file mode 100644 index 0000000..9e6c22f --- /dev/null +++ b/SHERPA.BBM.UI/Shared/NavMenu.razor.less @@ -0,0 +1,71 @@ +.navbar-toggler { + background-color: rgba(255, 255, 255, 0.1); +} + +.navbar-home { + background-color: rgb(247, 223, 199, 0.8); +} + +.top-row { + height: 3.5rem; + background: linear-gradient(90deg, #000000 0%, #212121 60%, #2E2E2E 100%); +} + +.navbar-brand { + font-size: 1.5rem; + font-weight: bold; + background: -webkit-linear-gradient(135deg, #D8951C 0%, #FAF2A2 30%, #c8850c 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + +.oi { + width: 2rem; + font-size: 1.1rem; + vertical-align: text-top; + top: -2px; +} + +.nav-item { + font-size: 0.9rem; + padding-bottom: 0.5rem; +} + +.nav-item:first-of-type { + padding-top: 1rem; +} + +.nav-item:last-of-type { + padding-bottom: 1rem; +} + +.nav-item ::deep a { + color: #d7d7d7; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; +} + +.nav-item ::deep a.active { + background-color: rgba(255,255,255,0.25); + color: white; +} + +.nav-item ::deep a:hover { + background-color: rgba(255,255,255,0.1); + color: white; +} + +@media (min-width: 641px) { + .navbar-toggler { + display: none; + } + + .collapse { + /* Never collapse the sidebar for wide screens */ + display: block; + } +} + diff --git a/SHERPA.BBM.UI/Shared/NavMenu.razor.min.css b/SHERPA.BBM.UI/Shared/NavMenu.razor.min.css new file mode 100644 index 0000000..8de25c8 --- /dev/null +++ b/SHERPA.BBM.UI/Shared/NavMenu.razor.min.css @@ -0,0 +1 @@ +.navbar-toggler{background-color:rgba(255,255,255,.1);}.navbar-home{background-color:#f7dfc7;}.top-row{height:3.5rem;background:linear-gradient(90deg,#000 0%,#212121 60%,#2e2e2e 100%);}.navbar-brand{font-size:1.5rem;font-weight:bold;background:-webkit-linear-gradient(135deg,#d8951c 0%,#faf2a2 30%,#c8850c 100%);-webkit-background-clip:text;-webkit-text-fill-color:transparent;}.oi{width:2rem;font-size:1.1rem;vertical-align:text-top;top:-2px;}.nav-item{font-size:.9rem;padding-bottom:.5rem;}.nav-item:first-of-type{padding-top:1rem;}.nav-item:last-of-type{padding-bottom:1rem;}.nav-item ::deep a{color:#d7d7d7;border-radius:4px;height:3rem;display:flex;align-items:center;line-height:3rem;}.nav-item ::deep a.active{background-color:rgba(255,255,255,.25);color:#fff;}.nav-item ::deep a:hover{background-color:rgba(255,255,255,.1);color:#fff;}@media(min-width:641px){.navbar-toggler{display:none;}.collapse{display:block;}} \ No newline at end of file diff --git a/SHERPA.BBM.UI/compilerconfig.json b/SHERPA.BBM.UI/compilerconfig.json index caa3f6e..6366418 100644 --- a/SHERPA.BBM.UI/compilerconfig.json +++ b/SHERPA.BBM.UI/compilerconfig.json @@ -6,5 +6,9 @@ { "outputFile": "wwwroot/css/fonts.css", "inputFile": "wwwroot/css/fonts.less" + }, + { + "outputFile": "Shared/NavMenu.razor.css", + "inputFile": "Shared/NavMenu.razor.less" } ] \ No newline at end of file diff --git a/SHERPA.OAuth/Pages/Quickstart.cshtml.cs b/SHERPA.OAuth/Pages/Quickstart.cshtml.cs index c49ccc2..169c7a6 100644 --- a/SHERPA.OAuth/Pages/Quickstart.cshtml.cs +++ b/SHERPA.OAuth/Pages/Quickstart.cshtml.cs @@ -71,7 +71,7 @@ namespace SHERPA.OAuth.Pages var page = 1; // int? | The page to retrieve. (optional) (default to 1) var perPage = 100; // int? | The size of the page. (optional) (default to 5) //var companySuppliers = suppliersApiInstance.ListSuppliers(firstCompanyId, null, fieldset, sort, page, perPage); - var companySuppliers = suppliersApiInstance.Lis tSuppliers(firstCompanyId, null, fieldset, sort, page, perPage); + var companySuppliers = suppliersApiInstance.ListSuppliers(firstCompanyId, null, fieldset, sort, page, perPage); var firstSupplierId = companySuppliers.Data[0].Id ?? 0; var companyCustomers = clientsApiInstance.ListClients(firstCompanyId, null, fieldset, sort, page, perPage, "tax_code='LCTSLM74E03H910R' OR vat_number='02924190164'"); var custId = companyCustomers.Data[0].Id ?? 0;