Added Filter section into TgDownloaderBlazor

DamianMorozov · Feb 27, 2024 · 9b0aa4d · 9b0aa4d
1 parent 1fe9883
commit 9b0aa4d
Show file tree

Hide file tree

Showing 57 changed files with 514 additions and 136 deletions.
diff --git a/Clients/TgDownloaderBlazor/.config/dotnet-tools.json b/Clients/TgDownloaderBlazor/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "8.0.2",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
diff --git a/Clients/TgDownloaderBlazor/Components/Pages/HomeComponent.razor.cs b/Clients/TgDownloaderBlazor/Components/Pages/HomeComponent.razor.cs
diff --git a/Clients/TgDownloaderBlazor/Components/Routes.razor b/Clients/TgDownloaderBlazor/Components/Routes.razor
diff --git a/...oaderBlazor/Components/AppComponent.razor → ...nloaderBlazor/Features/AppComponent.razor b/...oaderBlazor/Components/AppComponent.razor → ...nloaderBlazor/Features/AppComponent.razor
@@ -8,6 +8,7 @@
     <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
     <link rel="stylesheet" href="app.css" />
     <link rel="stylesheet" href="TgDownloaderBlazor.styles.css" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@latest/font/bootstrap-icons.css" />
     <link rel="icon" type="image/png" href="favicon.png" />
     <HeadOutlet />
 </head>

diff --git a/...azor/Components/Pages/HomeComponent.razor → ...rBlazor/Features/Home/HomeComponent.razor b/...azor/Components/Pages/HomeComponent.razor → ...rBlazor/Features/Home/HomeComponent.razor
diff --git a/Clients/TgDownloaderBlazor/Features/Home/HomeComponent.razor.cs b/Clients/TgDownloaderBlazor/Features/Home/HomeComponent.razor.cs
@@ -0,0 +1,24 @@
+// This is an independent project of an individual developer. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com
+
+namespace TgDownloaderBlazor.Features.Home;
+
+public sealed partial class HomeComponent : TgPageComponent
+{
+    #region Public and private fields, properties, constructor
+
+    public static string AppVersionTitle { get; set; } = string.Empty;
+    public static string AppVersionShort { get; set; } = string.Empty;
+    public static string AppVersionFull { get; set; } = string.Empty;
+
+    public HomeComponent()
+    {
+        AppVersionTitle = $"{TgLocale.AppTitleBlazor} " +
+                          $"v{TgCommonUtils.GetTrimVersion(Assembly.GetExecutingAssembly().GetName().Version)}";
+        AppVersionShort = $"v{TgCommonUtils.GetTrimVersion(Assembly.GetExecutingAssembly().GetName().Version)}";
+        AppVersionFull = $"{TgLocale.AppVersion}: {AppVersionShort}";
+
+    }
+
+    #endregion
+}
diff --git a/Clients/TgDownloaderBlazor/Features/Layout/Header.razor b/Clients/TgDownloaderBlazor/Features/Layout/Header.razor
@@ -0,0 +1,8 @@
+@page "/Header"
+@inherits TgPageComponent
+
+<nav class="navbar mb-5 shadow">
+	<a class="navbar-brand" href="/">
+		@* <img src="/images/logo.png"></img> *@
+	</a>
+</nav>
diff --git a/Clients/TgDownloaderBlazor/Features/Layout/Header.razor.cs b/Clients/TgDownloaderBlazor/Features/Layout/Header.razor.cs
@@ -0,0 +1,6 @@
+namespace TgDownloaderBlazor.Features.Layout;
+
+public sealed partial class Header : TgPageComponent
+{
+
+}
diff --git a/...Blazor/Components/Layout/MainLayout.razor → ...erBlazor/Features/Layout/MainLayout.razor b/...Blazor/Components/Layout/MainLayout.razor → ...erBlazor/Features/Layout/MainLayout.razor
@@ -5,6 +5,7 @@
         <NavMenu />
     </div>
 
+    @* <main class="container mt-5 mb-5"> *@
     <main>
         <div class="top-row px-4">
 	        <a href=@LocaleHelper.FieldLinkTgDownloader target="_blank">@LocaleHelper.FieldTgDownloader</a>

diff --git a/...zor/Components/Layout/MainLayout.razor.cs → ...lazor/Features/Layout/MainLayout.razor.cs b/...zor/Components/Layout/MainLayout.razor.cs → ...lazor/Features/Layout/MainLayout.razor.cs
@@ -1,6 +1,6 @@
-namespace TgDownloaderBlazor.Components.Layout;
+namespace TgDownloaderBlazor.Features.Layout;
 
-public sealed partial class MainLayout
+public sealed partial class MainLayout : LayoutComponentBase
 {
     #region Public and private fields, properties, constructor
 

diff --git a/...or/Components/Layout/MainLayout.razor.css → ...azor/Features/Layout/MainLayout.razor.css b/...or/Components/Layout/MainLayout.razor.css → ...azor/Features/Layout/MainLayout.razor.css
diff --git a/...derBlazor/Components/Layout/NavMenu.razor → ...oaderBlazor/Features/Layout/NavMenu.razor b/...derBlazor/Components/Layout/NavMenu.razor → ...oaderBlazor/Features/Layout/NavMenu.razor
@@ -20,6 +20,11 @@
 		        <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span>@TgLocale.MenuMainApps
 	        </NavLink>
         </div>
+        <div class="nav-item px-3">
+	        <NavLink class="nav-link" href="Filters">
+                <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span>@TgLocale.MenuMainFilters
+	        </NavLink>
+        </div>
         <div class="nav-item px-3">
 	        <NavLink class="nav-link" href="Proxies">
                 <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span>@TgLocale.MenuMainProxies

diff --git a/...Blazor/Components/Layout/NavMenu.razor.cs → ...erBlazor/Features/Layout/NavMenu.razor.cs b/...Blazor/Components/Layout/NavMenu.razor.cs → ...erBlazor/Features/Layout/NavMenu.razor.cs
@@ -1,4 +1,4 @@
-namespace TgDownloaderBlazor.Components.Layout;
+namespace TgDownloaderBlazor.Features.Layout;
 
 public sealed partial class NavMenu : TgPageComponent
 {

diff --git a/...lazor/Components/Layout/NavMenu.razor.css → ...rBlazor/Features/Layout/NavMenu.razor.css b/...lazor/Components/Layout/NavMenu.razor.css → ...rBlazor/Features/Layout/NavMenu.razor.css
diff --git a/...lazor/Components/Pages/AppComponent.razor → ...rBlazor/Features/Pages/AppComponent.razor b/...lazor/Components/Pages/AppComponent.razor → ...rBlazor/Features/Pages/AppComponent.razor
@@ -2,11 +2,11 @@
 @inject IDbContextFactory<TgEfContext> DbFactory
 @inherits TgPageComponent
 
-<PageTitle>Apps</PageTitle>
+<PageTitle>@TgLocale.MenuMainApps</PageTitle>
 
-<h1>Apps</h1>
+<h1>@TgLocale.MenuMainApps</h1>
 
-@if (!Apps.Any())
+@if (!Items.Any())
 {
     <p><em>Loading...</em></p>
 }
@@ -22,12 +22,12 @@ else
             </tr>
         </thead>
         <tbody>
-            @foreach (var app in Apps)
+            @foreach (var item in Items)
             {
                 <tr>
-                    <td>@app.ApiHash</td>
-                    <td>@app.ApiId</td>
-                    <td>@app.PhoneNumber</td>
+                    <td>@item.ApiHash</td>
+                    <td>@item.ApiId</td>
+                    <td>@item.PhoneNumber</td>
                     @* <td>@app.Proxy.ToDebugString()</td> *@
                 </tr>
             }

diff --git a/...or/Components/Pages/AppComponent.razor.cs → ...azor/Features/Pages/AppComponent.razor.cs b/...or/Components/Pages/AppComponent.razor.cs → ...azor/Features/Pages/AppComponent.razor.cs
@@ -1,13 +1,13 @@
 // This is an independent project of an individual developer. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com
 
-namespace TgDownloaderBlazor.Components.Pages;
+namespace TgDownloaderBlazor.Features.Pages;
 
 public sealed partial class AppComponent : TgPageComponent
 {
 	#region Public and private fields, properties, constructor
 
-	private IList<TgEfAppEntity> Apps { get; set; } = new List<TgEfAppEntity>();
+	private IList<TgEfAppEntity> Items { get; set; } = new List<TgEfAppEntity>();
 
 	#endregion
 
@@ -21,7 +21,7 @@ protected override async Task OnInitializedAsync()
 #if DEBUG
 		Debug.WriteLine($"Apps page | {dbContext}");
 #endif
-		Apps = dbContext.AppsRepo.GetEnumerable(0).ToList();
+		Items = dbContext.AppsRepo.GetEnumerable(0).ToList();
 	}
 
 	#endregion

diff --git a/...zor/Components/Pages/ErrorComponent.razor → ...lazor/Features/Pages/ErrorComponent.razor b/...zor/Components/Pages/ErrorComponent.razor → ...lazor/Features/Pages/ErrorComponent.razor
diff --git a/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor b/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor
@@ -0,0 +1,40 @@
+@page "/filters"
+@inject IDbContextFactory<TgEfContext> DbFactory
+@inherits TgPageComponent
+
+<PageTitle>@TgLocale.MenuMainFilters</PageTitle>
+
+<h1>@TgLocale.MenuMainFilters</h1>
+
+@if (!Items.Any())
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <table class="table">
+        <thead>
+            <tr>
+                <th>@TgLocale.FieldIsEnabled</th>
+                <th>@TgLocale.FieldFilterType</th>
+                <th>@TgLocale.FieldName</th>
+                <th>@TgLocale.FieldMask</th>
+                <th>@TgLocale.FieldSize</th>
+                <th>@TgLocale.FieldSizeType</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var item in Items)
+            {
+                <tr>
+                    <td>@item.IsEnabled</td>
+                    <td>@item.FilterType</td>
+                    <td>@item.Name</td>
+                    <td>@item.Mask</td>
+                    <td>@item.Size</td>
+                    <td>@item.SizeType</td>
+                </tr>
+            }
+        </tbody>
+    </table>
+}
diff --git a/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor.cs b/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor.cs
@@ -0,0 +1,25 @@
+// This is an independent project of an individual developer. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com
+
+namespace TgDownloaderBlazor.Features.Pages;
+
+public partial class FilterComponent : TgPageComponent
+{
+	#region Public and private fields, properties, constructor
+
+	private IList<TgEfFilterEntity> Items { get; set; } = new List<TgEfFilterEntity>();
+
+	#endregion
+
+	#region Public and private methods
+
+	protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+
+		await using var dbContext = await DbFactory.CreateDbContextAsync();
+		Items = dbContext.FilterRepo.GetEnumerable(0).ToList();
+	}
+
+	#endregion
+}
diff --git a/...zor/Components/Pages/ProxyComponent.razor → ...lazor/Features/Pages/ProxyComponent.razor b/...zor/Components/Pages/ProxyComponent.razor → ...lazor/Features/Pages/ProxyComponent.razor
@@ -2,11 +2,11 @@
 @inject IDbContextFactory<TgEfContext> DbFactory
 @inherits TgPageComponent
 
-<PageTitle>Apps</PageTitle>
+<PageTitle>@TgLocale.MenuMainProxies</PageTitle>
 
-<h1>Apps</h1>
+<h1>@TgLocale.MenuMainProxies</h1>
 
-@if (!Proxies.Any())
+@if (!Items.Any())
 {
     <p><em>Loading...</em></p>
 }
@@ -24,15 +24,15 @@ else
             </tr>
         </thead>
         <tbody>
-            @foreach (var app in Proxies)
+            @foreach (var item in Items)
             {
                 <tr>
-                    <td>@app.Type</td>
-                    <td>@app.HostName</td>
-                    <td>@app.Port</td>
-                    <td>@app.UserName</td>
-                    <td>@app.Password</td>
-                    <td>@app.Secret</td>
+                    <td>@item.Type</td>
+                    <td>@item.HostName</td>
+                    <td>@item.Port</td>
+                    <td>@item.UserName</td>
+                    <td>@item.Password</td>
+                    <td>@item.Secret</td>
                 </tr>
             }
         </tbody>

diff --git a/.../Components/Pages/ProxyComponent.razor.cs → ...or/Features/Pages/ProxyComponent.razor.cs b/.../Components/Pages/ProxyComponent.razor.cs → ...or/Features/Pages/ProxyComponent.razor.cs
@@ -1,13 +1,13 @@
 // This is an independent project of an individual developer. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com
 
-namespace TgDownloaderBlazor.Components.Pages;
+namespace TgDownloaderBlazor.Features.Pages;
 
 public partial class ProxyComponent : TgPageComponent
 {
 	#region Public and private fields, properties, constructor
 
-	private IList<TgEfProxyEntity> Proxies { get; set; } = new List<TgEfProxyEntity>();
+	private IList<TgEfProxyEntity> Items { get; set; } = new List<TgEfProxyEntity>();
 
 	#endregion
 
@@ -18,7 +18,7 @@ protected override async Task OnInitializedAsync()
         await base.OnInitializedAsync();
 
 		await using var dbContext = await DbFactory.CreateDbContextAsync();
-		Proxies = dbContext.ProxyRepo.GetEnumerable(0).ToList();
+		Items = dbContext.ProxyRepo.GetEnumerable(0).ToList();
 	}
 
 	#endregion

diff --git a/...r/Components/Pages/WeatherComponent.razor → ...zor/Features/Pages/WeatherComponent.razor b/...r/Components/Pages/WeatherComponent.razor → ...zor/Features/Pages/WeatherComponent.razor
diff --git a/Clients/TgDownloaderBlazor/Features/Routes.razor b/Clients/TgDownloaderBlazor/Features/Routes.razor
@@ -0,0 +1,13 @@
+@using TgDownloaderBlazor.Features.Layout
+<Router AppAssembly="typeof(Program).Assembly">
+	<Found Context="routeData">
+		<RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
+		<FocusOnNavigate RouteData="routeData" Selector="h1" />
+	</Found>
+	<NotFound>
+		<PageTitle>Not found</PageTitle>
+		<LayoutView Layout="@typeof(MainLayout)">
+			<p role="alert">Sorry, there's nothing at this address.'</p>
+		</LayoutView>
+	</NotFound>
+</Router>
diff --git a/...ownloaderBlazor/Components/_Imports.razor → ...gDownloaderBlazor/Features/_Imports.razor b/...ownloaderBlazor/Components/_Imports.razor → ...gDownloaderBlazor/Features/_Imports.razor
@@ -7,4 +7,4 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
 @using TgDownloaderBlazor
-@using TgDownloaderBlazor.Components
+@using TgDownloaderBlazor.Features
diff --git a/Clients/TgDownloaderBlazor/GlobalUsings.cs b/Clients/TgDownloaderBlazor/GlobalUsings.cs
@@ -2,17 +2,16 @@
 // PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com
 // Global using directives
 
-global using System.Diagnostics;
-global using System.Reflection;
 global using Microsoft.AspNetCore.Components;
-global using Microsoft.AspNetCore.Components.Web;
 global using Microsoft.EntityFrameworkCore;
-global using TgDownloaderBlazor;
+global using System.Diagnostics;
+global using System.Reflection;
 global using TgDownloaderBlazor.Common;
-global using TgDownloaderBlazor.Components;
+global using TgDownloaderBlazor.Features;
 global using TgEfCore;
 global using TgEfCore.Domain.Apps;
+global using TgEfCore.Domain.Filters;
 global using TgEfCore.Domain.Proxies;
 global using TgLocalization.Helpers;
 global using TgStorage.Helpers;
-global using TgStorage.Utils;
+global using TgStorage.Utils;
diff --git a/Clients/TgDownloaderBlazor/TgDownloaderBlazor.csproj b/Clients/TgDownloaderBlazor/TgDownloaderBlazor.csproj
@@ -13,7 +13,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>0.4.10.0</Version>
+    <Version>0.4.30.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Clients/TgDownloaderConsole/TgDownloaderConsole.csproj b/Clients/TgDownloaderConsole/TgDownloaderConsole.csproj
@@ -4,7 +4,7 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>0.4.10.0</Version>
+		<Version>0.4.30.0</Version>
 		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
 		<Platforms>AnyCPU;x64;x86</Platforms>
 		<ApplicationIcon>applicationIcon.ico</ApplicationIcon>

diff --git a/Clients/TgDownloaderWinDesktop/TgDownloaderWinDesktop.csproj b/Clients/TgDownloaderWinDesktop/TgDownloaderWinDesktop.csproj
@@ -7,7 +7,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>applicationIcon.ico</ApplicationIcon>
     <Platforms>AnyCPU;x64;x86</Platforms>
-    <Version>0.4.10.0</Version>
+    <Version>0.4.30.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="applicationIcon.ico" />