Use gateway URL when linking to another CID root

This is necessary to support subdomain resolution. E.g. {cid}.ipfs.localhost

Use gateway URL when linking to another CID root
This is necessary to support subdomain resolution. E.g. {cid}.ipfs.localhost
deab971d · Kevin Neaton · ce0dceac · deab971d · deab971d
Commit deab971d authored Jul 17, 2020 by Kevin Neaton
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

dir-index.html dir-index.html +3 -2

test/main.go test/main.go +2 -0

No files found.
--- a/dir-index.html
+++ b/dir-index.html
 <!DOCTYPE html>
+{{ $root := . }}
 <html>
 <head>
 <meta charset="utf-8" />
@@ -44,7 +45,7 @@
        <strong>
          Index of
          {{ range .Breadcrumbs -}}
-          /{{ if .Path }}<a href="{{ .Path | urlEscape }}">{{ .Name }}</a>{{ else }}{{ .Name }}{{ end }}
+          /{{ if .Path }}<a href="{{ $root.GatewayURL }}{{ .Path | urlEscape }}">{{ .Name }}</a>{{ else }}{{ .Name }}{{ end }}
          {{- else }}
          {{ .Path }}
          {{ end }}
@@ -83,7 +84,7 @@
        </td>
        <td class="no-linebreak">
          {{ if .Hash }}
-          <a href="/ipfs/{{ .Hash | urlEscape }}">
+          <a href="{{ $root.GatewayURL }}/ipfs/{{ .Hash | urlEscape }}">
            {{ .ShortHash }}
          </a>
          {{ end }}

--- a/test/main.go
+++ b/test/main.go
@@ -12,6 +12,7 @@ const templateFile = "../dir-index.html"

 // Copied from go-ipfs/core/corehttp/gateway_indexPage.go
 type listingTemplateData struct {
+	GatewayURL string
 	Listing  []directoryItem
 	Size     string
 	Path     string
@@ -35,6 +36,7 @@ type breadcrumb struct {

 var testPath = "/ipfs/QmFooBarQXB2mzChmMeKY47C43LxUdg1NDJ5MWcKMKxDu7/a/b/c"
 var testData = listingTemplateData{
+	GatewayURL: "//localhost:3000",
 	Listing: []directoryItem{{
 		Size: "25 MiB",
 		Name: "short-film.mov",