Egalware/gwms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/FixFavicon'

Browse Source
This commit is contained in:
Samuele Locatelli
2021-11-12 09:48:13 +01:00
parent eb1e301d5f 50e29dc0b9
commit bcbc9ea92c
22 changed files with 158 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GWMS.UI/GWMS.UI.csproj
+2 -2
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>1.0.2111.1109</Version>
<Version>1.0.2111.1209</Version>
<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
@@ -38,7 +38,7 @@
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
<PackageReference Include="BlazorBarcodeScanner.ZXing.JS" Version="0.2.4" />
<PackageReference Include="BlazorBarcodeScanner.ZXing.JS" Version="0.2.5" />
<PackageReference Include="Blazorise" Version="0.9.4.4" />
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.4.4" />
<PackageReference Include="Blazorise.Charts" Version="0.9.4.4" />
GWMS.UI/Pages/Index.razor
+2
View File
@@ -1,4 +1,6 @@
@page "/"
@page "/Home"
@page "/Index"
@using GWMS.Data
@using GWMS.UI.Data
GWMS.UI/Pages/Shared/_Favicons.cshtml
+7
View File
@@ -0,0 +1,7 @@
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
GWMS.UI/Pages/Shared/_Layout.cshtml
+4
View File
@@ -15,6 +15,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>GWMS.UI User Management</title>
<base href="~/" />
@*@Html.Partial("_Favicons")*@
<partial name="Shared/_Favicons.cshtml">
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="font-awesome/css/fontawesome.min.css" />
<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
GWMS.UI/Pages/_Host.cshtml
+6 -3
View File
@@ -15,13 +15,16 @@
<meta name="mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>GWMS.UI</title>
<base href="~/" />
@*<base href="~/" />*@
@*@Html.Partial("_Favicons")*@
<partial name="Shared/_Favicons.cshtml">
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="font-awesome/css/fontawesome.min.css" />
<link rel="stylesheet" href="Chart.js/Chart.min.css" />
<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
<link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
<link href="css/site.css" rel="stylesheet" />
<link href="GWMS.UI.styles.css" rel="stylesheet" />
</head>
@@ -62,7 +65,7 @@
<script src="font-awesome/js/all.min.js"></script>
<script src="_framework/blazor.server.js"></script>
<script type="text/javascript" src="~/lib/qrcode.js"></script>
<script type="text/javascript" src="lib/qrcode.js"></script>
<script type="text/javascript">
// gestione qrcode... da https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity-enable-qrcodes?view=aspnetcore-5.0
//var qrcode = new QRCode("qrCodeImg");
GWMS.UI/Shared/NavMenu.razor
+1 -1
View File
@@ -30,7 +30,7 @@
<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
<ul class="nav flex-column">
<li class="nav-item px-3" title="Home">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
<NavLink class="nav-link" href="Home" Match="NavLinkMatch.All">
<span class="fas fa-2x fa-home pr-2" aria-hidden="true"></span>
<span class="@hideText">Home</span>
</NavLink>
GWMS.UI/Startup.cs
+2
View File
@@ -86,6 +86,8 @@ namespace GWMS.UI
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
});
app.UsePathBase(Configuration["BaseAppPath"]);
app.UseAuthentication();
app.UseHttpsRedirection();
GWMS.UI/appsettings.json
+1
View File
@@ -36,6 +36,7 @@
"MaxLogRecord": 360,
"ZCodeUrl": "https://qrcode.steamware.net/",
"ChartWaitDelay": 10,
"BaseAppPath": "/pizzaferri/",
"logo": "img/LogoPizzaferri.jpg",
"ReloadParamTimer": 15000,
"ReloadStatusTimer": 30000,
GWMS.UI/wwwroot/android-chrome-192x192.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

GWMS.UI/wwwroot/android-chrome-512x512.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

GWMS.UI/wwwroot/apple-touch-icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

GWMS.UI/wwwroot/browserconfig.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>
GWMS.UI/wwwroot/favicon-16x16.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 453 B

GWMS.UI/wwwroot/favicon-32x32.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 716 B

GWMS.UI/wwwroot/favicon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 15 KiB

GWMS.UI/wwwroot/mstile-150x150.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

GWMS.UI/wwwroot/safari-pinned-tab.svg
+100
View File
@@ -0,0 +1,100 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="1813.000000pt" height="1813.000000pt" viewBox="0 0 1813.000000 1813.000000"
preserveAspectRatio="xMidYMid meet">
<metadata>
Created by potrace 1.14, written by Peter Selinger 2001-2017
</metadata>
<g transform="translate(0.000000,1813.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M6181 17680 c-154 -33 -263 -91 -371 -200 -131 -131 -197 -273 -207
-450 -19 -326 182 -617 494 -717 305 -97 648 36 812 315 165 280 119 629 -113
857 -133 130 -280 193 -466 200 -58 2 -125 0 -149 -5z"/>
<path d="M964 17604 c-438 -73 -794 -390 -917 -814 -189 -652 235 -1330 904
-1446 137 -24 351 -15 480 19 385 101 688 387 808 762 67 210 71 445 11 665
-28 101 -116 279 -181 365 -262 345 -689 519 -1105 449z"/>
<path d="M7600 16204 c-81 -17 -209 -80 -275 -134 -240 -199 -312 -535 -174
-813 158 -320 552 -456 877 -302 336 159 477 559 313 890 -70 141 -166 236
-306 306 -134 66 -288 85 -435 53z"/>
<path d="M3083 15689 c-550 -115 -885 -651 -748 -1194 87 -344 353 -610 701
-701 83 -22 121 -26 239 -26 120 -1 155 3 240 26 372 98 638 380 715 758 37
181 17 384 -57 558 -182 428 -643 673 -1090 579z"/>
<path d="M9307 15274 c-342 -83 -512 -462 -346 -775 57 -107 174 -207 294
-250 49 -18 82 -22 175 -22 93 0 126 4 175 22 146 53 270 174 326 320 33 84
38 247 10 339 -81 266 -366 431 -634 366z"/>
<path d="M16815 15209 c-419 -60 -784 -367 -920 -773 -68 -202 -75 -448 -20
-660 63 -240 214 -463 418 -617 103 -78 276 -161 402 -195 195 -51 458 -43
648 22 289 98 525 303 661 574 91 180 121 313 120 525 -1 161 -17 254 -68 389
-171 453 -604 751 -1086 745 -52 -1 -122 -5 -155 -10z"/>
<path d="M5400 14413 c-52 -9 -177 -54 -223 -82 -124 -72 -219 -176 -282 -306
-99 -203 -99 -407 0 -610 52 -106 106 -174 195 -246 125 -101 265 -149 436
-149 375 0 675 280 701 655 23 338 -217 661 -544 730 -63 14 -224 18 -283 8z"/>
<path d="M10773 14401 c-243 -85 -353 -355 -239 -586 128 -259 475 -311 675
-100 198 210 134 546 -129 669 -56 26 -78 31 -160 33 -72 2 -108 -2 -147 -16z"/>
<path d="M14293 14069 c-505 -65 -873 -501 -850 -1004 20 -439 303 -789 733
-907 118 -32 344 -32 469 1 579 149 889 757 668 1310 -161 404 -590 656 -1020
600z"/>
<path d="M7596 13909 c-253 -28 -473 -210 -556 -459 -30 -90 -37 -241 -16
-339 41 -194 178 -368 357 -454 114 -55 174 -69 287 -70 119 0 190 17 301 70
164 79 287 222 343 403 34 111 32 283 -5 396 -99 299 -395 488 -711 453z"/>
<path d="M9327 13765 c-83 -23 -159 -68 -227 -135 -116 -114 -162 -223 -162
-380 0 -155 45 -264 157 -375 109 -109 218 -156 364 -156 161 -1 275 45 386
156 109 110 155 220 155 376 0 240 -153 443 -389 513 -66 19 -215 20 -284 1z"/>
<path d="M12255 12355 c-38 -9 -113 -36 -165 -62 -79 -39 -109 -60 -180 -132
-94 -95 -142 -174 -182 -301 -29 -96 -32 -270 -5 -369 67 -247 262 -441 507
-507 90 -24 263 -24 350 1 333 94 552 397 526 731 -13 176 -79 317 -206 444
-90 91 -168 139 -290 180 -86 29 -256 36 -355 15z"/>
<path d="M4280 11687 c-115 -22 -225 -100 -285 -203 -60 -103 -70 -252 -23
-367 33 -84 122 -178 206 -219 64 -31 72 -33 182 -33 102 0 121 3 170 26 85
40 163 118 207 207 36 72 38 80 38 176 0 85 -4 110 -25 156 -85 193 -270 294
-470 257z"/>
<path d="M5649 10939 c-168 -24 -319 -137 -394 -294 -44 -91 -59 -167 -52
-275 12 -200 136 -372 326 -451 90 -37 232 -50 322 -29 170 40 319 170 378
330 78 214 28 427 -136 580 -78 73 -161 115 -270 136 -81 15 -91 15 -174 3z"/>
<path d="M10835 10703 c-273 -38 -498 -241 -560 -506 -19 -81 -19 -237 0 -312
60 -235 249 -426 481 -485 156 -40 330 -19 477 57 104 53 232 183 280 283 52
107 71 187 71 305 -1 121 -20 200 -77 310 -123 237 -407 385 -672 348z"/>
<path d="M4374 10150 c-124 -18 -233 -77 -321 -173 -87 -96 -133 -218 -134
-357 -3 -400 427 -656 785 -467 167 87 276 270 277 467 1 141 -44 259 -137
359 -87 95 -184 146 -318 170 -65 12 -77 12 -152 1z"/>
<path d="M14695 10045 c-245 -54 -437 -225 -521 -465 -19 -57 -27 -102 -31
-185 -6 -142 12 -230 73 -354 78 -159 225 -289 393 -347 335 -116 702 31 861
346 179 354 27 788 -335 955 -133 62 -301 81 -440 50z"/>
<path d="M6470 9505 c-241 -66 -433 -263 -486 -501 -12 -58 -15 -103 -11 -183
9 -178 64 -299 197 -432 133 -133 274 -192 460 -193 120 0 181 14 299 71 132
63 229 160 295 293 100 204 100 393 -1 599 -77 155 -204 268 -375 329 -61 22
-93 26 -198 29 -87 2 -142 -2 -180 -12z"/>
<path d="M12712 9470 c-181 -49 -342 -179 -420 -340 -56 -114 -73 -185 -73
-303 1 -263 141 -487 376 -598 195 -92 388 -90 585 7 133 66 230 163 293 295
57 118 71 179 71 299 -1 186 -60 327 -193 460 -88 88 -157 132 -268 171 -87
31 -273 36 -371 9z"/>
<path d="M9881 9004 c-226 -60 -391 -274 -391 -505 0 -95 15 -162 55 -245 86
-179 266 -293 465 -294 149 0 268 43 367 133 168 154 221 371 142 587 -58 157
-209 292 -369 329 -64 15 -206 12 -269 -5z"/>
<path d="M4465 8414 c-252 -56 -443 -243 -507 -495 -17 -67 -19 -103 -15 -188
8 -179 66 -309 192 -436 80 -80 151 -125 257 -163 65 -24 87 -27 208 -27 116
0 145 3 205 24 138 47 255 131 330 236 154 215 176 463 62 695 -32 66 -59 103
-122 166 -89 90 -153 130 -268 169 -101 34 -242 42 -342 19z"/>
<path d="M11277 8298 c-278 -34 -483 -280 -464 -555 17 -238 165 -422 392
-488 91 -27 247 -17 342 23 211 87 346 301 329 523 -23 314 -290 536 -599 497z"/>
<path d="M7169 7455 c-344 -69 -588 -386 -566 -735 11 -172 80 -323 207 -450
86 -87 171 -139 285 -177 70 -23 97 -26 210 -27 115 0 139 3 210 27 374 124
577 515 460 884 -107 339 -459 547 -806 478z"/>
<path d="M9850 7276 c-157 -42 -278 -171 -310 -330 -32 -155 41 -330 174 -420
176 -119 405 -94 546 61 72 78 101 147 107 254 9 138 -31 243 -126 332 -107
100 -257 140 -391 103z"/>
<path d="M3912 6480 c-166 -44 -343 -176 -425 -317 -131 -227 -133 -503 -5
-721 42 -73 177 -208 250 -250 226 -133 521 -126 741 18 288 190 398 565 257
876 -90 200 -276 351 -487 398 -97 22 -240 20 -331 -4z"/>
<path d="M7370 5266 c-382 -81 -663 -349 -763 -730 -30 -114 -29 -346 1 -458
95 -349 336 -600 679 -705 81 -25 102 -27 263 -27 154 -1 185 2 255 22 345
100 598 355 691 697 23 86 27 120 27 240 1 170 -21 272 -88 413 -127 268 -338
447 -625 529 -107 31 -336 41 -440 19z"/>
<path d="M6890 2721 c-223 -50 -399 -142 -556 -293 -200 -192 -311 -408 -350
-683 -49 -344 73 -703 326 -957 311 -312 768 -416 1189 -272 359 124 635 425
731 798 97 380 -5 778 -273 1062 -165 175 -331 273 -567 336 -112 30 -384 35
-500 9z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

GWMS.UI/wwwroot/site.webmanifest
+19
View File
@@ -0,0 +1,19 @@
{
"name": "",
"short_name": "",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
GWMS.sln
+2 -2
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31321.278
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GWMS.Data", "GWMS.Data\GWMS.Data.csproj", "{50690414-013C-4A2E-9255-F5CB4BF03420}"
EndProject
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GWMS - Gas Warehouse Management System</i>
<h4>Versione: 1.0.2111.1109</h4>
<h4>Versione: 1.0.2111.1209</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2111.1109
1.0.2111.1209
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2111.1109</version>
<version>1.0.2111.1209</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>