Merge pull request #43 from ipfs/fix/links-when-dnslink

jessicaschilling · web-flow · commit 92efd3dfd1cd · 2020-09-28T13:47:30.000-06:00
feat: improved CID column (filename and dnslink support)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,10 +12,10 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: '12.x'
-    - run: npm run build    
+    - run: npm run build
     - name: Check working tree
       id: changes
       uses: UnicornGlobal/has-changes-action@v1.0.11
     - name: Check for uncommited changes
       if: steps.changes.outputs.changed == 1
-      run: git status && echo "Output does not match src/, uncommitted changes exist, follow build instructions from README" && exit 1
+      run: git status && git --no-pager diff --patch-with-raw && echo "Output does not match src/, uncommitted changes exist, follow build instructions from README" && exit 1
diff --git a/dir-index.html b/dir-index.html
diff --git a/package.json b/package.json
@@ -17,10 +17,11 @@
   "license": "MIT",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
   "scripts": {
+    "start": "cd test && go run .",
     "build": "npm run build:clean && npm run build:remove-style-links && npm run build:minify-wrap-css && npm run build:combine-html-css && npm run build:remove-unused",
     "build:clean": "rm dir-index.html",
     "build:remove-style-links": "sed '/<link rel=\"stylesheet\"/d' ./src/dir-index.html > ./base-html.html",
-    "build:minify-wrap-css": "(echo \"<style>\" && cat ./src/icons.css ./src/style.css | tr -d \"\t\n\r\" && echo -e \"\\n</style>\") > ./minified-wrapped-style.html",
+    "build:minify-wrap-css": "(echo \"<style>\" && cat ./src/icons.css ./src/style.css | tr -d \"\t\n\r\" && echo && echo \"</style>\") > ./minified-wrapped-style.html",
     "build:combine-html-css": "sed '/<head>/ r ./minified-wrapped-style.html' ./base-html.html > ./dir-index.html",
     "build:remove-unused": "rm ./base-html.html && rm ./minified-wrapped-style.html"
   }
diff --git a/src/dir-index.html b/src/dir-index.html
@@ -81,7 +81,7 @@
         </td>
         <td class="no-linebreak">
           {{ if .Hash }}
-          <a class="ipfs-hash" href="{{ $root.GatewayURL }}/ipfs/{{ .Hash | urlEscape }}">
+          <a class="ipfs-hash" href={{ if $root.DNSLink }}"https://cid.ipfs.io/#{{ .Hash | urlEscape}}" target="_blank" rel="noreferrer noopener"{{ else }}"{{ $root.GatewayURL }}/ipfs/{{ .Hash | urlEscape}}?filename={{ .Name | urlEscape }}"{{ end }}>
             {{ .ShortHash }}
           </a>
           {{ end }}
diff --git a/test/main.go b/test/main.go
@@ -13,6 +13,7 @@ const templateFile = "../dir-index.html"
 // Copied from go-ipfs/core/corehttp/gateway_indexPage.go
 type listingTemplateData struct {
 	GatewayURL  string
+	DNSLink     bool
 	Listing     []directoryItem
 	Size        string
 	Path        string
@@ -37,18 +38,25 @@ type breadcrumb struct {
 var testPath = "/ipfs/QmFooBarQXB2mzChmMeKY47C43LxUdg1NDJ5MWcKMKxDu7/a/b/c"
 var testData = listingTemplateData{
 	GatewayURL: "//localhost:3000",
+	DNSLink:    true,
 	Listing: []directoryItem{{
 		Size:      "25 MiB",
 		Name:      "short-film.mov",
 		Path:      testPath + "/short-film.mov",
-		Hash:      "QmQuxBarQXB2mzChmMeKY47C43LxUdg1NDJ5MWcKMKxDu7",
-		ShortHash: "QmQu\u2026xDu7",
+		Hash:      "QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR",
+		ShortHash: "QmbW\u2026sMnR",
+	}, {
+		Size:      "23 KiB",
+		Name:      "250pxيوسف_الوزاني_صورة_ملتقطة_بواسطة_مرصد_هابل_الفضائي_توضح_سديم_السرطان،_وهو_بقايا_مستعر_أعظم._.jpg",
+		Path:      testPath + "/250pxيوسف_الوزاني_صورة_ملتقطة_بواسطة_مرصد_هابل_الفضائي_توضح_سديم_السرطان،_وهو_بقايا_مستعر_أعظم._.jpg",
+		Hash:      "QmUwrKrMTrNv8QjWGKMMH5QV9FMPUtRCoQ6zxTdgxATQW6",
+		ShortHash: "QmUw\u2026TQW6",
 	}, {
 		Size:      "1 KiB",
 		Name:      "this-piece-of-papers-got-47-words-37-sentences-58-words-we-wanna-know.txt",
 		Path:      testPath + "/this-piece-of-papers-got-47-words-37-sentences-58-words-we-wanna-know.txt",
-		Hash:      "QmquXbaRQXB2mzChmMeKY47C43LxUdg1NDJ5MWcKMKxDu7",
-		ShortHash: "Qmqu\u2026xDu7",
+		Hash:      "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",
+		ShortHash: "bafy\u2026bzdi",
 	}},
 	Size: "25 MiB",
 	Path: testPath,
