Skip to content

Commit

Permalink
Added PWA, designed scrollbar, cleanup from errors
Browse files Browse the repository at this point in the history
  • Loading branch information
marek-guran committed Dec 17, 2023
1 parent debfd54 commit 23da04a
Show file tree
Hide file tree
Showing 20 changed files with 349 additions and 8 deletions.
10 changes: 9 additions & 1 deletion WebGui/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,15 @@
<title>@ViewData["Title"]</title>
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/@(theme).css" asp-append-version="true" />
<link rel="stylesheet" href="~/Linux_Server_Info.styles.css" asp-append-version="true" />
<link rel="manifest" href="~/manifest.json">

<script>
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('js/service-worker.js');
} else {
console.log("Service worker is not supported.");
}
</script>
</head>
<body>
<header>
Expand Down
Binary file modified WebGui/bin/Debug/net8.0/Linux Server Info.dll
Binary file not shown.
Binary file modified WebGui/bin/Debug/net8.0/Linux Server Info.pdb
Binary file not shown.

Large diffs are not rendered by default.

Binary file modified WebGui/obj/Debug/net8.0/Linux Server Info.dll
Binary file not shown.
Binary file modified WebGui/obj/Debug/net8.0/Linux Server Info.pdb
Binary file not shown.
Binary file modified WebGui/obj/Debug/net8.0/ref/Linux Server Info.dll
Binary file not shown.
Binary file modified WebGui/obj/Debug/net8.0/refint/Linux Server Info.dll
Binary file not shown.
116 changes: 115 additions & 1 deletion WebGui/obj/Debug/net8.0/staticwebassets.build.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Version": 1,
"Hash": "gCcpo8t08fmeGW9bKryNw0ISw5EjvIuG42QVuFByL+4=",
"Hash": "gYS27chfbCxHYck5drVpqOM8TlXG62/bmlgxd78rsrc=",
"Source": "Linux Server Info",
"BasePath": "_content/Linux Server Info",
"Mode": "Default",
Expand Down Expand Up @@ -339,6 +339,82 @@
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\assets\\MG.ico"
},
{
"Identity": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\pwa\\logo-192x192.png",
"SourceId": "Linux Server Info",
"SourceType": "Discovered",
"ContentRoot": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\",
"BasePath": "_content/Linux Server Info",
"RelativePath": "assets/pwa/logo-192x192.png",
"AssetKind": "All",
"AssetMode": "All",
"AssetRole": "Primary",
"AssetMergeBehavior": "PreferTarget",
"AssetMergeSource": "",
"RelatedAsset": "",
"AssetTraitName": "",
"AssetTraitValue": "",
"CopyToOutputDirectory": "Never",
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\assets\\pwa\\logo-192x192.png"
},
{
"Identity": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\pwa\\logo-512x512.png",
"SourceId": "Linux Server Info",
"SourceType": "Discovered",
"ContentRoot": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\",
"BasePath": "_content/Linux Server Info",
"RelativePath": "assets/pwa/logo-512x512.png",
"AssetKind": "All",
"AssetMode": "All",
"AssetRole": "Primary",
"AssetMergeBehavior": "PreferTarget",
"AssetMergeSource": "",
"RelatedAsset": "",
"AssetTraitName": "",
"AssetTraitValue": "",
"CopyToOutputDirectory": "Never",
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\assets\\pwa\\logo-512x512.png"
},
{
"Identity": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\pwa\\pc_demo.png",
"SourceId": "Linux Server Info",
"SourceType": "Discovered",
"ContentRoot": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\",
"BasePath": "_content/Linux Server Info",
"RelativePath": "assets/pwa/pc_demo.png",
"AssetKind": "All",
"AssetMode": "All",
"AssetRole": "Primary",
"AssetMergeBehavior": "PreferTarget",
"AssetMergeSource": "",
"RelatedAsset": "",
"AssetTraitName": "",
"AssetTraitValue": "",
"CopyToOutputDirectory": "Never",
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\assets\\pwa\\pc_demo.png"
},
{
"Identity": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\pwa\\phone_demo.png",
"SourceId": "Linux Server Info",
"SourceType": "Discovered",
"ContentRoot": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\",
"BasePath": "_content/Linux Server Info",
"RelativePath": "assets/pwa/phone_demo.png",
"AssetKind": "All",
"AssetMode": "All",
"AssetRole": "Primary",
"AssetMergeBehavior": "PreferTarget",
"AssetMergeSource": "",
"RelatedAsset": "",
"AssetTraitName": "",
"AssetTraitValue": "",
"CopyToOutputDirectory": "Never",
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\assets\\pwa\\phone_demo.png"
},
{
"Identity": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\raspberry.svg",
"SourceId": "Linux Server Info",
Expand Down Expand Up @@ -491,6 +567,25 @@
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\fonts\\nunito\\nunito.ttf"
},
{
"Identity": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\js\\service-worker.js",
"SourceId": "Linux Server Info",
"SourceType": "Discovered",
"ContentRoot": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\",
"BasePath": "_content/Linux Server Info",
"RelativePath": "js/service-worker.js",
"AssetKind": "All",
"AssetMode": "All",
"AssetRole": "Primary",
"AssetMergeBehavior": "PreferTarget",
"AssetMergeSource": "",
"RelatedAsset": "",
"AssetTraitName": "",
"AssetTraitValue": "",
"CopyToOutputDirectory": "Never",
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\js\\service-worker.js"
},
{
"Identity": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\js\\site.js",
"SourceId": "Linux Server Info",
Expand Down Expand Up @@ -1592,6 +1687,25 @@
"CopyToOutputDirectory": "Never",
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\lib\\jquery-validation-unobtrusive\\LICENSE.txt"
},
{
"Identity": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\manifest.json",
"SourceId": "Linux Server Info",
"SourceType": "Discovered",
"ContentRoot": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\",
"BasePath": "_content/Linux Server Info",
"RelativePath": "manifest.json",
"AssetKind": "All",
"AssetMode": "All",
"AssetRole": "Primary",
"AssetMergeBehavior": "PreferTarget",
"AssetMergeSource": "",
"RelatedAsset": "",
"AssetTraitName": "",
"AssetTraitValue": "",
"CopyToOutputDirectory": "Never",
"CopyToPublishDirectory": "PreserveNewest",
"OriginalItemSpec": "wwwroot\\manifest.json"
}
]
}
2 changes: 1 addition & 1 deletion WebGui/obj/Debug/net8.0/staticwebassets.development.json

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions WebGui/obj/Debug/net8.0/staticwebassets.pack.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,22 @@
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\logo.svg",
"PackagePath": "staticwebassets\\assets\\logo.svg"
},
{
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\pwa\\logo-192x192.png",
"PackagePath": "staticwebassets\\assets\\pwa\\logo-192x192.png"
},
{
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\pwa\\logo-512x512.png",
"PackagePath": "staticwebassets\\assets\\pwa\\logo-512x512.png"
},
{
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\pwa\\pc_demo.png",
"PackagePath": "staticwebassets\\assets\\pwa\\pc_demo.png"
},
{
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\pwa\\phone_demo.png",
"PackagePath": "staticwebassets\\assets\\pwa\\phone_demo.png"
},
{
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\assets\\raspberry.svg",
"PackagePath": "staticwebassets\\assets\\raspberry.svg"
Expand Down Expand Up @@ -88,6 +104,10 @@
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\fonts\\nunito\\nunito.ttf",
"PackagePath": "staticwebassets\\fonts\\nunito\\nunito.ttf"
},
{
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\js\\service-worker.js",
"PackagePath": "staticwebassets\\js\\service-worker.js"
},
{
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\js\\site.js",
"PackagePath": "staticwebassets\\js\\site.js"
Expand Down Expand Up @@ -320,6 +340,10 @@
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\lib\\jquery\\dist\\jquery.min.map",
"PackagePath": "staticwebassets\\lib\\jquery\\dist\\jquery.min.map"
},
{
"Id": "C:\\Users\\skemg\\Desktop\\Linux Server Info\\wwwroot\\manifest.json",
"PackagePath": "staticwebassets\\manifest.json"
},
{
"Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.Linux Server Info.Microsoft.AspNetCore.StaticWebAssets.props",
"PackagePath": "build\\Microsoft.AspNetCore.StaticWebAssets.props"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,70 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\MG.ico))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\pwa\logo-192x192.png))">
<SourceType>Package</SourceType>
<SourceId>Linux Server Info</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/Linux Server Info</BasePath>
<RelativePath>assets/pwa/logo-192x192.png</RelativePath>
<AssetKind>All</AssetKind>
<AssetMode>All</AssetMode>
<AssetRole>Primary</AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\pwa\logo-192x192.png))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\pwa\logo-512x512.png))">
<SourceType>Package</SourceType>
<SourceId>Linux Server Info</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/Linux Server Info</BasePath>
<RelativePath>assets/pwa/logo-512x512.png</RelativePath>
<AssetKind>All</AssetKind>
<AssetMode>All</AssetMode>
<AssetRole>Primary</AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\pwa\logo-512x512.png))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\pwa\pc_demo.png))">
<SourceType>Package</SourceType>
<SourceId>Linux Server Info</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/Linux Server Info</BasePath>
<RelativePath>assets/pwa/pc_demo.png</RelativePath>
<AssetKind>All</AssetKind>
<AssetMode>All</AssetMode>
<AssetRole>Primary</AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\pwa\pc_demo.png))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\pwa\phone_demo.png))">
<SourceType>Package</SourceType>
<SourceId>Linux Server Info</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/Linux Server Info</BasePath>
<RelativePath>assets/pwa/phone_demo.png</RelativePath>
<AssetKind>All</AssetKind>
<AssetMode>All</AssetMode>
<AssetRole>Primary</AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\pwa\phone_demo.png))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\assets\raspberry.svg))">
<SourceType>Package</SourceType>
<SourceId>Linux Server Info</SourceId>
Expand Down Expand Up @@ -336,6 +400,22 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\fonts\nunito\nunito.ttf))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\js\service-worker.js))">
<SourceType>Package</SourceType>
<SourceId>Linux Server Info</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/Linux Server Info</BasePath>
<RelativePath>js/service-worker.js</RelativePath>
<AssetKind>All</AssetKind>
<AssetMode>All</AssetMode>
<AssetRole>Primary</AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\js\service-worker.js))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\js\site.js))">
<SourceType>Package</SourceType>
<SourceId>Linux Server Info</SourceId>
Expand Down Expand Up @@ -1280,5 +1360,21 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\Linux Server Info.bundle.scp.css))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\manifest.json))">
<SourceType>Package</SourceType>
<SourceId>Linux Server Info</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/Linux Server Info</BasePath>
<RelativePath>manifest.json</RelativePath>
<AssetKind>All</AssetKind>
<AssetMode>All</AssetMode>
<AssetRole>Primary</AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\manifest.json))</OriginalItemSpec>
</StaticWebAsset>
</ItemGroup>
</Project>
Binary file added WebGui/wwwroot/assets/pwa/logo-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added WebGui/wwwroot/assets/pwa/logo-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added WebGui/wwwroot/assets/pwa/pc_demo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added WebGui/wwwroot/assets/pwa/phone_demo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 31 additions & 2 deletions WebGui/wwwroot/css/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ html {
}

body {
margin-bottom: 60px;
margin-bottom: 20px;
background-color: #74B2CA;
}

Expand Down Expand Up @@ -262,4 +262,33 @@ input:checked + .slider {
display: flex;
align-items: center; /* Vertically center the items */
cursor: pointer;
}
}

/*
##################################
Scrollbar
##################################
*/

/* width */
::-webkit-scrollbar {
width: 12px;
height: 12px;
}

/* Track */
::-webkit-scrollbar-track {
box-shadow: inset 0 0 0px grey;
border-radius: 0px;
}

/* Handle */
::-webkit-scrollbar-thumb {
background: #1B2E37;
border-radius: 10px;
}

/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: #478198;
}
Loading

0 comments on commit 23da04a

Please sign in to comment.