aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-04 22:04:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3015 from NicolasDorier/ewfoufeoiu

Browse Source 
Fixes of bugs happening when using rootpath
This commit is contained in:
Nicolas Dorier
2021-10-25 16:55:00 +09:00
committed by GitHub
parent a73383cd87 fc7125b8cd
commit c0abcbea24
8 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/AppsPublicController.cs
View File

@@ -377,7 +377,7 @@ namespace BTCPayServer.Controllers
ExtendedNotifications = true,
SupportedTransactionCurrencies = paymentMethods,
RedirectURL = request.RedirectUrl ??
new Uri(new Uri(new Uri(HttpContext.Request.GetAbsoluteRoot()), _BtcPayServerOptions.RootPath), $"apps/{appId}/crowdfund").ToString()
HttpContext.Request.GetAbsoluteUri($"/apps/{appId}/crowdfund")
}, store, HttpContext.Request.GetAbsoluteRoot(),
new List<string> { AppService.GetAppInternalTag(appId) },
cancellationToken: cancellationToken);

22
BTCPayServer/TagHelpers.cs
View File

@@ -4,6 +4,7 @@ using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BTCPayServer.Configuration;
using BTCPayServer.Security;
using BTCPayServer.Services;
using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -141,4 +142,25 @@ namespace BTCPayServer.TagHelpers
}
}
}
// Make sure that <svg><use href=/ are correctly working if rootpath is present
[HtmlTargetElement("use", Attributes = "href")]
public class SVGUse : TagHelper
{
private string _RootPath;
public SVGUse(BTCPayServerOptions opts)
{
_RootPath = opts.RootPath;
}
public override void Process(TagHelperContext context, TagHelperOutput output)
{
if (string.IsNullOrEmpty(_RootPath) || _RootPath == "/")
return;
var attr = output.Attributes["href"];
if (!attr.Value.ToString().StartsWith("/", StringComparison.OrdinalIgnoreCase))
return;
output.Attributes.SetAttribute("href", $"{_RootPath}{attr.Value}");
}
}
}

3
BTCPayServer/Views/Shared/LayoutHead.cshtml
View File

@@ -1,9 +1,10 @@
@using BTCPayServer.Abstractions.Contracts
@using BTCPayServer.Abstractions.Contracts
@inject ISettingsRepository _settingsRepository
@addTagHelper *, BundlerMinifier.TagHelpers
@{ var policies = await _settingsRepository.GetPolicies(); }
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" href="~/favicon.ico" type="image/x-icon">
@if (policies.DiscourageSearchEngines)
{
<meta name="robots" content="noindex">

24
BTCPayServer/wwwroot/main/fonts/Montserrat.css
View File

@@ -5,8 +5,8 @@
font-weight: 300;
font-display: swap;
src: local('Montserrat Light'), local('Montserrat-Light'),
url('/fonts/montserrat-v14-latin-ext_latin-300.woff2') format('woff2'),
url('/fonts/montserrat-v14-latin-ext_latin-300.woff') format('woff');
url('../../fonts/montserrat-v14-latin-ext_latin-300.woff2') format('woff2'),
url('../../fonts/montserrat-v14-latin-ext_latin-300.woff') format('woff');
}
@font-face {
@@ -15,8 +15,8 @@
font-weight: 300;
font-display: swap;
src: local('Montserrat Light Italic'), local('Montserrat-LightItalic'),
url('/fonts/montserrat-v14-latin-ext_latin-300italic.woff2') format('woff2'),
url('/fonts/montserrat-v14-latin-ext_latin-300italic.woff') format('woff');
url('../../fonts/montserrat-v14-latin-ext_latin-300italic.woff2') format('woff2'),
url('../../fonts/montserrat-v14-latin-ext_latin-300italic.woff') format('woff');
}
@font-face {
@@ -25,8 +25,8 @@
font-weight: 400;
font-display: swap;
src: local('Montserrat Regular'), local('Montserrat-Regular'),
url('/fonts/montserrat-v14-latin-ext_latin-regular.woff2') format('woff2'),
url('/fonts/montserrat-v14-latin-ext_latin-regular.woff') format('woff');
url('../../fonts/montserrat-v14-latin-ext_latin-regular.woff2') format('woff2'),
url('../../fonts/montserrat-v14-latin-ext_latin-regular.woff') format('woff');
}
@font-face {
@@ -35,8 +35,8 @@
font-weight: 400;
font-display: swap;
src: local('Montserrat Italic'), local('Montserrat-Italic'),
url('/fonts/montserrat-v14-latin-ext_latin-italic.woff2') format('woff2'),
url('/fonts/montserrat-v14-latin-ext_latin-italic.woff') format('woff');
url('../../fonts/montserrat-v14-latin-ext_latin-italic.woff2') format('woff2'),
url('../../fonts/montserrat-v14-latin-ext_latin-italic.woff') format('woff');
}
@font-face {
@@ -45,8 +45,8 @@
font-weight: 700;
font-display: swap;
src: local('Montserrat Bold'), local('Montserrat-Bold'),
url('/fonts/montserrat-v14-latin-ext_latin-700.woff2') format('woff2'),
url('/fonts/montserrat-v14-latin-ext_latin-700.woff') format('woff');
url('../../fonts/montserrat-v14-latin-ext_latin-700.woff2') format('woff2'),
url('../../fonts/montserrat-v14-latin-ext_latin-700.woff') format('woff');
}
@font-face {
@@ -55,6 +55,6 @@
font-weight: 700;
font-display: swap;
src: local('Montserrat Bold Italic'), local('Montserrat-BoldItalic'),
url('/fonts/montserrat-v14-latin-ext_latin-700italic.woff2') format('woff2'),
url('/fonts/montserrat-v14-latin-ext_latin-700italic.woff') format('woff');
url('../../fonts/montserrat-v14-latin-ext_latin-700italic.woff2') format('woff2'),
url('../../fonts/montserrat-v14-latin-ext_latin-700italic.woff') format('woff');
}

40
BTCPayServer/wwwroot/main/fonts/OpenSans.css
View File

@@ -5,8 +5,8 @@
font-weight: 300;
font-display: swap;
src: local('Open Sans Light'), local('OpenSans-Light'),
url('/fonts/open-sans-v17-latin-ext_latin-300.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-300.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-300.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-300.woff') format('woff');
}
@font-face {
@@ -15,8 +15,8 @@
font-weight: 400;
font-display: swap;
src: local('Open Sans Regular'), local('OpenSans-Regular'),
url('/fonts/open-sans-v17-latin-ext_latin-regular.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-regular.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-regular.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-regular.woff') format('woff');
}
@font-face {
@@ -25,8 +25,8 @@
font-weight: 400;
font-display: swap;
src: local('Open Sans Italic'), local('OpenSans-Italic'),
url('/fonts/open-sans-v17-latin-ext_latin-italic.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-italic.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-italic.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-italic.woff') format('woff');
}
@font-face {
@@ -35,8 +35,8 @@
font-weight: 600;
font-display: swap;
src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'),
url('/fonts/open-sans-v17-latin-ext_latin-600.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-600.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-600.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-600.woff') format('woff');
}
@font-face {
@@ -45,8 +45,8 @@
font-weight: 300;
font-display: swap;
src: local('Open Sans Light Italic'), local('OpenSans-LightItalic'),
url('/fonts/open-sans-v17-latin-ext_latin-300italic.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-300italic.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-300italic.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-300italic.woff') format('woff');
}
@font-face {
@@ -55,8 +55,8 @@
font-weight: 600;
font-display: swap;
src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'),
url('/fonts/open-sans-v17-latin-ext_latin-600italic.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-600italic.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-600italic.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-600italic.woff') format('woff');
}
@font-face {
@@ -65,8 +65,8 @@
font-weight: 700;
font-display: swap;
src: local('Open Sans Bold'), local('OpenSans-Bold'),
url('/fonts/open-sans-v17-latin-ext_latin-700.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-700.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-700.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-700.woff') format('woff');
}
@font-face {
@@ -75,8 +75,8 @@
font-weight: 700;
font-display: swap;
src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
url('/fonts/open-sans-v17-latin-ext_latin-700italic.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-700italic.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-700italic.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-700italic.woff') format('woff');
}
@font-face {
@@ -85,8 +85,8 @@
font-weight: 800;
font-display: swap;
src: local('Open Sans ExtraBold'), local('OpenSans-ExtraBold'),
url('/fonts/open-sans-v17-latin-ext_latin-800.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-800.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-800.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-800.woff') format('woff');
}
@font-face {
@@ -95,6 +95,6 @@
font-weight: 800;
font-display: swap;
src: local('Open Sans ExtraBold Italic'), local('OpenSans-ExtraBoldItalic'),
url('/fonts/open-sans-v17-latin-ext_latin-800italic.woff2') format('woff2'),
url('/fonts/open-sans-v17-latin-ext_latin-800italic.woff') format('woff');
url('../../fonts/open-sans-v17-latin-ext_latin-800italic.woff2') format('woff2'),
url('../../fonts/open-sans-v17-latin-ext_latin-800italic.woff') format('woff');
}

24
BTCPayServer/wwwroot/main/fonts/Roboto.css
View File

@@ -5,8 +5,8 @@
font-weight: 400;
font-display: swap;
src: local('Roboto'), local('Roboto-Regular'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff2') format('woff2'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff') format('woff');
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff2') format('woff2'),
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff') format('woff');
}
@font-face {
@@ -15,8 +15,8 @@
font-weight: 400;
font-display: swap;
src: local('Roboto Italic'), local('Roboto-Italic'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff2') format('woff2'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff') format('woff');
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff2') format('woff2'),
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff') format('woff');
}
@font-face {
@@ -25,8 +25,8 @@
font-weight: 500;
font-display: swap;
src: local('Roboto Medium'), local('Roboto-Medium'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-500.woff2') format('woff2'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-500.woff') format('woff');
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-500.woff2') format('woff2'),
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-500.woff') format('woff');
}
@font-face {
@@ -35,8 +35,8 @@
font-weight: 500;
font-display: swap;
src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-500italic.woff2') format('woff2'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-500italic.woff') format('woff');
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-500italic.woff2') format('woff2'),
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-500italic.woff') format('woff');
}
@font-face {
@@ -45,8 +45,8 @@
font-weight: 700;
font-display: swap;
src: local('Roboto Bold'), local('Roboto-Bold'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff2') format('woff2'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff') format('woff');
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff2') format('woff2'),
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff') format('woff');
}
@font-face {
@@ -55,6 +55,6 @@
font-weight: 700;
font-display: swap;
src: local('Roboto Bold Italic'), local('Roboto-BoldItalic'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff2') format('woff2'),
url('/fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff') format('woff');
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff2') format('woff2'),
url('../../fonts/roboto-v20-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff') format('woff');
}

4
BTCPayServer/wwwroot/main/fonts/RobotoMono.css
View File

@@ -4,6 +4,6 @@
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('/fonts/roboto-mono-v12-vietnamese_latin-ext_latin_greek_cyrillic-ext_cyrillic-regular.woff2') format('woff2'),
url('/fonts/roboto-mono-v12-vietnamese_latin-ext_latin_greek_cyrillic-ext_cyrillic-regular.woff') format('woff');
src: url('../../fonts/roboto-mono-v12-vietnamese_latin-ext_latin_greek_cyrillic-ext_cyrillic-regular.woff2') format('woff2'),
url('../../fonts/roboto-mono-v12-vietnamese_latin-ext_latin_greek_cyrillic-ext_cyrillic-regular.woff') format('woff');
}

4
BTCPayServer/wwwroot/main/site.css
View File

@@ -1,4 +1,4 @@
/* Set scroll padding so that anchors don't disappear underneath the fixed navbar */
/* Set scroll padding so that anchors don't disappear underneath the fixed navbar */
html {
scroll-padding-top: 5rem;
}
@@ -445,7 +445,7 @@ header.masthead::before {
left: 0;
width: 100%;
height: 100%;
background-image: url("../../img/bg.png");
background-image: url("../img/bg.png");
background-position: center;
background-size: cover;
}