Compare commits

...

6 Commits

Author SHA1 Message Date
f3eae5e649 feat: add search bar to the proxy configs page
All checks were successful
Caddy Manager CI build / docker (push) Successful in 1m42s
2025-07-05 09:09:37 +07:00
6e9eea843d fix: do not add the divider line to the last item 2025-07-05 08:55:34 +07:00
70951a2bfe chore: ignore caddy config folder (test) 2025-07-05 08:54:53 +07:00
25373e51b8 rework: configuration service
- to have it be more dynamic
2025-07-05 08:16:35 +07:00
a6717942f3 fix: dir config for development 2025-07-05 08:05:18 +07:00
95d8aabbbf fix: create config dir for caddy if not exist 2025-07-05 08:01:43 +07:00
9 changed files with 55 additions and 24 deletions

3
.gitignore vendored
View File

@@ -5,4 +5,5 @@ riderModule.iml
/_ReSharper.Caches/ /_ReSharper.Caches/
.idea/ .idea/
*.sln.DotSettings.user *.sln.DotSettings.user
.vscode/ .vscode/
caddy/

View File

@@ -18,12 +18,20 @@
{ {
<MudProgressCircular Color="Color.Primary" Indeterminate="true" Size="Size.Small"/> <MudProgressCircular Color="Color.Primary" Indeterminate="true" Size="Size.Small"/>
} }
<MudSpacer />
<MudTextField T="string" Placeholder="Search..." Adornment="Adornment.End" DebounceInterval="500"
OnDebounceIntervalElapsed="HandleIntervalElapsed" @bind-Value="_debouncedText"
AdornmentIcon="@Icons.Material.Filled.Search"/>
</MudContainer> </MudContainer>
<MudList T="string" Style="padding-top: 16px;" SelectionMode="SelectionMode.MultiSelection" <MudList T="string" Style="padding-top: 16px;" SelectionMode="SelectionMode.MultiSelection"
@bind-SelectedValues="_selectedCaddyConfigurations"> @bind-SelectedValues="_selectedCaddyConfigurations">
@foreach (var caddyConfig in _availableCaddyConfigurations) @foreach (var (index, caddyConfig) in _availableCaddyConfigurations.Index())
{ {
<CaddyReverseProxyItem FileName="@caddyConfig"/> <CaddyReverseProxyItem FileName="@caddyConfig"/>
<MudDivider/>
@if (index < _availableCaddyConfigurations.Count - 1)
{
<MudDivider/>
}
} }
</MudList> </MudList>

View File

@@ -15,6 +15,7 @@ public partial class CaddyReverseProxiesPage : ComponentBase
private bool _isProcessing; private bool _isProcessing;
private List<string> _availableCaddyConfigurations = []; private List<string> _availableCaddyConfigurations = [];
private IReadOnlyCollection<string> _selectedCaddyConfigurations = []; private IReadOnlyCollection<string> _selectedCaddyConfigurations = [];
private string _debouncedText = string.Empty;
[Inject] private ICaddyService CaddyService { get; set; } = null!; [Inject] private ICaddyService CaddyService { get; set; } = null!;
@@ -61,7 +62,10 @@ public partial class CaddyReverseProxiesPage : ComponentBase
/// </summary> /// </summary>
private void Refresh() private void Refresh()
{ {
_availableCaddyConfigurations = CaddyService.GetExistingCaddyConfigurations(); var notSearching = string.IsNullOrWhiteSpace(_debouncedText);
_availableCaddyConfigurations = CaddyService.GetExistingCaddyConfigurations()
.Where(confName => notSearching || confName.Contains(_debouncedText, StringComparison.OrdinalIgnoreCase))
.ToList();
StateHasChanged(); StateHasChanged();
} }
@@ -130,4 +134,14 @@ public partial class CaddyReverseProxiesPage : ComponentBase
Snackbar.Add("Failed to restart the Caddy container", Severity.Error); Snackbar.Add("Failed to restart the Caddy container", Severity.Error);
} }
} }
/// <summary>
/// Handle the interval elapsed event for debounced text input for search functionality.
/// </summary>
/// <param name="debouncedText"></param>
private void HandleIntervalElapsed(string debouncedText)
{
// Simply refresh the page with the new debounced text
Refresh();
}
} }

View File

@@ -9,12 +9,10 @@ namespace CaddyManager.Contracts.Configurations;
public interface IConfigurationsService public interface IConfigurationsService
{ {
/// <summary> /// <summary>
/// Configurations for Caddy service /// Method extracting the configurations from the appsettings.json file or environment variables base on the
/// type of the configuration class to determine the section name
/// </summary> /// </summary>
CaddyServiceConfigurations CaddyServiceConfigurations { get; } /// <typeparam name="T"></typeparam>
/// <returns></returns>
/// <summary> T Get<T>() where T : class;
/// Configurations for Docker service
/// </summary>
DockerServiceConfiguration DockerServiceConfiguration { get; }
} }

View File

@@ -13,11 +13,16 @@ public class CaddyService(IConfigurationsService configurationsService) : ICaddy
/// </summary> /// </summary>
private const string CaddyGlobalConfigName = "Caddyfile"; private const string CaddyGlobalConfigName = "Caddyfile";
private CaddyServiceConfigurations Configurations => configurationsService.CaddyServiceConfigurations; private CaddyServiceConfigurations Configurations => configurationsService.Get<CaddyServiceConfigurations>();
/// <inheritdoc /> /// <inheritdoc />
public List<string> GetExistingCaddyConfigurations() public List<string> GetExistingCaddyConfigurations()
{ {
if (!Directory.Exists(Configurations.ConfigDir))
{
Directory.CreateDirectory(Configurations.ConfigDir);
}
return Directory.GetFiles(Configurations.ConfigDir) return Directory.GetFiles(Configurations.ConfigDir)
.Where(filePath => Path.GetFileName(filePath) != CaddyGlobalConfigName) .Where(filePath => Path.GetFileName(filePath) != CaddyGlobalConfigName)
.Select(Path.GetFileNameWithoutExtension) .Select(Path.GetFileNameWithoutExtension)

View File

@@ -10,11 +10,16 @@ namespace CaddyManager.Services.Configurations;
public class ConfigurationsService(IConfiguration configuration) : IConfigurationsService public class ConfigurationsService(IConfiguration configuration) : IConfigurationsService
{ {
/// <inheritdoc /> /// <inheritdoc />
public CaddyServiceConfigurations CaddyServiceConfigurations => public T Get<T>() where T : class
configuration.GetSection(CaddyServiceConfigurations.Caddy).Get<CaddyServiceConfigurations>() ?? {
new CaddyServiceConfigurations(); var section = typeof(T).Name;
public DockerServiceConfiguration DockerServiceConfiguration => // Have the configuration section name be the section name without the "Configurations" suffix
configuration.GetSection(DockerServiceConfiguration.Docker).Get<DockerServiceConfiguration>() ?? if (section.EndsWith("Configurations"))
new DockerServiceConfiguration(); section = section[..^"Configurations".Length];
else if (section.EndsWith("Configuration"))
section = section[..^"Configuration".Length];
return configuration.GetSection(section).Get<T>() ?? Activator.CreateInstance<T>();
}
} }

View File

@@ -9,7 +9,7 @@ namespace CaddyManager.Services.Docker;
/// <inheritdoc /> /// <inheritdoc />
public class DockerService(IConfigurationsService configurationsService) : IDockerService public class DockerService(IConfigurationsService configurationsService) : IDockerService
{ {
private DockerServiceConfiguration Configuration => configurationsService.DockerServiceConfiguration; private DockerServiceConfiguration Configuration => configurationsService.Get<DockerServiceConfiguration>();
/// <summary> /// <summary>
/// Method to get the container id of the Caddy container by the name configured /// Method to get the container id of the Caddy container by the name configured

View File

@@ -5,7 +5,7 @@
"Microsoft.AspNetCore": "Warning" "Microsoft.AspNetCore": "Warning"
} }
}, },
"Caddy": { "CaddyService": {
"ConfigDir": "/Users/ebolo/Code/caddy/config" "ConfigDir": "./caddy/config"
} }
} }

View File

@@ -6,10 +6,10 @@
} }
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"Caddy": { "CaddyService": {
"ConfigDir": "/root/compose/caddy/config" "ConfigDir": "/root/compose/caddy/config"
}, },
"Docker": { "DockerService": {
"CaddyContainerName": "caddy", "CaddyContainerName": "caddy",
"DockerHost": "unix:///var/run/docker.sock" "DockerHost": "unix:///var/run/docker.sock"
} }