diff --git a/ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj b/ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj index fb6f2c25f..73141327f 100644 --- a/ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj +++ b/ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj b/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj index b1afe912c..f0159b15b 100644 --- a/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj +++ b/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj @@ -7,7 +7,7 @@ - + diff --git a/ErsatzTV/ErsatzTV.csproj b/ErsatzTV/ErsatzTV.csproj index 443202cb1..2f9bde8c0 100644 --- a/ErsatzTV/ErsatzTV.csproj +++ b/ErsatzTV/ErsatzTV.csproj @@ -12,17 +12,17 @@ - + - - + + - - + + diff --git a/ErsatzTV/Pages/ChannelEditor.razor b/ErsatzTV/Pages/ChannelEditor.razor index b15eb3d18..57d81b14e 100644 --- a/ErsatzTV/Pages/ChannelEditor.razor +++ b/ErsatzTV/Pages/ChannelEditor.razor @@ -44,7 +44,7 @@ Upload Logo diff --git a/ErsatzTV/Pages/Channels.razor b/ErsatzTV/Pages/Channels.razor index d49157243..b5da26a8e 100644 --- a/ErsatzTV/Pages/Channels.razor +++ b/ErsatzTV/Pages/Channels.razor @@ -48,11 +48,11 @@ } - - + + Edit - + Delete diff --git a/ErsatzTV/Pages/FFmpeg.razor b/ErsatzTV/Pages/FFmpeg.razor index b5290a414..e36988372 100644 --- a/ErsatzTV/Pages/FFmpeg.razor +++ b/ErsatzTV/Pages/FFmpeg.razor @@ -75,11 +75,11 @@ - - + + Edit - + Delete diff --git a/ErsatzTV/Pages/MediaCollectionItemsEditor.razor b/ErsatzTV/Pages/MediaCollectionItemsEditor.razor index a1889e5c2..eef3671d3 100644 --- a/ErsatzTV/Pages/MediaCollectionItemsEditor.razor +++ b/ErsatzTV/Pages/MediaCollectionItemsEditor.razor @@ -31,7 +31,7 @@ All Media Items + AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"> diff --git a/ErsatzTV/Pages/MediaCollections.razor b/ErsatzTV/Pages/MediaCollections.razor index 00943f2f0..cadfa9dfd 100644 --- a/ErsatzTV/Pages/MediaCollections.razor +++ b/ErsatzTV/Pages/MediaCollections.razor @@ -10,7 +10,7 @@ Media Collections + AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"> @@ -38,14 +38,14 @@ @if (context.IsSimple) { - - + + Edit Properties - + Edit Media Items - + Delete diff --git a/ErsatzTV/Pages/ScheduleItemsEditor.razor b/ErsatzTV/Pages/ScheduleItemsEditor.razor index 4c72fc7e6..1307c8f08 100644 --- a/ErsatzTV/Pages/ScheduleItemsEditor.razor +++ b/ErsatzTV/Pages/ScheduleItemsEditor.razor @@ -82,16 +82,16 @@ { try { - // TODO: don't bother going to the database for this, we probably want a "save changes" button - // to save all added, deleted, modified items - + // TODO: don't bother going to the database for this, we probably want a "save changes" button + // to save all added, deleted, modified items + MediaCollectionViewModel mediaCollection = await Mediator.Send(new GetAllMediaCollections()).Map(list => list.Head()); await Mediator.Send(new AddProgramScheduleItem(Id, StartType.Dynamic, null, PlayoutMode.One, mediaCollection.Id, null, null, null)); await LoadScheduleItems(); } catch (Exception ex) { - // TODO: something? + // TODO: something? } } diff --git a/ErsatzTV/Pages/Schedules.razor b/ErsatzTV/Pages/Schedules.razor index 732b5f1ae..890131b00 100644 --- a/ErsatzTV/Pages/Schedules.razor +++ b/ErsatzTV/Pages/Schedules.razor @@ -26,14 +26,14 @@ @context.Name @context.MediaCollectionPlaybackOrder - - + + Edit Properties - + Edit Schedule Items - + Delete diff --git a/ErsatzTV/Pages/_Host.cshtml b/ErsatzTV/Pages/_Host.cshtml index c46dd49f4..b1a8c6612 100644 --- a/ErsatzTV/Pages/_Host.cshtml +++ b/ErsatzTV/Pages/_Host.cshtml @@ -13,6 +13,7 @@ ErsatzTV + diff --git a/ErsatzTV/Services/PlexService.cs b/ErsatzTV/Services/PlexService.cs index 9b7a3055e..4d1c6e093 100644 --- a/ErsatzTV/Services/PlexService.cs +++ b/ErsatzTV/Services/PlexService.cs @@ -40,7 +40,7 @@ namespace ErsatzTV.Services { await File.WriteAllTextAsync(FileSystemLayout.PlexSecretsPath, "{}", cancellationToken); } - + _logger.LogInformation( "Plex service started; secrets are at {PlexSecretsPath}", FileSystemLayout.PlexSecretsPath); diff --git a/ErsatzTV/Shared/LocalMediaSources.razor b/ErsatzTV/Shared/LocalMediaSources.razor index 3eb06147b..7beb32898 100644 --- a/ErsatzTV/Shared/LocalMediaSources.razor +++ b/ErsatzTV/Shared/LocalMediaSources.razor @@ -19,7 +19,7 @@ @context.Folder - + diff --git a/ErsatzTV/Shared/MainLayout.razor b/ErsatzTV/Shared/MainLayout.razor index 63af96f76..e086c6666 100644 --- a/ErsatzTV/Shared/MainLayout.razor +++ b/ErsatzTV/Shared/MainLayout.razor @@ -6,14 +6,15 @@ - + ErsatzTV - + + - Home + Home FFmpeg Channels diff --git a/ErsatzTV/Shared/MediaItemTable.razor b/ErsatzTV/Shared/MediaItemTable.razor index e4a804a31..dba0a8778 100644 --- a/ErsatzTV/Shared/MediaItemTable.razor +++ b/ErsatzTV/Shared/MediaItemTable.razor @@ -7,7 +7,7 @@ Media Items + AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"> diff --git a/ErsatzTV/Shared/PlexMediaSources.razor b/ErsatzTV/Shared/PlexMediaSources.razor index 633dd6088..40e713791 100644 --- a/ErsatzTV/Shared/PlexMediaSources.razor +++ b/ErsatzTV/Shared/PlexMediaSources.razor @@ -25,8 +25,8 @@ @context.Name @context.Address - - + + Edit Libraries @* *@ diff --git a/ErsatzTV/Startup.cs b/ErsatzTV/Startup.cs index deeaca41c..6e98cc750 100644 --- a/ErsatzTV/Startup.cs +++ b/ErsatzTV/Startup.cs @@ -27,7 +27,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; -using MudBlazor; using MudBlazor.Services; using Newtonsoft.Json; using Newtonsoft.Json.Converters; @@ -75,10 +74,19 @@ namespace ErsatzTV services.AddRazorPages(); services.AddServerSideBlazor(); - services.AddMudBlazorDialog() - .AddMudBlazorSnackbar() - .AddMudBlazorResizeListener(); + services.AddMudServices(); + Log.Logger.Warning("This is pre-alpha software and is likely to be unstable"); + Log.Logger.Warning( + "Give feedback at {GitHub} or {Discord}", + "https://github.com/jasongdove/ErsatzTV", + "https://discord.gg/hHaJm3yGy6"); + + Log.Logger.Information( + "Server will listen on port {Port} - try UI at {UI}", + 8989, + "http://localhost:8989"); + if (!Directory.Exists(FileSystemLayout.AppDataFolder)) { Directory.CreateDirectory(FileSystemLayout.AppDataFolder); diff --git a/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs b/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs index 03a777105..8694dbe0e 100644 --- a/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs +++ b/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs @@ -1,5 +1,4 @@ using System; -using ErsatzTV.Application.MediaCollections; using ErsatzTV.Core.Domain; namespace ErsatzTV.ViewModels