Skip to content

Commit

Permalink
+
Browse files Browse the repository at this point in the history
  • Loading branch information
@badhitman
badhitman committed Feb 23, 2024
1 parent b058dfd commit 707eeb7
Show file tree
Hide file tree
Showing 3,683 changed files with 615 additions and 566,559 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 5 additions & 5 deletions DBContextLib/db-context.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<VersionPrefix>3</VersionPrefix>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions RazorLib/razor-lib.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
<PackageReference Include="MudBlazor" Version="6.11.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
<PackageReference Include="MudBlazor" Version="6.16.0" />
<PackageReference Include="Refit" Version="7.0.0" />
<PackageReference Include="Refit.HttpClientFactory" Version="7.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ServerLib/server-lib.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.59" />
<PackageReference Include="MailKit" Version="4.3.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="MQTTnet" Version="4.3.3.952" />
Expand Down
4 changes: 2 additions & 2 deletions SharedLib/shared-lib.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AngleSharp" Version="1.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.0" />
<PackageReference Include="AngleSharp" Version="1.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions ab-log.app/ab-log.app.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion ab-log.web/ab-log.web.client/Program.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using MudBlazor.Services;

var builder = WebAssemblyHostBuilder.CreateDefault(args);

builder.Services.AddMudServices();
await builder.Build().RunAsync();
30 changes: 3 additions & 27 deletions ab-log.web/ab-log.web.client/ab-log.web.client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" PrivateAssets="all" />
<PackageReference Include="MudBlazor" Version="6.11.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.2" PrivateAssets="all" />
<PackageReference Include="MudBlazor" Version="6.16.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -28,28 +28,4 @@
<Content Update="wwwroot\**;" CopyToOutputDirectory="Always" />
</ItemGroup>

<ItemGroup>
<Content Update="Pages\CamerasPage.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="Pages\HardwareConfigPage.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="Pages\HardwaresPage.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="Pages\IndexPage.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="Pages\MqttConfigPage.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="Pages\ScriptsPage.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
<Content Update="Pages\TriggersPage.razor">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion ab-log.web/ab-log.web/Components/App.razor
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="en" data-bs-theme="dark">

<head>
<meta charset="utf-8" />
Expand All @@ -8,13 +8,15 @@
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="css/app.css" />
<link rel="stylesheet" href="ab-log.web.styles.css" />
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
<link rel="icon" type="image/png" href="favicon.png" />
<HeadOutlet />
</head>

<body>
<Routes />
<script src="_framework/blazor.web.js"></script>
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
</body>

</html>
9 changes: 9 additions & 0 deletions ab-log.web/ab-log.web/Components/Layout/MainLayout.razor
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@inherits LayoutComponentBase

<MudThemeProvider @bind-IsDarkMode="@_isDarkMode" Theme="_theme" />
<MudDialogProvider />
<MudSnackbarProvider />

<div class="page">
<div class="sidebar">
<NavMenu />
Expand All @@ -21,3 +25,8 @@
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>

@code {
private MudTheme? _theme;
private bool _isDarkMode = true;
}
45 changes: 38 additions & 7 deletions ab-log.web/ab-log.web/Components/Layout/NavMenu.razor
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<div class="top-row ps-3 navbar navbar-dark">
<style>
#main-left-menu > div > a {
padding-left: 12px;
}
</style>

<div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="">ab-log.web</a>
</div>
Expand All @@ -7,24 +13,49 @@
<input type="checkbox" title="Navigation menu" class="navbar-toggler" />

<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
<nav class="flex-column">
<nav id="main-left-menu" class="flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Настройки
</NavLink>
</div>

<div class="nav-item px-3">
<NavLink class="nav-link" href="counter">
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
<NavLink class="nav-link" href="hardwares-page">
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Устройства
</NavLink>
</div>

<div class="nav-item px-3">
<NavLink class="nav-link" href="weather">
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
<NavLink class="nav-link" href="mqtt-config-page">
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> MQTT
</NavLink>
</div>
@if (IsDebug)
{
<div class="nav-item px-3">
<NavLink class="nav-link" href="scripts-page">
<span class="bi bi-activity" aria-hidden="true"></span> Скрипты
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="triggers-page">
<span class="bi bi-alarm" aria-hidden="true"></span> Тригеры
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="cameras-page">
<span class="bi bi-camera" aria-hidden="true"></span> Камеры
</NavLink>
</div>
}
</nav>
</div>

@code {
#if DEBUG
bool IsDebug = true;
#else
bool IsDebug = false;
#endif
}
0 ...ab-log.web.Client/Pages/CamerasPage.razor → ...og.web/Components/Pages/CamerasPage.razor
View file
File renamed without changes.
0 ...web.Client/Pages/HardwareConfigPage.razor → ...Components/Pages/HardwareConfigPage.razor
View file
File renamed without changes.
0 ...-log.web.Client/Pages/HardwaresPage.razor → ....web/Components/Pages/HardwaresPage.razor
View file
File renamed without changes.
7 changes: 0 additions & 7 deletions ab-log.web/ab-log.web/Components/Pages/Home.razor
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...b/ab-log.web.Client/Pages/IndexPage.razor → ...-log.web/Components/Pages/IndexPage.razor
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@page "/"



<PageTitle>Настройки</PageTitle>

<figure>
Expand Down
0 ...log.web.Client/Pages/MqttConfigPage.razor → ...web/Components/Pages/MqttConfigPage.razor
View file
File renamed without changes.
0 ...ab-log.web.Client/Pages/ScriptsPage.razor → ...og.web/Components/Pages/ScriptsPage.razor
View file
File renamed without changes.
0 ...b-log.web.Client/Pages/TriggersPage.razor → ...g.web/Components/Pages/TriggersPage.razor
View file
File renamed without changes.
64 changes: 0 additions & 64 deletions ab-log.web/ab-log.web/Components/Pages/Weather.razor
View file

This file was deleted.

3 changes: 3 additions & 0 deletions ab-log.web/ab-log.web/Components/_Imports.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@
@using MudBlazor
@using SharedLib
@using RazorLib
@using BlazorLib
@using RazorLib.Shared.settings
@using RazorLib.Shared
7 changes: 4 additions & 3 deletions ab-log.web/ab-log.web/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using ABLog4.web.Components;
using MQTTnet;
using MQTTnet.Client;
using MudBlazor.Services;
using Newtonsoft.Json;
using NLog;
using NLog.Web;
Expand Down Expand Up @@ -43,7 +44,7 @@ public static async Task Main(string[] args)
IWebHostEnvironment _env = builder.Environment;

builder.Services.AddHttpClient<ToolsLocalService>();

builder.Services.AddMudServices();
builder.Services.AddHttpClient<MqttServerService>();

builder.Services.AddSingleton<ISystemCommandsService, SystemCommandsLocalService>();
Expand All @@ -58,7 +59,7 @@ public static async Task Main(string[] args)
builder.Services.AddSingleton<ITelegramBotFormFillingServive, TelegramBotFormFillingServive>();
builder.Services.AddSingleton<ITelegramBotHardwareViewServive, TelegramBotHardwareViewServive>();

builder.Services.AddControllersWithViews()
builder.Services.AddControllers()
.AddJsonOptions(x =>
{
x.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
Expand Down Expand Up @@ -140,11 +141,11 @@ public static async Task Main(string[] args)

app.UseStaticFiles();
app.UseAntiforgery();
app.MapControllers();

app.MapRazorComponents<App>()
.AddInteractiveWebAssemblyRenderMode()
.AddAdditionalAssemblies(typeof(ABLog4.web.client._Imports).Assembly);
app.MapControllers();

app.Run();
}
Expand Down
8 changes: 5 additions & 3 deletions ab-log.web/ab-log.web/ab-log.web.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
<PackageReference Include="NLog" Version="5.2.7" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.7" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageReference Include="MudBlazor" Version="6.16.0" />
<PackageReference Include="NLog" Version="5.2.8" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.8" />
</ItemGroup>

</Project>
11 changes: 1 addition & 10 deletions ab-log.web/ab-log.web/libman.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,13 @@
"defaultProvider": "cdnjs",
"libraries": [
{
"library": "bootstrap@5.3.0",
"library": "bootstrap@5.3.3",
"destination": "wwwroot/lib/bootstrap/"
},
{
"library": "jquery@3.7.0",
"destination": "wwwroot/lib/jquery/"
},
{
"library": "open-iconic@1.1.1",
"destination": "wwwroot/lib/open-iconic/"
},
{
"provider": "unpkg",
"library": "jquery-ui@1.13.2",
"destination": "wwwroot/lib/jquery-ui/"
},
{
"library": "highlight.js@11.8.0",
"destination": "wwwroot/lib/highlight.js/"
Expand Down
2 changes: 2 additions & 0 deletions ab-log.web/ab-log.web/wwwroot/css/app.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url('../lib/open-iconic/font/css/open-iconic-bootstrap.min.css');

html, body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}
Expand Down
Loading

0 comments on commit 707eeb7

Please sign in to comment.