WIP: Refactoring

5 files changed, 54 insertions, 89 deletions

diff --git a/internal/port/tpl/_fonts.html b/internal/port/tpl/_fonts.html
index b56aa22..a947222 100644
--- a/internal/port/tpl/_fonts.html
+++ b/internal/port/tpl/_fonts.html
@@ -3,14 +3,14 @@
     font-family: 'Iosevka Term SS03';
     font-style:  normal;
     font-weight: normal;
-    src: url('{{ .Assets.FontW2 }}') format('woff2'),
-        url('{{ .Assets.FontW }}')  format('woff');
+    src: url('{{ .Assets.FontRegularW2 }}') format('woff2'),
+        url('{{ .Assets.FontRegularW }}')  format('woff');
   }
   @font-face {
-    font-family: 'Iosevka Aile';
+    font-family: 'Iosevka Term SS03';
     font-style:  normal;
-    font-weight: normal;
-    src: url('{{ .Assets.PropFontW2 }}') format('woff2'),
-        url('{{ .Assets.PropFontW }}')  format('woff');
+    font-weight: bold;
+    src: url('{{ .Assets.FontBoldW2 }}') format('woff2'),
+        url('{{ .Assets.FontBoldW }}')  format('woff');
   }
 </style>
diff --git a/internal/port/tpl/_header.html b/internal/port/tpl/_header.html
deleted file mode 100644
index 5bcd254..0000000
--- a/internal/port/tpl/_header.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<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
index 3c08d9a..3bbdef2 100644
--- a/internal/port/tpl/_modals.html
+++ b/internal/port/tpl/_modals.html
@@ -9,7 +9,7 @@
       <button class="setting__value">[N/A]</button>
     </div>
     <div class="setting setting--monospace-font">
-      <strong class="setting__label">Monospace font</strong>
+      <strong class="setting__label">Gemini: Monospace font</strong>
       <button class="setting__value">[N/A]</button>
     </div>
     <div class="setting setting--image-previews">
diff --git a/internal/port/tpl/gemini.html b/internal/port/tpl/gemini.html
index 08f1b8e..df50d50 100644
--- a/internal/port/tpl/gemini.html
+++ b/internal/port/tpl/gemini.html
@@ -7,28 +7,50 @@
                 <link rel="stylesheet" href="{{ .Assets.Style }}" />
                 {{- template "_fonts.html" . -}}
         </head>
-        <body class="{{ if not .Lines }}is-plain{{ end }}">
-                {{- template "_header.html" . -}}
+        <body class="{{ if .IsPlain }}is-plain{{ end }}">
+                <header class="header header-base">
+      <div class="location">
+        <a class="location__prefix">gemini://</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">
+        <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>
+      <div class="content{{ if not .IsPlain }} content--has-type-annotations{{ end }}">
+        {{- range .Sections -}}
+          {{- if eq .Type "RAW_TEXT" -}}
+            <div class="section"><span class="section__type">```</span><pre class="section__content">{{- .Text -}}</pre></div>
+          {{- else if eq .Type "REFLOW_TEXT" -}}
+            <div class="section"><p class="section__content">{{- .Text -}}</p></div>
+          {{- else if eq .Type "LINK" -}}
+            <div class="section"><span class="section__type">=></span><a class="section__content" href="{{ .URL }}">{{- .Text -}}</a></div>
+          {{- else if eq .Type "HEADING_1" -}}
+            <div class="section"><span class="section__type">#</span><h1 class="section__content">{{- .Text -}}</h1></div>
+          {{- else if eq .Type "HEADING_2" -}}
+            <div class="section"><span class="section__type">##</span><h2 class="section__content">{{- .Text -}}</h2></div>
+          {{- else if eq .Type "HEADING_3" -}}
+            <div class="section"><span class="section__type">###</span><h3 class="section__content">{{- .Text -}}</h3></div>
+          {{- else if eq .Type "LIST" -}}
+            <div class="section"><ul class="section__content">
+              {{- range .Items -}}
+                <li>{{- . -}}</li>
+              {{- end -}}
+            </ul></div>
+          {{- end -}}
+        {{- end -}}
+      </div>
                 </main>
 
                 {{- template "_modals.html" . -}}
diff --git a/internal/port/tpl/gopher.html b/internal/port/tpl/gopher.html
index c971847..5436123 100644
--- a/internal/port/tpl/gopher.html
+++ b/internal/port/tpl/gopher.html
@@ -31,25 +31,16 @@
     </header>
 
                 <main class="wrap">
-                        <pre class="content content--has-monospace-font{{ if not .IsPlain }} content--has-type-annotations{{ end }}">
-        {{- $content := "" -}}
+      <div class="content content--monospace{{ if not .IsPlain }} content--has-type-annotations{{ end }}">
         {{- $page := . -}}
         {{- range .Lines -}}
-          {{- if ne $content "" -}}
-            {{- $content = printf "%s\n" $content -}}
-          {{- end -}}
-          {{- if $page.IsPlain -}}
-            {{- $content = printf "%s%s" $content (.Text | HTMLEscape) -}}
+          {{- if .Link -}}
+            <div class="section"><span class="section__type">{{- .Type -}}</span><a class="section__content" href="{{ .Link }}">{{- .Text -}}</a></div>
           {{- 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 -}}
+            <div class="section"><span class="section__type"></span><pre class="section__content">{{- .Text -}}</pre></div>
           {{- end -}}
         {{- end -}}
-        {{- $content | safeHtml -}}
-                        </pre>
+                        </div>
                 </main>
 
                 {{- template "_modals.html" . -}}