beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added asset proxy. Adding google fonts as file instead of loading it externally. Removed demo theme

Browse source
This commit is contained in:
Marcel Baumgartner 2023-12-22 23:02:37 +01:00
parent c11ff632d2
commit 04ef9dc827
7 changed files with 359 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Moonlight/App/Http/Controllers/Api/AssetProxyController.cs Normal file
View file

@ -0,0 +1,66 @@
using System.Text;
using Microsoft.AspNetCore.Mvc;
using Moonlight.App.Helpers;
using Moonlight.App.Services.Sys;
namespace Moonlight.App.Http.Controllers.Api;
[ApiController]
[Route("api/assetproxy")]
public class AssetProxyController : Controller
{
private readonly MoonlightThemeService ThemeService;
public AssetProxyController(MoonlightThemeService themeService)
{
ThemeService = themeService;
}
[HttpGet("theme/{id}/js")]
public async Task<ActionResult> GetThemeJs(int id)
{
var enabledThemes = await ThemeService.GetEnabled();
var selectedTheme = enabledThemes.FirstOrDefault(x => x.Id == id);
if (selectedTheme == null)
return NotFound();
try
{
using var httpClient = new HttpClient();
var content = await httpClient.GetByteArrayAsync(selectedTheme.JsUrl);
return File(content, "text/javascript");
}
catch (Exception e)
{
Logger.Warn($"Error proxying js for theme {id}");
Logger.Warn(e);
return Problem();
}
}
[HttpGet("theme/{id}/css")]
public async Task<ActionResult> GetThemeCss(int id)
{
var enabledThemes = await ThemeService.GetEnabled();
var selectedTheme = enabledThemes.FirstOrDefault(x => x.Id == id);
if (selectedTheme == null)
return NotFound();
try
{
using var httpClient = new HttpClient();
var content = await httpClient.GetByteArrayAsync(selectedTheme.CssUrl);
return File(content, "text/css");
}
catch (Exception e)
{
Logger.Warn($"Error proxying css for theme {id}");
Logger.Warn(e);
return Problem();
}
}
}

1
Moonlight/App/Models/Abstractions/ApplicationTheme.cs
View file

@ -2,6 +2,7 @@
public class ApplicationTheme public class ApplicationTheme
{ {
public int Id { get; set; }
public string Name { get; set; } = ""; public string Name { get; set; } = "";
public string Author { get; set; } = ""; public string Author { get; set; } = "";
public string? DonateUrl { get; set; } = ""; public string? DonateUrl { get; set; } = "";

14
Moonlight/App/Services/Sys/MoonlightThemeService.cs
View file

@ -1,4 +1,5 @@
using Moonlight.App.Database.Entities; using Mappy.Net;
using Moonlight.App.Database.Entities;
using Moonlight.App.Models.Abstractions; using Moonlight.App.Models.Abstractions;
using Moonlight.App.Repositories; using Moonlight.App.Repositories;
@ -25,20 +26,13 @@ public class MoonlightThemeService
themes.AddRange(themeRepo themes.AddRange(themeRepo
.Get() .Get()
.ToArray() .ToArray()
.Select(x => new ApplicationTheme() .Select(x => Mapper.Map<ApplicationTheme>(x)));
{
Name = x.Name,
Author = x.Author,
CssUrl = x.CssUrl,
JsUrl = x.JsUrl,
Enabled = x.Enabled,
DonateUrl = x.DonateUrl
}));
if (ConfigService.Get().Theme.EnableDefault) if (ConfigService.Get().Theme.EnableDefault)
{ {
themes.Insert(0, new() themes.Insert(0, new()
{ {
Id = 0,
Name = "Moonlight Default", Name = "Moonlight Default",
Author = "MasuOwO", Author = "MasuOwO",
Enabled = true, Enabled = true,

11
Moonlight/Pages/_Host.cshtml
View file

@ -24,15 +24,18 @@
@foreach (var theme in themes) @foreach (var theme in themes)
{ {
var finalUrl = theme.CssUrl.StartsWith("/") ? theme.CssUrl : $"/api/assetproxy/theme/{theme.Id}/css";
<!-- Theme: @(theme.Name) by @(theme.Author) --> <!-- Theme: @(theme.Name) by @(theme.Author) -->
<link href="@(theme.CssUrl)" rel="stylesheet" type="text/css"/> <link href="@(finalUrl)" rel="stylesheet" type="text/css"/>
} }
<link href="/css/utils.css" rel="stylesheet" type="text/css"/> <link href="/css/utils.css" rel="stylesheet" type="text/css"/>
<link href="/css/blazor.css" rel="stylesheet" type="text/css"/> <link href="/css/blazor.css" rel="stylesheet" type="text/css"/>
<link href="/css/boxicons.min.css" rel="stylesheet" type="text/css"/> <link href="/css/boxicons.min.css" rel="stylesheet" type="text/css"/>
<link href="/css/sweetalert2dark.css" rel="stylesheet" type="text/css"/> <link href="/css/sweetalert2dark.css" rel="stylesheet" type="text/css"/>
<link href="https://fonts.googleapis.com/css?family=Inter:300,400,500,600,700" rel="stylesheet" type="text/css"> <link href="/css/interfont.css" rel="stylesheet" type="text/css"/>
@* <link href="https://fonts.googleapis.com/css?family=Inter:300,400,500,600,700" rel="stylesheet" type="text/css"> *@
</head> </head>
<body data-kt-app-header-fixed="true" <body data-kt-app-header-fixed="true"
data-kt-app-header-fixed-mobile="true" data-kt-app-header-fixed-mobile="true"
@ -57,8 +60,10 @@
{ {
if (!string.IsNullOrEmpty(theme.JsUrl)) if (!string.IsNullOrEmpty(theme.JsUrl))
{ {
var finalUrl = theme.JsUrl.StartsWith("/") ? theme.JsUrl : $"/api/assetproxy/theme/{theme.Id}/js";
<!-- Theme: @(theme.Name) by @(theme.Author) --> <!-- Theme: @(theme.Name) by @(theme.Author) -->
<script src="@(theme.JsUrl)"></script> <script src="@(finalUrl)"></script>
} }
} }

3
Moonlight/wwwroot/css/demotheme.css vendored
View file

@ -1,3 +0,0 @@
body {
background-color: #0d8ddc !important;
}

280
Moonlight/wwwroot/css/interfont.css vendored Normal file
View file

@ -0,0 +1,280 @@
/* cyrillic-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
src: url() format('woff2');
unicode-range: U+1F00-1FFF;
}
/* greek */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+1F00-1FFF;
}
/* greek */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: url() format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+1F00-1FFF;
}
/* greek */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
src: url() format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+1F00-1FFF;
}
/* greek */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
src: url() format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+1F00-1FFF;
}
/* greek */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: url("/fonts/Inter.woff2") format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

BIN
Moonlight/wwwroot/fonts/Inter.woff2 vendored Normal file
View file

Binary file not shown.