diff --git a/Wonky.Client/App.razor b/Wonky.Client/App.razor index 7cbf7ae6..dcd1dfe9 100644 --- a/Wonky.Client/App.razor +++ b/Wonky.Client/App.razor @@ -21,7 +21,7 @@ - Venligst login + Login nødvendig Checker autorisation ... diff --git a/Wonky.Client/Pages/AdminVewSalesReportPage.razor b/Wonky.Client/Pages/AdminVewSalesReportPage.razor index f98409ba..4b28b790 100644 --- a/Wonky.Client/Pages/AdminVewSalesReportPage.razor +++ b/Wonky.Client/Pages/AdminVewSalesReportPage.razor @@ -38,7 +38,7 @@ { @Report.ReportData.Name
-
+

@Report.ReportData.Name

diff --git a/Wonky.Client/Pages/SalesReportViewPage.razor b/Wonky.Client/Pages/SalesReportViewPage.razor index ae26d401..2f074a11 100644 --- a/Wonky.Client/Pages/SalesReportViewPage.razor +++ b/Wonky.Client/Pages/SalesReportViewPage.razor @@ -37,7 +37,7 @@ { @_report.ReportData.Name
-
+

@_report.ReportData.Name

diff --git a/Wonky.Client/Shared/MainLayout.razor b/Wonky.Client/Shared/MainLayout.razor index dd19a911..3d78003d 100644 --- a/Wonky.Client/Shared/MainLayout.razor +++ b/Wonky.Client/Shared/MainLayout.razor @@ -20,11 +20,14 @@
- +
- + +
+
+
@Body diff --git a/Wonky.Client/Shared/MainLayout.razor.css b/Wonky.Client/Shared/MainLayout.razor.css index 671e2c9c..106cf54d 100644 --- a/Wonky.Client/Shared/MainLayout.razor.css +++ b/Wonky.Client/Shared/MainLayout.razor.css @@ -8,6 +8,10 @@ main { flex: 1; } +.nav-icon-only { + background-image: linear-gradient(180deg, rgb(22, 21, 23) 10%, #ffaa00 100%); +} + .sidebar { background-image: linear-gradient(180deg, rgb(22, 21, 23) 10%, #ffaa00 100%); } @@ -40,6 +44,7 @@ main { } @media (max-width: 1024px) { + .top-row:not(.auth) { display: none; } @@ -53,12 +58,31 @@ main { } } +@media (max-width: 1024px){ + .nav-icon-only { + display: block; + } + + .sidebar { + display: none; + } + + .top-row { + display: none; + } +} + @media (min-width: 1025px) { .page { flex-direction: row; } - + + .nav-icon-only { + display: none; + } + .sidebar { + display: block; width: 200px; height: 100vh; position: sticky; @@ -66,6 +90,7 @@ main { } .top-row { + display: block; position: sticky; top: 0; z-index: 1; diff --git a/Wonky.Client/Shared/NavIconOnly.razor b/Wonky.Client/Shared/NavIconOnly.razor new file mode 100644 index 00000000..2cefc603 --- /dev/null +++ b/Wonky.Client/Shared/NavIconOnly.razor @@ -0,0 +1,96 @@ +@* +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +*@ + +@inject IWebAssemblyHostEnvironment HostEnvironment +@using Wonky.Client.Components; + +
+ +
diff --git a/Wonky.Client/Shared/NavIconOnly.razor.css b/Wonky.Client/Shared/NavIconOnly.razor.css new file mode 100644 index 00000000..ef5e6af0 --- /dev/null +++ b/Wonky.Client/Shared/NavIconOnly.razor.css @@ -0,0 +1,38 @@ +.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; +} diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index af82130f..38e81223 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.8.135", - "isBeta": true, + "version": "0.8.136", + "isBeta": false, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "innoBaseUrl": "https://staging.innotec.dk", + "innoBaseUrl": "https://production.innotec.dk", "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=", "glsId": "", "virkUrl": "api/v2/services/virk", diff --git a/Wonky.Client/wwwroot/css/app-135.css b/Wonky.Client/wwwroot/css/app-136.css similarity index 93% rename from Wonky.Client/wwwroot/css/app-135.css rename to Wonky.Client/wwwroot/css/app-136.css index 38cd9de1..31a5d7f8 100644 --- a/Wonky.Client/wwwroot/css/app-135.css +++ b/Wonky.Client/wwwroot/css/app-136.css @@ -138,9 +138,12 @@ footer.version { https://developer.mozilla.org/en-US/docs/Web/CSS/break-before firefox still needs this */ - page-break-before: always; page-break-after: always; page-break-inside: avoid; + + break-after: page; + break-inside: avoid; + } /* printer classes */ @@ -159,11 +162,10 @@ footer.version { color-adjust: exact; } .report-page { - /* deprecated properties */ - page-break-before: always; + /* deprecated style properties */ page-break-after: always; page-break-inside: avoid; - /* new properties */ + /* new style properties */ break-after: page; break-inside: avoid; diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index 98ea1bf5..91974441 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -13,7 +13,7 @@ - +