diff --git a/BTCPayServer/Views/ViewsRazor.cs b/BTCPayServer.Abstractions/Extensions/ViewsRazor.cs similarity index 98% rename from BTCPayServer/Views/ViewsRazor.cs rename to BTCPayServer.Abstractions/Extensions/ViewsRazor.cs index 622861ade..f161a90f1 100644 --- a/BTCPayServer/Views/ViewsRazor.cs +++ b/BTCPayServer.Abstractions/Extensions/ViewsRazor.cs @@ -3,7 +3,7 @@ using System.Globalization; using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.ViewFeatures; -namespace BTCPayServer.Views +namespace BTCPayServer.Abstractions.Extensions { public static class ViewsRazor { diff --git a/BTCPayServer/Components/NotificationsDropdown/Default.cshtml b/BTCPayServer/Components/NotificationsDropdown/Default.cshtml index f4eef0c7a..a2fef1509 100644 --- a/BTCPayServer/Components/NotificationsDropdown/Default.cshtml +++ b/BTCPayServer/Components/NotificationsDropdown/Default.cshtml @@ -3,6 +3,7 @@ @inject ISettingsRepository SettingsRepository @using BTCPayServer.HostedServices @using BTCPayServer.Views.Notifications +@using BTCPayServer.Abstractions.Extensions @using BTCPayServer.Abstractions.Contracts @using BTCPayServer.Client @using BTCPayServer.Services diff --git a/BTCPayServer/Models/ServerViewModels/DynamicDnsViewModel.cs b/BTCPayServer/Models/ServerViewModels/DynamicDnsViewModel.cs index ccdf7fc63..eb344bf0b 100644 --- a/BTCPayServer/Models/ServerViewModels/DynamicDnsViewModel.cs +++ b/BTCPayServer/Models/ServerViewModels/DynamicDnsViewModel.cs @@ -1,4 +1,5 @@ using System; +using BTCPayServer.Abstractions.Extensions; using BTCPayServer.Services; namespace BTCPayServer.Models.ServerViewModels @@ -23,7 +24,7 @@ namespace BTCPayServer.Models.ServerViewModels { if (Settings?.LastUpdated is DateTimeOffset date) { - return Views.ViewsRazor.ToTimeAgo(date); + return ViewsRazor.ToTimeAgo(date); } return null; } diff --git a/BTCPayServer/Models/ViewPullPaymentModel.cs b/BTCPayServer/Models/ViewPullPaymentModel.cs index fe303f094..b30b38ccf 100644 --- a/BTCPayServer/Models/ViewPullPaymentModel.cs +++ b/BTCPayServer/Models/ViewPullPaymentModel.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; +using BTCPayServer.Abstractions.Extensions; using BTCPayServer.Client.Models; using BTCPayServer.Data; using BTCPayServer.Services.Rates; -using BTCPayServer.Views; using PullPaymentData = BTCPayServer.Data.PullPaymentData; namespace BTCPayServer.Models diff --git a/BTCPayServer/Views/Apps/_ViewImports.cshtml b/BTCPayServer/Views/Apps/_ViewImports.cshtml index 0a4a4114e..9b63aa5a6 100644 --- a/BTCPayServer/Views/Apps/_ViewImports.cshtml +++ b/BTCPayServer/Views/Apps/_ViewImports.cshtml @@ -1,2 +1,3 @@ -@using BTCPayServer.Views.Apps +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views.Apps @using BTCPayServer.Models.AppViewModels diff --git a/BTCPayServer/Views/Apps/_ViewStart.cshtml b/BTCPayServer/Views/Apps/_ViewStart.cshtml index ce0623920..ca738f083 100644 --- a/BTCPayServer/Views/Apps/_ViewStart.cshtml +++ b/BTCPayServer/Views/Apps/_ViewStart.cshtml @@ -1,4 +1,5 @@ -@using BTCPayServer.Views +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views @using BTCPayServer.Views.Apps @{ ViewBag.CategoryTitle = "Apps"; diff --git a/BTCPayServer/Views/CoinSwitch/UpdateCoinSwitchSettings.cshtml b/BTCPayServer/Views/CoinSwitch/UpdateCoinSwitchSettings.cshtml index 43921b9d2..b99c68cfa 100644 --- a/BTCPayServer/Views/CoinSwitch/UpdateCoinSwitchSettings.cshtml +++ b/BTCPayServer/Views/CoinSwitch/UpdateCoinSwitchSettings.cshtml @@ -1,5 +1,5 @@ -@using Microsoft.AspNetCore.Mvc.Rendering -@using BTCPayServer.Views.Stores +@using BTCPayServer.Views.Stores +@using BTCPayServer.Abstractions.Extensions @model UpdateCoinSwitchSettingsViewModel @{ Layout = "../Shared/_NavLayout.cshtml"; diff --git a/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethod.cshtml b/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethod.cshtml index aaf09f18a..39d4b3b7b 100644 --- a/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethod.cshtml +++ b/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethod.cshtml @@ -1,4 +1,5 @@ @using BTCPayServer.Views.Stores +@using BTCPayServer.Abstractions.Extensions @model BTCPayServer.Services.Altcoins.Ethereum.UI.EditEthereumPaymentMethodViewModel @{ diff --git a/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethods.cshtml b/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethods.cshtml index 4624183ad..7a734f72a 100644 --- a/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethods.cshtml +++ b/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethods.cshtml @@ -1,5 +1,6 @@ @using BTCPayServer.Views.Stores +@using BTCPayServer.Abstractions.Extensions @model BTCPayServer.Services.Altcoins.Ethereum.UI.ViewEthereumStoreOptionsViewModel @inject SignInManager SignInManager; @inject BTCPayNetworkProvider BTCPayNetworkProvider; diff --git a/BTCPayServer/Views/Fido2/_ViewImports.cshtml b/BTCPayServer/Views/Fido2/_ViewImports.cshtml index 381eef44f..d59f27dd1 100644 --- a/BTCPayServer/Views/Fido2/_ViewImports.cshtml +++ b/BTCPayServer/Views/Fido2/_ViewImports.cshtml @@ -1 +1,2 @@ -@using BTCPayServer.Views.Manage +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views.Manage diff --git a/BTCPayServer/Views/Invoice/_ViewImports.cshtml b/BTCPayServer/Views/Invoice/_ViewImports.cshtml index dce5cf528..7aca28a1a 100644 --- a/BTCPayServer/Views/Invoice/_ViewImports.cshtml +++ b/BTCPayServer/Views/Invoice/_ViewImports.cshtml @@ -1,2 +1,3 @@ -@using BTCPayServer.Services.Invoices +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Services.Invoices @using BTCPayServer.Views.Invoice diff --git a/BTCPayServer/Views/Invoice/_ViewStart.cshtml b/BTCPayServer/Views/Invoice/_ViewStart.cshtml index ed4bd2ca0..e48d5fe1b 100644 --- a/BTCPayServer/Views/Invoice/_ViewStart.cshtml +++ b/BTCPayServer/Views/Invoice/_ViewStart.cshtml @@ -1,3 +1,4 @@ +@using BTCPayServer.Abstractions.Extensions @using BTCPayServer.Views @using BTCPayServer.Views.Invoice @{ diff --git a/BTCPayServer/Views/Manage/_ViewImports.cshtml b/BTCPayServer/Views/Manage/_ViewImports.cshtml index 381eef44f..d59f27dd1 100644 --- a/BTCPayServer/Views/Manage/_ViewImports.cshtml +++ b/BTCPayServer/Views/Manage/_ViewImports.cshtml @@ -1 +1,2 @@ -@using BTCPayServer.Views.Manage +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views.Manage diff --git a/BTCPayServer/Views/Manage/_ViewStart.cshtml b/BTCPayServer/Views/Manage/_ViewStart.cshtml index 5e65af0c3..42cd52b87 100644 --- a/BTCPayServer/Views/Manage/_ViewStart.cshtml +++ b/BTCPayServer/Views/Manage/_ViewStart.cshtml @@ -1,4 +1,5 @@ -@using BTCPayServer.Views +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views @using BTCPayServer.Views.Manage @{ Layout = "../Shared/_NavLayout.cshtml"; diff --git a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml index 0127540d9..340f9de38 100644 --- a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml +++ b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml @@ -1,5 +1,5 @@ -@using BTCPayServer.Controllers @using BTCPayServer.Views.Stores +@using BTCPayServer.Abstractions.Extensions @model BTCPayServer.Services.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodViewModel @{ diff --git a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml index d6016549c..8270accf6 100644 --- a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml +++ b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml @@ -1,4 +1,5 @@ @using BTCPayServer.Views.Stores +@using BTCPayServer.Abstractions.Extensions @model BTCPayServer.Services.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodListViewModel @{ diff --git a/BTCPayServer/Views/Notifications/_ViewImports.cshtml b/BTCPayServer/Views/Notifications/_ViewImports.cshtml index e02abfc9b..b1f16b190 100644 --- a/BTCPayServer/Views/Notifications/_ViewImports.cshtml +++ b/BTCPayServer/Views/Notifications/_ViewImports.cshtml @@ -1 +1 @@ - +@using BTCPayServer.Abstractions.Extensions diff --git a/BTCPayServer/Views/Notifications/_ViewStart.cshtml b/BTCPayServer/Views/Notifications/_ViewStart.cshtml index 91dfe10ed..67c0ff34e 100644 --- a/BTCPayServer/Views/Notifications/_ViewStart.cshtml +++ b/BTCPayServer/Views/Notifications/_ViewStart.cshtml @@ -1,4 +1,5 @@ -@using BTCPayServer.Views +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views @using BTCPayServer.Views.Notifications @{ diff --git a/BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml b/BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml index 772cccf0d..76a727f7d 100644 --- a/BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml +++ b/BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml @@ -1 +1,2 @@ -@using BTCPayServer.Views.PaymentRequest +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views.PaymentRequest diff --git a/BTCPayServer/Views/PaymentRequest/_ViewStart.cshtml b/BTCPayServer/Views/PaymentRequest/_ViewStart.cshtml index 9b9e5c48f..8a177873b 100644 --- a/BTCPayServer/Views/PaymentRequest/_ViewStart.cshtml +++ b/BTCPayServer/Views/PaymentRequest/_ViewStart.cshtml @@ -1,3 +1,4 @@ +@using BTCPayServer.Abstractions.Extensions @using BTCPayServer.Views @using BTCPayServer.Views.PaymentRequest @{ diff --git a/BTCPayServer/Views/Server/_ViewImports.cshtml b/BTCPayServer/Views/Server/_ViewImports.cshtml index 85eec8f2d..b946b92df 100644 --- a/BTCPayServer/Views/Server/_ViewImports.cshtml +++ b/BTCPayServer/Views/Server/_ViewImports.cshtml @@ -1,2 +1,3 @@ -@using BTCPayServer.Views.Server +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views.Server @using BTCPayServer.Models.ServerViewModels diff --git a/BTCPayServer/Views/Server/_ViewStart.cshtml b/BTCPayServer/Views/Server/_ViewStart.cshtml index 39648ddd7..505b03774 100644 --- a/BTCPayServer/Views/Server/_ViewStart.cshtml +++ b/BTCPayServer/Views/Server/_ViewStart.cshtml @@ -1,4 +1,5 @@ -@using BTCPayServer.Views +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views @using BTCPayServer.Views.Server @{ Layout = "../Shared/_NavLayout.cshtml"; diff --git a/BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml b/BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml index 7e9001043..ec6b75280 100644 --- a/BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml +++ b/BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml @@ -1,6 +1,6 @@ -@using BTCPayServer.Services.Altcoins.Ethereum.UI @using BTCPayServer.Views.Server @using System.Net.Http +@using BTCPayServer.Abstractions.Extensions @model BTCPayServer.Services.Altcoins.Ethereum.Configuration.EthereumLikeConfiguration @inject BTCPayNetworkProvider BTCPayNetworkProvider; @inject IHttpClientFactory HttpClientFactory; diff --git a/BTCPayServer/Views/Shared/_Layout.cshtml b/BTCPayServer/Views/Shared/_Layout.cshtml index 1f3890854..03f3f66d5 100644 --- a/BTCPayServer/Views/Shared/_Layout.cshtml +++ b/BTCPayServer/Views/Shared/_Layout.cshtml @@ -6,6 +6,7 @@ @using BTCPayServer.Views.PaymentRequest @using BTCPayServer.Views.Wallets @using BTCPayServer.Abstractions.Contracts +@using BTCPayServer.Abstractions.Extensions @inject SignInManager SignInManager @inject UserManager UserManager @inject RoleManager RoleManager diff --git a/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml b/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml index d5e0ac1f0..008a2b1c5 100644 --- a/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml +++ b/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml @@ -1,13 +1,12 @@ @using BTCPayServer.Views.Stores +@using BTCPayServer.Abstractions.Extensions @model BTCPayServer.Plugins.Shopify.Models.ShopifySettings @{ - Layout = "../Shared/_NavLayout.cshtml"; ViewData["NavPartialName"] = "../Stores/_Nav"; ViewData.SetActivePageAndTitle(StoreNavPages.Integrations, "Integrations"); - var shopifyCredsSet = Model?.IntegratedAt.HasValue is true; var shopifyUrl = Model?.ShopifyUrl; } diff --git a/BTCPayServer/Views/Stores/_ViewImports.cshtml b/BTCPayServer/Views/Stores/_ViewImports.cshtml index 2ee48f0d5..4a24df5cc 100644 --- a/BTCPayServer/Views/Stores/_ViewImports.cshtml +++ b/BTCPayServer/Views/Stores/_ViewImports.cshtml @@ -1,2 +1,3 @@ -@using BTCPayServer.Views.Stores +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views.Stores @using BTCPayServer.Models.StoreViewModels diff --git a/BTCPayServer/Views/Stores/_ViewStart.cshtml b/BTCPayServer/Views/Stores/_ViewStart.cshtml index c05e6d077..f351ba3be 100644 --- a/BTCPayServer/Views/Stores/_ViewStart.cshtml +++ b/BTCPayServer/Views/Stores/_ViewStart.cshtml @@ -1,4 +1,5 @@ -@using BTCPayServer.Views +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views @using BTCPayServer.Views.Stores @{ diff --git a/BTCPayServer/Views/UserStores/_ViewImports.cshtml b/BTCPayServer/Views/UserStores/_ViewImports.cshtml index 2ee48f0d5..4a24df5cc 100644 --- a/BTCPayServer/Views/UserStores/_ViewImports.cshtml +++ b/BTCPayServer/Views/UserStores/_ViewImports.cshtml @@ -1,2 +1,3 @@ -@using BTCPayServer.Views.Stores +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views.Stores @using BTCPayServer.Models.StoreViewModels diff --git a/BTCPayServer/Views/UserStores/_ViewStart.cshtml b/BTCPayServer/Views/UserStores/_ViewStart.cshtml index 56d8a1d3d..abf74e553 100644 --- a/BTCPayServer/Views/UserStores/_ViewStart.cshtml +++ b/BTCPayServer/Views/UserStores/_ViewStart.cshtml @@ -1,3 +1,4 @@ +@using BTCPayServer.Abstractions.Extensions @using BTCPayServer.Views @using BTCPayServer.Views.Stores diff --git a/BTCPayServer/Views/Wallets/_ViewImports.cshtml b/BTCPayServer/Views/Wallets/_ViewImports.cshtml index f0c1fba0c..93e8cb4dc 100644 --- a/BTCPayServer/Views/Wallets/_ViewImports.cshtml +++ b/BTCPayServer/Views/Wallets/_ViewImports.cshtml @@ -1,3 +1,4 @@ -@using BTCPayServer.Views.Wallets +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views.Wallets @using BTCPayServer.Models.WalletViewModels @addTagHelper *, BundlerMinifier.TagHelpers diff --git a/BTCPayServer/Views/Wallets/_ViewStart.cshtml b/BTCPayServer/Views/Wallets/_ViewStart.cshtml index 46955f834..7618401c4 100644 --- a/BTCPayServer/Views/Wallets/_ViewStart.cshtml +++ b/BTCPayServer/Views/Wallets/_ViewStart.cshtml @@ -1,4 +1,5 @@ -@using BTCPayServer.Views +@using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Views @using BTCPayServer.Views.Wallets @{ ViewBag.CategoryTitle = "Wallets";