pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

upgrade packages; add discord link

pull/1/head
Jason Dove 5 years ago
parent
4d52e115b5
commit
9b41c083a6
18 changed files with 50 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
  2. 2
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  3. 10
      ErsatzTV/ErsatzTV.csproj
  4. 2
      ErsatzTV/Pages/ChannelEditor.razor
  5. 6
      ErsatzTV/Pages/Channels.razor
  6. 6
      ErsatzTV/Pages/FFmpeg.razor
  7. 2
      ErsatzTV/Pages/MediaCollectionItemsEditor.razor
  8. 10
      ErsatzTV/Pages/MediaCollections.razor
  9. 8
      ErsatzTV/Pages/ScheduleItemsEditor.razor
  10. 8
      ErsatzTV/Pages/Schedules.razor
  11. 1
      ErsatzTV/Pages/_Host.cshtml
  12. 2
      ErsatzTV/Services/PlexService.cs
  13. 2
      ErsatzTV/Shared/LocalMediaSources.razor
  14. 7
      ErsatzTV/Shared/MainLayout.razor
  15. 2
      ErsatzTV/Shared/MediaItemTable.razor
  16. 4
      ErsatzTV/Shared/PlexMediaSources.razor
  17. 16
      ErsatzTV/Startup.cs
  18. 1
      ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs

2
ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
Unescape View File

@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Moq" Version="4.16.0" />
<PackageReference Include="NUnit" Version="3.13.0" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Debug" Version="1.0.1" />

2
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.2" />
<PackageReference Include="Refit" Version="5.2.4" />
<PackageReference Include="Refit" Version="6.0.1" />
</ItemGroup>
<ItemGroup>

10
ErsatzTV/ErsatzTV.csproj
Unescape View File

@ -12,17 +12,17 @@ @@ -12,17 +12,17 @@
<ItemGroup>
<PackageReference Include="Accelist.FluentValidation.Blazor" Version="4.0.0" />
<PackageReference Include="FluentValidation" Version="9.5.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="9.4.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="9.5.0" />
<PackageReference Include="LanguageExt.Core" Version="3.4.15" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
<PackageReference Include="MudBlazor" Version="1.2.4" />
<PackageReference Include="Refit.HttpClientFactory" Version="5.2.4" />
<PackageReference Include="MudBlazor" Version="5.0.0" />
<PackageReference Include="Refit.HttpClientFactory" Version="6.0.1" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.6.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.0.2" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.0.2" />
</ItemGroup>
<ItemGroup>

2
ErsatzTV/Pages/ChannelEditor.razor
Unescape View File

@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
<MudButton Class="ml-auto" HtmlTag="label"
Variant="Variant.Filled"
Color="Color.Primary"
StartIcon="@Filled.CloudUpload"
StartIcon="@Icons.Material.Filled.CloudUpload"
for="fileInput">
Upload Logo
</MudButton>

6
ErsatzTV/Pages/Channels.razor
Unescape View File

@ -48,11 +48,11 @@ @@ -48,11 +48,11 @@
}
</MudTd>
<MudTd>
<MudMenu Icon="@Filled.MoreVert">
<MudMenuItem Icon="@Filled.Edit" Link="@($"/channels/{context.Id}")">
<MudMenu Icon="@Icons.Material.Filled.MoreVert">
<MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/channels/{context.Id}")">
Edit
</MudMenuItem>
<MudMenuItem Icon="@Filled.Delete" OnClick="@(_ => DeleteChannelAsync(context))">
<MudMenuItem Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeleteChannelAsync(context))">
Delete
</MudMenuItem>
</MudMenu>

6
ErsatzTV/Pages/FFmpeg.razor
Unescape View File

@ -75,11 +75,11 @@ @@ -75,11 +75,11 @@
</MudText>
</MudTd>
<MudTd>
<MudMenu Icon="@Filled.MoreVert">
<MudMenuItem Icon="@Filled.Edit" Link="@($"/ffmpeg/{context.Id}")">
<MudMenu Icon="@Icons.Material.Filled.MoreVert">
<MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/ffmpeg/{context.Id}")">
Edit
</MudMenuItem>
<MudMenuItem Icon="@Filled.Delete" OnClick="@(_ => DeleteProfileAsync(context))">
<MudMenuItem Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeleteProfileAsync(context))">
Delete
</MudMenuItem>
</MudMenu>

2
ErsatzTV/Pages/MediaCollectionItemsEditor.razor
Unescape View File

@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
<MudText Typo="Typo.h6">All Media Items</MudText>
<MudToolBarSpacer/>
<MudTextField T="string" ValueChanged="@OnSearch" Placeholder="Search" Adornment="Adornment.Start"
AdornmentIcon="@Filled.Search" IconSize="Size.Medium" Class="mt-0">
AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0">
</MudTextField>
</ToolBarContent>
<HeaderContent>

10
ErsatzTV/Pages/MediaCollections.razor
Unescape View File

@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
<MudText Typo="Typo.h6">Media Collections</MudText>
<MudToolBarSpacer/>
<MudTextField T="string" ValueChanged="@OnSearch" Placeholder="Search" Adornment="Adornment.Start"
AdornmentIcon="@Filled.Search" IconSize="Size.Medium" Class="mt-0">
AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0">
</MudTextField>
</ToolBarContent>
<ColGroup>
@ -38,14 +38,14 @@ @@ -38,14 +38,14 @@
<MudTd>
@if (context.IsSimple)
{
<MudMenu Icon="@Filled.MoreVert">
<MudMenuItem Icon="@Filled.Edit" Link="@($"/media/collections/{context.Id}")">
<MudMenu Icon="@Icons.Material.Filled.MoreVert">
<MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/media/collections/{context.Id}")">
Edit Properties
</MudMenuItem>
<MudMenuItem Icon="@Filled.Edit" Link="@($"/media/collections/{context.Id}/items")">
<MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/media/collections/{context.Id}/items")">
Edit Media Items
</MudMenuItem>
<MudMenuItem Icon="@Filled.Delete" OnClick="@(_ => DeleteMediaCollectionAsync(context))">
<MudMenuItem Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeleteMediaCollectionAsync(context))">
Delete
</MudMenuItem>
</MudMenu>

8
ErsatzTV/Pages/ScheduleItemsEditor.razor
Unescape View File

@ -82,16 +82,16 @@ @@ -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?
}
}

8
ErsatzTV/Pages/Schedules.razor
Unescape View File

@ -26,14 +26,14 @@ @@ -26,14 +26,14 @@
<MudTd DataLabel="Name">@context.Name</MudTd>
<MudTd DataLabel="Name">@context.MediaCollectionPlaybackOrder</MudTd>
<MudTd>
<MudMenu Icon="@Filled.MoreVert">
<MudMenuItem Icon="@Filled.Edit" Link="@($"/schedules/{context.Id}")">
<MudMenu Icon="@Icons.Material.Filled.MoreVert">
<MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/schedules/{context.Id}")">
Edit Properties
</MudMenuItem>
<MudMenuItem Icon="@Filled.Edit" Link="@($"/schedules/{context.Id}/items")">
<MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/schedules/{context.Id}/items")">
Edit Schedule Items
</MudMenuItem>
<MudMenuItem Icon="@Filled.Delete" OnClick="@(_ => DeleteSchedule(context))">
<MudMenuItem Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeleteSchedule(context))">
Delete
</MudMenuItem>
</MudMenu>

1
ErsatzTV/Pages/_Host.cshtml
Unescape View File

@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
<title>ErsatzTV</title>
<base href="~/"/>
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet"/>
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css" rel="stylesheet">
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet"/>
<link href="css/site.css" rel="stylesheet"/>
<link href="ErsatzTV.styles.css" rel="stylesheet"/>

2
ErsatzTV/Services/PlexService.cs
Unescape View File

@ -40,7 +40,7 @@ namespace ErsatzTV.Services @@ -40,7 +40,7 @@ namespace ErsatzTV.Services
{
await File.WriteAllTextAsync(FileSystemLayout.PlexSecretsPath, "{}", cancellationToken);
}
_logger.LogInformation(
"Plex service started; secrets are at {PlexSecretsPath}",
FileSystemLayout.PlexSecretsPath);

2
ErsatzTV/Shared/LocalMediaSources.razor
Unescape View File

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<RowTemplate>
<MudTd DataLabel="Folder">@context.Folder</MudTd>
<MudTd>
<MudIconButton Icon="@Filled.Delete" OnClick="@(_ => DeleteMediaSource(context))"></MudIconButton>
<MudIconButton Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeleteMediaSource(context))"></MudIconButton>
</MudTd>
</RowTemplate>
</MudTable>

7
ErsatzTV/Shared/MainLayout.razor
Unescape View File

@ -6,14 +6,15 @@ @@ -6,14 +6,15 @@
<MudLayout>
<MudAppBar Elevation="1">
<MudIconButton Icon="@Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@(_ => DrawerToggle())"/>
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@(_ => DrawerToggle())"/>
<MudText Typo="Typo.h5" Class="ml-3">ErsatzTV</MudText>
<MudAppBarSpacer/>
<MudIconButton Icon="@Brands.GitHub" Color="Color.Inherit" Link="https://github.com/jasongdove/ErsatzTV" Target="_blank"/>
<MudIconButton Icon="fab fa-discord" Color="Color.Inherit" Link="https://discord.gg/hHaJm3yGy6" Target="_blank"/>
<MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Inherit" Link="https://github.com/jasongdove/ErsatzTV" Target="_blank"/>
</MudAppBar>
<MudDrawer @bind-Open="_drawerOpen" Elevation="2">
<MudNavMenu>
<MudNavLink Href="/" Match="NavLinkMatch.All" Icon="@Filled.Home">Home</MudNavLink>
<MudNavLink Href="/" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Home">Home</MudNavLink>
<MudNavLink Href="/ffmpeg">FFmpeg</MudNavLink>
<MudNavLink Href="/channels">Channels</MudNavLink>
<MudNavGroup Title="Media" Expanded="true">

2
ErsatzTV/Shared/MediaItemTable.razor
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<MudText Typo="Typo.h6">Media Items</MudText>
<MudToolBarSpacer/>
<MudTextField T="string" ValueChanged="@OnSearch" Placeholder="Search" Adornment="Adornment.Start"
AdornmentIcon="@Filled.Search" IconSize="Size.Medium" Class="mt-0">
AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0">
</MudTextField>
</ToolBarContent>
<HeaderContent>

4
ErsatzTV/Shared/PlexMediaSources.razor
Unescape View File

@ -25,8 +25,8 @@ @@ -25,8 +25,8 @@
<MudTd DataLabel="Name">@context.Name</MudTd>
<MudTd DataLabel="Address">@context.Address</MudTd>
<MudTd>
<MudMenu Icon="@Filled.MoreVert">
<MudMenuItem Icon="@Filled.Edit" Link="@($"/media/sources/plex/{context.Id}/libraries")">
<MudMenu Icon="@Icons.Material.Filled.MoreVert">
<MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/media/sources/plex/{context.Id}/libraries")">
Edit Libraries
</MudMenuItem>
@* <MudMenuItem Icon="@Filled.Edit" Link="@($"/media/collections/{context.Id}/items")"> *@

16
ErsatzTV/Startup.cs
Unescape View File

@ -27,7 +27,6 @@ using Microsoft.EntityFrameworkCore; @@ -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 @@ -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);

1
ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs
Unescape View File

@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
using System;
using ErsatzTV.Application.MediaCollections;
using ErsatzTV.Core.Domain;
namespace ErsatzTV.ViewModels

Write Preview
Loading…
Cancel
Save