From 1fc7615c9e09fc2eeac5b3c1f2010fe6882aa4e8 Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Tue, 22 Mar 2022 06:52:44 -0700 Subject: [PATCH] Revert "Merge pull request #165 from MaceWindu/issue/72" This reverts commit ea8468a3ca4efd5136535c76033d15f9f2bfbcdf, reversing changes made to 9c613d3b7f38b5a4aed3c619eeb522f6ef08c6c8. --- Data/PackageData.cs | 2 +- Data/PackageSearchResults.cs | 2 +- Data/PackageTargetFramework.cs | 2 +- Data/PackagesSearchResults.cs | 2 +- Pages/_Layout.cshtml | 8 ++++---- Pages/packages/badges.cshtml | 4 ++-- Pages/packages/dependents.cshtml | 4 ++-- Pages/packages/details.cshtml | 31 +++++++++++++++---------------- Pages/packages/index.cshtml | 6 +++--- 9 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Data/PackageData.cs b/Data/PackageData.cs index 2832004..2a66635 100644 --- a/Data/PackageData.cs +++ b/Data/PackageData.cs @@ -148,7 +148,7 @@ public class PackageData static readonly PackageDataCache cache = new PackageDataCache (); - public string SafeIconUrl => string.IsNullOrEmpty (IconUrl) ? "~/images/no-icon.png" : IconUrl; + public string SafeIconUrl => string.IsNullOrEmpty (IconUrl) ? "/images/no-icon.png" : IconUrl; public static Task GetAsync (object inputId, object inputVersion, HttpClient client) => GetAsync (inputId, inputVersion, client, CancellationToken.None); diff --git a/Data/PackageSearchResults.cs b/Data/PackageSearchResults.cs index a0e8d53..2776861 100644 --- a/Data/PackageSearchResults.cs +++ b/Data/PackageSearchResults.cs @@ -32,7 +32,7 @@ public void Add (PackageTargetFramework framework, PackageAssembly a, TypeDefini return; var dir = a.IsBuildAssembly ? "build" : "lib"; var code = isPublic ? "" : (framework.Package.AllowedToDecompile ? "?code=true" : ""); - var link = $"~/packages/{Uri.EscapeDataString(package.Id)}/{Uri.EscapeDataString(package.Version.ShortVersionString)}/{framework.Moniker}/{dir}/{Uri.EscapeDataString(a.FileName)}/{Uri.EscapeDataString(m.Namespace)}/{Uri.EscapeDataString(m.Name)}{code}#{Uri.EscapeDataString(id)}"; + var link = $"/packages/{Uri.EscapeDataString(package.Id)}/{Uri.EscapeDataString(package.Version.ShortVersionString)}/{framework.Moniker}/{dir}/{Uri.EscapeDataString(a.FileName)}/{Uri.EscapeDataString(m.Namespace)}/{Uri.EscapeDataString(m.Name)}{code}#{Uri.EscapeDataString(id)}"; results.TryAdd (link, new PackageSearchResult { Name = name, Parent = parent, diff --git a/Data/PackageTargetFramework.cs b/Data/PackageTargetFramework.cs index 157489f..dde84c0 100644 --- a/Data/PackageTargetFramework.cs +++ b/Data/PackageTargetFramework.cs @@ -100,7 +100,7 @@ from a in Assemblies.Concat (BuildAssemblies) return null; } var dir = at.a.IsBuildAssembly ? "build" : "lib"; - return $"~/packages/{Uri.EscapeDataString(Package.Id)}/{Uri.EscapeDataString(Package.Version.ShortVersionString)}/{dir}/{Uri.EscapeDataString(Moniker)}/{Uri.EscapeDataString(at.a.FileName)}/{Uri.EscapeDataString(at.t.Namespace)}/{Uri.EscapeDataString(at.t.Name)}"; + return $"/packages/{Uri.EscapeDataString(Package.Id)}/{Uri.EscapeDataString(Package.Version.ShortVersionString)}/{dir}/{Uri.EscapeDataString(Moniker)}/{Uri.EscapeDataString(at.a.FileName)}/{Uri.EscapeDataString(at.t.Namespace)}/{Uri.EscapeDataString(at.t.Name)}"; } async Task DeepFindTypeUrlAsync ( diff --git a/Data/PackagesSearchResults.cs b/Data/PackagesSearchResults.cs index 12bdb5c..e88ed1a 100644 --- a/Data/PackagesSearchResults.cs +++ b/Data/PackagesSearchResults.cs @@ -114,6 +114,6 @@ public class PackagesSearchResult public override string ToString() => PackageId; - public string SafeIconUrl => string.IsNullOrEmpty (IconUrl) ? "~/images/no-icon.png" : IconUrl; + public string SafeIconUrl => string.IsNullOrEmpty (IconUrl) ? "/images/no-icon.png" : IconUrl; } } diff --git a/Pages/_Layout.cshtml b/Pages/_Layout.cshtml index 814e8c0..8110860 100644 --- a/Pages/_Layout.cshtml +++ b/Pages/_Layout.cshtml @@ -34,8 +34,8 @@ --> - fuget.org -
+ fuget.org + @@ -63,9 +63,9 @@
  •  Grayed out is non-public
    • -

    fuget.org is © @DateTime.UtcNow.Year Frank A. Krueger

    +

    fuget.org is © @DateTime.UtcNow.Year Frank A. Krueger

    help me build this on github

    -

    privacy policy

    +

    privacy policy

    diff --git a/Pages/packages/badges.cshtml b/Pages/packages/badges.cshtml index 34287df..e1f1689 100644 --- a/Pages/packages/badges.cshtml +++ b/Pages/packages/badges.cshtml @@ -28,11 +28,11 @@ }; } -

    @package.Id Badges

    +

    @package.Id Badges

    - +
    diff --git a/Pages/packages/dependents.cshtml b/Pages/packages/dependents.cshtml index 2c81c35..a0e7560 100644 --- a/Pages/packages/dependents.cshtml +++ b/Pages/packages/dependents.cshtml @@ -24,14 +24,14 @@ }; } -

    @package.Id Dependents

    +

    @package.Id Dependents

    The following @dependents.Count packages directly use @(package.Id):

      @foreach (var r in dependents) {
    1. - @r + @r
      2. }
    diff --git a/Pages/packages/details.cshtml b/Pages/packages/details.cshtml index e08faaf..7b4a291 100644 --- a/Pages/packages/details.cshtml +++ b/Pages/packages/details.cshtml @@ -140,7 +140,7 @@ onamespace = (onamespace ?? ns?.Key) ?? RouteData.Values["namespace"]; otypeName = otypeName ?? RouteData.Values["typeName"]; ocode = ocode ?? Request.Query["code"].FirstOrDefault(); - var r = "~/packages"; + var r = "/packages"; if (oid != null) { r += "/" + Uri.EscapeDataString(oid.ToString()); @@ -172,9 +172,8 @@ if ("true".Equals(ocode) && package.AllowedToDecompile) { r += "?code=true"; - } - - return Url.Content(r); + } + return r; } string ShortDate(DateTime? date) @@ -197,12 +196,12 @@

    - - + + - @package.Id + @package.Id by @authors - +

    } @@ -405,7 +404,7 @@ else var cls = (active ? "active " : "") + "public-api";
  • + href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/lib/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(a.FileName)">  @a.FileName
    • @@ -422,7 +421,7 @@ else var cls = (active ? "active " : "") + "public-api";
  • + href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/build/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(a.FileName)">  @a.FileName
    • @@ -442,7 +441,7 @@ else {
  • + href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/@Uri.EscapeDataString(dir)/@Uri.EscapeDataString(framework.Moniker)/@Uri.EscapeDataString(asm.FileName)/@Uri.EscapeDataString(n.Key)">  @n.Key
    • @@ -480,7 +479,7 @@ else var color = bold == "bold" ? "#000" : "#777";
  • + href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/content/@a.ArchiveEntry.FullName.Substring(8)">  @a.ArchiveEntry.FullName.Substring(8)
    • @@ -497,7 +496,7 @@ else var color = bold == "bold" ? "#000" : "#777";
  • + href="/packages/@Uri.EscapeDataString(package.Id)/@Uri.EscapeDataString(package.Version.ShortVersionString)/tools/@a.ArchiveEntry.FullName.Substring(6)">  @a.ArchiveEntry.FullName.Substring(6)
    • diff --git a/Pages/packages/index.cshtml b/Pages/packages/index.cshtml index f7f17c6..d53bde4 100644 --- a/Pages/packages/index.cshtml +++ b/Pages/packages/index.cshtml @@ -22,12 +22,12 @@ @foreach (var r in results.Results) {
  • - - + +
    -

    @r.PackageId by @r.Authors

    +

    @r.PackageId by @r.Authors

    @r.Description