Skip to content

Commit d56dcba

Browse files
drma-techdrma-tech
committed
providers updated / premium delivery removed
1 parent 42f67cf commit d56dcba

9 files changed

Lines changed: 769 additions & 630 deletions

File tree

‎SD.API/SD.API.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
13-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.17" />
13+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.18" />
1414
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.61.0" />
1515
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.2.0" />
1616
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
1717
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.17" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.18" />
1919
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.10" />
20-
<PackageReference Include="Sentry.AspNetCore" Version="6.6.0" />
20+
<PackageReference Include="Sentry.AspNetCore" Version="6.7.0" />
2121
<PackageReference Include="Stripe.net" Version="51.2.0-beta.2" />
22-
<PackageReference Include="Supabase" Version="1.1.1" />
22+
<PackageReference Include="Supabase" Version="1.2.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<ProjectReference Include="..\SD.Shared\SD.Shared.csproj" />

‎SD.Shared/Enums/DeliveryModel.cs‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,33 @@
22

33
public enum DeliveryModel
44
{
5+
/// <summary>
6+
/// Free
7+
/// </summary>
58
[FieldSettings("FREEName", Description = "FREEDescription", ResourceType = typeof(Translations.Enum.DeliveryModel))]
69
FREE = 0,
710

11+
/// <summary>
12+
/// Advertising
13+
/// </summary>
814
[FieldSettings("AVODName", Description = "AVODDescription", ResourceType = typeof(Translations.Enum.DeliveryModel))]
915
AVOD = 1,
1016

17+
/// <summary>
18+
/// Subscription
19+
/// </summary>
1120
[FieldSettings("SVODName", Description = "SVODDescription", ResourceType = typeof(Translations.Enum.DeliveryModel))]
1221
SVOD = 2,
1322

23+
/// <summary>
24+
/// Transaction
25+
/// </summary>
1426
[FieldSettings("TVODName", Description = "TVODDescription", ResourceType = typeof(Translations.Enum.DeliveryModel))]
1527
TVOD = 3,
1628

17-
[FieldSettings("PVODName", Description = "PVODDescription", ResourceType = typeof(Translations.Enum.DeliveryModel))]
18-
PVOD = 4
29+
///// <summary>
30+
///// Premium
31+
///// </summary>
32+
//[FieldSettings("PVODName", Description = "PVODDescription", ResourceType = typeof(Translations.Enum.DeliveryModel))]
33+
//PVOD = 4
1934
}

‎SD.Shared/Models/List/Tmdb/MediaProviders.cs‎

Lines changed: 131 additions & 131 deletions
Large diffs are not rendered by default.

‎SD.WEB/Modules/Media/Components/MediaStreaming.razor‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -128,43 +128,6 @@
128128
</MudItem>
129129
}
130130

131-
@if (Providers?.GetFlatRateBuyListProviders(Region).Any() ?? false)
132-
{
133-
hasProvider = true;
134-
<MudItem xs="12" md="6" lg="4">
135-
<MudPaper Outlined="true" Class="pt-2 px-2">
136-
<MudText Color="Color.Primary" Typo="Typo.subtitle1">
137-
@Translations.Module.Media.DeliveryModelFlatRateBuy
138-
</MudText>
139-
<MudDivider Class="mb-2"></MudDivider>
140-
<MudToolBar WrapContent="true" Gutters="false">
141-
@foreach (var item in Providers.GetFlatRateBuyListProviders(Region))
142-
{
143-
@if (AllProviders?.Items.Any(a => a.id == item.provider_id.ToString()) ?? false) //sometimes a link from an excluded provider appears
144-
{
145-
var provider = AllProviders.Items.Single(s => s.id == item.provider_id.ToString());
146-
147-
<MudTooltip Text="@item.provider_name">
148-
<MudLink OnClick="@(() => OpenExternalWebsite(provider.link))" rel="nofollow" Class="me-2">
149-
<MudImage Src="@(TmdbOptions.OriginalPosterPath + item.logo_path)" Alt="@item.provider_name" FallbackSrc="images/no-image.webp"
150-
Class="mb-2" Style="width: 64px; vertical-align: middle;"></MudImage>
151-
<AuthorizeView Roles="administrator" Context="ctx">
152-
<Authorized>
153-
@if (AllProviders.Items.Single(s => s.id == item.provider_id.ToString()).models.All(a => a != DeliveryModel.PVOD))
154-
{
155-
<span>false</span>
156-
}
157-
</Authorized>
158-
</AuthorizeView>
159-
</MudLink>
160-
</MudTooltip>
161-
}
162-
}
163-
</MudToolBar>
164-
</MudPaper>
165-
</MudItem>
166-
}
167-
168131
@if (Providers?.GetRentListProviders(Region).Any() ?? false)
169132
{
170133
hasProvider = true;

‎SD.WEB/Modules/Platform/PlataformIndex.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ else
6767
</MudLink>
6868
</CardHeaderContent>
6969
</MudCardHeader>
70-
<MudCardContent Class="py-1 px-2" Style="height: 48px;">
70+
<MudCardContent Class="py-1 px-2">
7171
<MudText Typo="Typo.body2" Color="Color.Secondary" Inline="true">
7272
@Translations.Module.Media.DeliveryModel:
7373
</MudText>
7474
<MudText Typo="Typo.body2" Inline="true">
7575
@(item.models.Any() ? string.Join(", ", item.models.Select(m => m.GetFieldSettings().Name)) : "N/A")
7676
</MudText>
7777
</MudCardContent>
78-
<MudCardContent Class="py-1 px-2" Style="height: 48px;">
78+
<MudCardContent Class="py-1 px-2">
7979
<MudText Typo="Typo.body2" Color="Color.Secondary" Inline="true">
8080
@Translations.Module.Media.MediaType:
8181
</MudText>

‎SD.WEB/SD.WEB.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</PackageReference>
2828
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.10" />
2929
<PackageReference Include="MudBlazor" Version="9.7.0" />
30-
<PackageReference Include="Sentry.AspNetCore.Blazor.WebAssembly" Version="6.6.0" />
30+
<PackageReference Include="Sentry.AspNetCore.Blazor.WebAssembly" Version="6.7.0" />
3131
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.19.2" />
3232
<PackageReference Include="Toolbelt.Blazor.PWA.Updater" Version="3.2.0" />
3333
</ItemGroup>

‎SD.WEB/wwwroot/css/custom-app.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ body .pwa-updater[b-pwa-updater] {
6464

6565
.grid-relative-container-platform {
6666
display: grid;
67-
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
67+
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
6868
gap: 12px;
6969
}
7070

7171
@media (max-width: 599.95px), (max-height: 599.95px) {
7272
.grid-relative-container-platform {
73-
grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));
73+
grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
7474
gap: 8px;
7575
}
7676
}

‎SD.WEB/wwwroot/css/custom-app.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)