From ac770231436f8a17d348a6a0ab934429df3c57d0 Mon Sep 17 00:00:00 2001
From: Feuerfuchs <git@feuerfuchs.dev>
Date: Mon, 18 May 2020 16:12:43 +0200
Subject: WIP: Refactoring

---
 internal/port/tpl/_fonts.html    |  16 ++++++
 internal/port/tpl/_header.html   |  48 ++++++++++++++++
 internal/port/tpl/_modals.html   |  24 ++++++++
 internal/port/tpl/gemini.html    |  38 +++++++++++++
 internal/port/tpl/gopher.html    |  59 +++++++++++++++++++
 internal/port/tpl/startpage.html | 120 +++++----------------------------------
 6 files changed, 200 insertions(+), 105 deletions(-)
 create mode 100644 internal/port/tpl/_fonts.html
 create mode 100644 internal/port/tpl/_header.html
 create mode 100644 internal/port/tpl/_modals.html

(limited to 'internal/port/tpl')

diff --git a/internal/port/tpl/_fonts.html b/internal/port/tpl/_fonts.html
new file mode 100644
index 0000000..b56aa22
--- /dev/null
+++ b/internal/port/tpl/_fonts.html
@@ -0,0 +1,16 @@
+<style>
+  @font-face {
+    font-family: 'Iosevka Term SS03';
+    font-style:  normal;
+    font-weight: normal;
+    src: url('{{ .Assets.FontW2 }}') format('woff2'),
+        url('{{ .Assets.FontW }}')  format('woff');
+  }
+  @font-face {
+    font-family: 'Iosevka Aile';
+    font-style:  normal;
+    font-weight: normal;
+    src: url('{{ .Assets.PropFontW2 }}') format('woff2'),
+        url('{{ .Assets.PropFontW }}')  format('woff');
+  }
+</style>
diff --git a/internal/port/tpl/_header.html b/internal/port/tpl/_header.html
new file mode 100644
index 0000000..5bcd254
--- /dev/null
+++ b/internal/port/tpl/_header.html
@@ -0,0 +1,48 @@
+<header class="header header-base">
+  <div class="location">
+            <a class="location__prefix">{{ .Protocol }}://</a><a class="location__prefix location__prefix--mobile">://</a>
+            
+    {{- if .URL -}}
+        {{- $page     := . -}}
+                {{- $href     := printf "/%s" .Protocol -}}
+                {{- $uriParts := split .URL "/" -}}
+            
+      {{- $uriLast  := $uriParts | last -}}
+      {{- $uriParts  = $uriParts | pop -}}
+      {{- if eq $uriLast "" -}}
+        {{- $uriLast  = $uriParts | last -}}
+        {{- $uriParts = $uriParts | pop -}}
+      {{- end -}}
+
+      {{- range $i, $part := $uriParts -}}
+        {{- if and (eq $page.Protocol "gopher") (eq $i 1) -}}
+          {{- $href = printf "%s/1" $href -}}
+          {{- $part = $part | trimLeftChar -}}
+          {{- if not (eq $part "") -}}
+            {{- $href = printf "%s/%s" $href $part -}}
+            <span class="location__slash">/</span><a href="{{ $href }}/" class="location__uripart">{{ $part }}</a>
+          {{- end -}}
+        {{- else -}}
+          {{- $href = printf "%s/%s" $href . -}}
+          {{- if ne $i 0 -}}
+            <span class="location__slash">/</span>
+          {{- end -}}
+          <a href="{{ $href }}/" class="location__uripart">{{ . }}</a>
+        {{- end -}}
+      {{- end -}}
+      {{- if ne (len $uriParts) 0 -}}
+        <span class="location__slash">/</span>
+      {{- end -}}
+      {{- if and (eq $page.Protocol "gopher") (eq (len $uriParts) 1) -}}
+        {{- $uriLast = $uriLast | trimLeftChar -}}
+      {{- end -}}
+      <span class="location__uripart">{{ $uriLast }}</span>
+            {{- end -}}
+  </div>
+  <div class="actions">
+    {{- if and (not .Lines) (not .Error) (eq .Protocol "gopher") -}}
+      <div class="action"><a href="/gopher/{{ .URL | replace "^([^/]*)/0" "$1/9" }}">View raw</a></div>
+    {{- end -}}
+    <div class="action"><button class="settings-btn">Settings</button></div>
+  </div>
+</header>
diff --git a/internal/port/tpl/_modals.html b/internal/port/tpl/_modals.html
new file mode 100644
index 0000000..3c08d9a
--- /dev/null
+++ b/internal/port/tpl/_modals.html
@@ -0,0 +1,24 @@
+<aside class="modal modal--settings">
+  <div class="modal__content">
+    <header class="modal__head header-base">
+      <h1 class="modal__title">Settings</h1>
+      <button class="modal__close-btn">Close</button>
+    </header>
+    <div class="setting setting--word-wrap">
+      <strong class="setting__label">Wrap wide content</strong>
+      <button class="setting__value">[N/A]</button>
+    </div>
+    <div class="setting setting--monospace-font">
+      <strong class="setting__label">Monospace font</strong>
+      <button class="setting__value">[N/A]</button>
+    </div>
+    <div class="setting setting--image-previews">
+      <strong class="setting__label">Image thumbnails</strong>
+      <button class="setting__value">[N/A]</button>
+    </div>
+    <div class="setting setting--clickable-plain-links">
+      <strong class="setting__label">Clickable links in text files</strong>
+      <button class="setting__value">[N/A]</button>
+    </div>
+  </div>
+</aside>
diff --git a/internal/port/tpl/gemini.html b/internal/port/tpl/gemini.html
index e69de29..08f1b8e 100644
--- a/internal/port/tpl/gemini.html
+++ b/internal/port/tpl/gemini.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<title>{{ .Title }} - Gemini proxy</title>
+		<link rel="stylesheet" href="{{ .Assets.Style }}" />
+		{{- template "_fonts.html" . -}}
+	</head>
+	<body class="{{ if not .Lines }}is-plain{{ end }}">
+		{{- template "_header.html" . -}}
+
+		<main class="wrap">
+			<pre class="content content--has-monospace-font{{ if .Lines }} content--has-type-annotations{{ end }}">
+				{{- if .Lines -}}
+					{{- $content := "" -}}
+					{{- range .Lines -}}
+						{{- if ne $content "" -}}
+							{{- $content = printf "%s\n" $content -}}
+						{{- end -}}
+						{{- if .Link -}}
+							{{- $content = printf "%s%s" $content (printf "<span class=\"type-annotation\">%s  </span><a class=\"link link--%s\" href=\"%s\">%s</a>" .Type .Type .Link (.Text | HTMLEscape)) -}}
+						{{- else -}}
+							{{- $content = printf "%s%s" $content (printf "<span class=\"type-annotation\">     </span>%s" (.Text | HTMLEscape)) -}}
+						{{- end -}}
+					{{- end -}}
+					{{- $content | safeHtml -}}
+				{{- else -}}
+					{{- .RawText -}}
+				{{- end -}}
+			</pre>
+		</main>
+
+		{{- template "_modals.html" . -}}
+
+		<script src="{{ .Assets.JS }}"></script>
+	</body>
+</html>
diff --git a/internal/port/tpl/gopher.html b/internal/port/tpl/gopher.html
index e69de29..c971847 100644
--- a/internal/port/tpl/gopher.html
+++ b/internal/port/tpl/gopher.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<title>{{ .Title }} - Gopher proxy</title>
+		<link rel="stylesheet" href="{{ .Assets.Style }}" />
+		{{- template "_fonts.html" . -}}
+	</head>
+	<body class="{{ if .IsPlain }}is-plain{{ end }}">
+		<header class="header header-base">
+      <div class="location">
+        <a class="location__prefix">gopher://</a><a class="location__prefix location__prefix--mobile">://</a>
+        {{- range $i, $item := .Nav -}}
+          {{- if ne $i 0 -}}
+            <span class="location__slash">/</span>
+          {{- end -}}
+          {{- if .Current -}}
+            <span class="location__uripart">{{ .Label }}</span>
+          {{- else -}}
+            <a href="{{ .URL }}/" class="location__uripart">{{ .Label }}</a>
+          {{- end -}}
+        {{- end -}}
+      </div>
+      <div class="actions">
+        {{- if .IsPlain -}}
+          <div class="action"><a href="/gopher/{{ .URL | replace "^([^/]*)/0" "$1/9" }}">View raw</a></div>
+        {{- end -}}
+        <div class="action"><button class="settings-btn">Settings</button></div>
+      </div>
+    </header>
+
+		<main class="wrap">
+			<pre class="content content--has-monospace-font{{ if not .IsPlain }} content--has-type-annotations{{ end }}">
+        {{- $content := "" -}}
+        {{- $page := . -}}
+        {{- range .Lines -}}
+          {{- if ne $content "" -}}
+            {{- $content = printf "%s\n" $content -}}
+          {{- end -}}
+          {{- if $page.IsPlain -}}
+            {{- $content = printf "%s%s" $content (.Text | HTMLEscape) -}}
+          {{- else -}}
+            {{- if .Link -}}
+              {{- $content = printf "%s%s" $content (printf "<span class=\"type-annotation\">%s  </span><a class=\"link link--%s\" href=\"%s\">%s</a>" .Type .Type .Link (.Text | HTMLEscape)) -}}
+            {{- else -}}
+              {{- $content = printf "%s%s" $content (printf "<span class=\"type-annotation\">     </span>%s" (.Text | HTMLEscape)) -}}
+            {{- end -}}
+          {{- end -}}
+        {{- end -}}
+        {{- $content | safeHtml -}}
+			</pre>
+		</main>
+
+		{{- template "_modals.html" . -}}
+
+		<script src="{{ .Assets.JS }}"></script>
+	</body>
+</html>
diff --git a/internal/port/tpl/startpage.html b/internal/port/tpl/startpage.html
index 8482a6f..cfe519d 100644
--- a/internal/port/tpl/startpage.html
+++ b/internal/port/tpl/startpage.html
@@ -3,118 +3,28 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<title>{{ .Title }}{{ if ne .Protocol "startpage" }} - {{ .Protocol | title }} proxy{{ end }}</title>
+		<title>{{ .Title }}</title>
 		<link rel="stylesheet" href="{{ .Assets.Style }}" />
-		<style>
-			@font-face {
-				font-family: 'Iosevka Term SS03';
-				font-style:  normal;
-				font-weight: normal;
-				src: url('{{ .Assets.FontW2 }}') format('woff2'),
-						url('{{ .Assets.FontW }}')  format('woff');
-			}
-			@font-face {
-				font-family: 'Iosevka Aile';
-				font-style:  normal;
-				font-weight: normal;
-				src: url('{{ .Assets.PropFontW2 }}') format('woff2'),
-						url('{{ .Assets.PropFontW }}')  format('woff');
-			}
-		</style>
+		{{- template "_fonts.html" . -}}
 	</head>
-	<body class="{{ if not .Lines }}is-plain{{ end }}">
+	<body class="is-plain">
 		<header class="header header-base">
-			<div class="location">
-                <a class="location__prefix">{{ .Protocol }}://</a><a class="location__prefix location__prefix--mobile">://</a>
-                
-				{{- if .URI -}}
-				    {{- $page     := . -}}
-                    {{- $href     := printf "/%s" .Protocol -}}
-                    {{- $uriParts := split .URI "/" -}}
-                
-					{{- $uriLast  := $uriParts | last -}}
-					{{- $uriParts  = $uriParts | pop -}}
-					{{- if eq $uriLast "" -}}
-						{{- $uriLast  = $uriParts | last -}}
-						{{- $uriParts = $uriParts | pop -}}
-					{{- end -}}
+      <div class="location">
+        <a class="location__prefix">start://</a><a class="location__prefix location__prefix--mobile">://</a>
+      </div>
+      <div class="actions">
+        <div class="action"><button class="settings-btn">Settings</button></div>
+      </div>
+    </header>
 
-					{{- range $i, $part := $uriParts -}}
-						{{- if and (eq $page.Protocol "gopher") (eq $i 1) -}}
-							{{- $href = printf "%s/1" $href -}}
-							{{- $part = $part | trimLeftChar -}}
-							{{- if not (eq $part "") -}}
-								{{- $href = printf "%s/%s" $href $part -}}
-								<span class="location__slash">/</span><a href="{{ $href }}/" class="location__uripart">{{ $part }}</a>
-							{{- end -}}
-						{{- else -}}
-							{{- $href = printf "%s/%s" $href . -}}
-							{{- if ne $i 0 -}}
-								<span class="location__slash">/</span>
-							{{- end -}}
-							<a href="{{ $href }}/" class="location__uripart">{{ . }}</a>
-						{{- end -}}
-					{{- end -}}
-					{{- if ne (len $uriParts) 0 -}}
-						<span class="location__slash">/</span>
-					{{- end -}}
-					{{- if and (eq $page.Protocol "gopher") (eq (len $uriParts) 1) -}}
-						{{- $uriLast = $uriLast | trimLeftChar -}}
-					{{- end -}}
-					<span class="location__uripart">{{ $uriLast }}</span>
-                {{- end -}}
-			</div>
-			<div class="actions">
-				{{- if and (not .Lines) (not .Error) (eq .Protocol "gopher") -}}
-					<div class="action"><a href="/gopher/{{ .URI | replace "^([^/]*)/0" "$1/9" }}">View raw</a></div>
-				{{- end -}}
-				<div class="action"><button class="settings-btn">Settings</button></div>
-			</div>
-		</header>
 		<main class="wrap">
-			<pre class="content content--has-monospace-font{{ if .Lines }} content--has-type-annotations{{ end }}">
-				{{- if .Lines -}}
-					{{- $content := "" -}}
-					{{- range .Lines -}}
-						{{- if ne $content "" -}}
-							{{- $content = printf "%s\n" $content -}}
-						{{- end -}}
-						{{- if .Link -}}
-							{{- $content = printf "%s%s" $content (printf "<span class=\"type-annotation\">%s  </span><a class=\"link link--%s\" href=\"%s\">%s</a>" .Type .Type .Link (.Text | HTMLEscape)) -}}
-						{{- else -}}
-							{{- $content = printf "%s%s" $content (printf "<span class=\"type-annotation\">     </span>%s" (.Text | HTMLEscape)) -}}
-						{{- end -}}
-					{{- end -}}
-					{{- $content | safeHtml -}}
-				{{- else -}}
-					{{- .RawText -}}
-				{{- end -}}
+			<pre class="content content--has-monospace-font">
+        {{- .Content -}}
 			</pre>
 		</main>
-		<aside class="modal modal--settings">
-			<div class="modal__content">
-				<header class="modal__head header-base">
-					<h1 class="modal__title">Settings</h1>
-					<button class="modal__close-btn">Close</button>
-				</header>
-				<div class="setting setting--word-wrap">
-					<strong class="setting__label">Wrap wide content</strong>
-					<button class="setting__value">[N/A]</button>
-				</div>
-				<div class="setting setting--monospace-font">
-					<strong class="setting__label">Monospace font</strong>
-					<button class="setting__value">[N/A]</button>
-				</div>
-				<div class="setting setting--image-previews">
-					<strong class="setting__label">Image thumbnails</strong>
-					<button class="setting__value">[N/A]</button>
-				</div>
-				<div class="setting setting--clickable-plain-links">
-					<strong class="setting__label">Clickable links in text files</strong>
-					<button class="setting__value">[N/A]</button>
-				</div>
-			</div>
-		</aside>
+
+		{{- template "_modals.html" . -}}
+
 		<script src="{{ .Assets.JS }}"></script>
 	</body>
 </html>
-- 
cgit v1.2.3-70-g09d2