refactor: wire Dashboard, ListIssues, and ListPulls to use template files

Replace inline fmt.Sprintf HTML generation in Dashboard, ListIssues, and ListPulls handlers with template.ParseFiles rendering of dashboard.html, issues.html, and pulls.html respectively. ListIssues now reads ?org= and ?state= query params to filter results. ListPulls now reads ?org= query param to filter results. Closes leeworks-agents/gitea-mobile#34 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-26 17:45:44 +00:00
7 changed files with 12 additions and 214 deletions
@@ -751,45 +751,6 @@ func (c *Client) PostComment(ctx context.Context, token, owner, repo string, ind
 	return &comment, nil
 }
 // RenderMarkdown renders raw markdown text to HTML using the Gitea API.
 // Falls back to the raw text if the API call fails.
 func (c *Client) RenderMarkdown(ctx context.Context, token, text string) (string, error) {
 	payload, err := json.Marshal(map[string]string{
 		"Text": text,
 		"Mode": "gfm",
 	})
 	if err != nil {
 		return text, fmt.Errorf("marshaling markdown request: %w", err)
 	}
 	url := c.baseURL + "/api/v1/markdown"
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, strings.NewReader(string(payload)))
 	if err != nil {
 		return text, fmt.Errorf("creating markdown request: %w", err)
 	}
 	req.Header.Set("Authorization", "token "+token)
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Accept", "text/html")
 	resp, err := c.httpClient.Do(req)
 	if err != nil {
 		return text, fmt.Errorf("executing markdown request: %w", err)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode >= 400 {
 		return text, fmt.Errorf("markdown API error %d", resp.StatusCode)
 	}
 	rendered, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return text, fmt.Errorf("reading markdown response: %w", err)
 	}
 	return string(rendered), nil
 }
 // priorityScore returns a numeric score for sorting (lower = higher priority).
 func priorityScore(labels []string) int {
 	for _, l := range labels {
@@ -38,7 +38,6 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
 	// Issues.
 	mux.HandleFunc("GET /issues", h.ListIssues)
 	mux.HandleFunc("GET /issues/new", h.NewIssue)
 	mux.HandleFunc("POST /issues", h.CreateIssue)
 	mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/labels", h.ApplyLabels)
 	mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/close", h.CloseIssue)
@@ -115,10 +114,6 @@ var basePage = template.Must(template.New("base").Parse(`<!DOCTYPE html>
  <script src="/static/htmx.min.js"></script>
 </head>
 <body>
  <header class="top-bar">
    <span class="top-bar-title">Gitea Mobile</span>
    <button class="refresh-btn" hx-get="" hx-target="#main-content" hx-swap="innerHTML" aria-label="Refresh">&#8635;</button>
  </header>
  <div class="content" id="main-content">
    {{.Content}}
  </div>
@@ -371,17 +366,6 @@ func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
 		labels = nil
 	}
 	// Render markdown body if present.
 	var renderedBody template.HTML
 	if issue.Body != "" {
 		rendered, err := h.Client.RenderMarkdown(r.Context(), token, issue.Body)
 		if err != nil {
 			slog.Warn("failed to render issue body markdown, using plain text", "error", err)
 		} else {
 			renderedBody = template.HTML(rendered)
 		}
 	}
 	// Build the content HTML using the template.
 	tmpl, err := template.ParseFiles("internal/templates/issue_detail.html")
 	if err != nil {
@@ -392,14 +376,12 @@ func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
 	type templateData struct {
 		Issue           *giteaclient.Issue
 		RenderedBody    template.HTML
 		Comments        []giteaclient.Comment
 		AvailableLabels []giteaclient.Label
 	}
 	data := templateData{
 		Issue:           issue,
 		RenderedBody:    renderedBody,
 		Comments:        comments,
 		AvailableLabels: labels,
 	}
@@ -435,17 +417,6 @@ func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// Render markdown body if present.
 	var renderedBody template.HTML
 	if pr.Body != "" {
 		rendered, err := h.Client.RenderMarkdown(r.Context(), token, pr.Body)
 		if err != nil {
 			slog.Warn("failed to render PR body markdown, using plain text", "error", err)
 		} else {
 			renderedBody = template.HTML(rendered)
 		}
 	}
 	// Build the content HTML using the template.
 	tmpl, err := template.ParseFiles("internal/templates/pull_detail.html")
 	if err != nil {
@@ -455,13 +426,11 @@ func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
 	}
 	type templateData struct {
-		Pull         *giteaclient.PullRequest
+		Pull *giteaclient.PullRequest
 		RenderedBody template.HTML
 	}
 	data := templateData{
-		Pull:         pr,
+		Pull: pr,
 		RenderedBody: renderedBody,
 	}
 	var buf strings.Builder
@@ -474,41 +443,6 @@ func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
 	renderPage(w, r, fmt.Sprintf("PR #%d", index), "pulls", buf.String())
 }
 // NewIssue handles GET /issues/new — renders the create-issue form.
 func (h *Handler) NewIssue(w http.ResponseWriter, r *http.Request) {
 	token := getToken(r)
 	repos, err := h.Client.ListOrgsAndRepos(r.Context(), token)
 	if err != nil {
 		slog.Error("failed to list repos for new issue form", "error", err)
 		renderPage(w, r, "New Issue", "issues",
 			`<h1>New Issue</h1><p class="empty">Error loading repositories.</p>`)
 		return
 	}
 	tmpl, err := template.ParseFiles("internal/templates/create_issue.html")
 	if err != nil {
 		slog.Error("failed to parse create_issue template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)
 		return
 	}
 	type templateData struct {
 		Repos map[string][]giteaclient.Repo
 	}
 	data := templateData{Repos: repos}
 	var buf strings.Builder
 	if err := tmpl.ExecuteTemplate(&buf, "content", data); err != nil {
 		slog.Error("failed to execute create_issue template", "error", err)
 		http.Error(w, "template error", http.StatusInternalServerError)
 		return
 	}
 	renderPage(w, r, "New Issue", "issues", buf.String())
 }
 // CreateIssue handles POST /issues.
 func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
 	token := getToken(r)
@@ -523,12 +457,6 @@ func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
 	body := r.FormValue("body")
 	if owner == "" || repo == "" || title == "" {
 		if isHTMX(r) {
 			w.Header().Set("Content-Type", "text/html; charset=utf-8")
 			w.WriteHeader(http.StatusBadRequest)
 			fmt.Fprint(w, `<span class="empty">owner, repo, and title are required</span>`)
 			return
 		}
 		http.Error(w, "owner, repo, and title are required", http.StatusBadRequest)
 		return
 	}
@@ -536,12 +464,6 @@ func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
 	issue, err := h.Client.CreateIssue(r.Context(), token, owner, repo, title, body, nil)
 	if err != nil {
 		slog.Error("failed to create issue", "error", err)
 		if isHTMX(r) {
 			w.Header().Set("Content-Type", "text/html; charset=utf-8")
 			w.WriteHeader(http.StatusInternalServerError)
 			fmt.Fprint(w, `<span class="empty">Failed to create issue. Please try again.</span>`)
 			return
 		}
 		http.Error(w, "failed to create issue", http.StatusInternalServerError)
 		return
 	}
@@ -1,9 +1,7 @@
 {{define "content"}}
 <h1>Create Issue</h1>
-<div id="form-error" class="empty" style="display:none;"></div>
+<form hx-post="/issues" hx-swap="innerHTML" hx-target="#main-content">
 <form id="create-issue-form" hx-post="/issues" hx-swap="innerHTML" hx-target="#main-content">
  <div class="form-group">
    <label for="repo-select">Repository</label>
    <select id="repo-select" name="owner_repo" required>
@@ -34,43 +32,11 @@
 </form>
 <script>
-  (function() {
+  // Split owner/repo from select into hidden fields.
-    var repoSelect = document.getElementById('repo-select');
+  document.getElementById('repo-select').addEventListener('change', function() {
-    var ownerInput = document.getElementById('owner-input');
+    var parts = this.value.split('/');
-    var repoInput = document.getElementById('repo-input');
+    document.getElementById('owner-input').value = parts[0] || '';
-    var formError = document.getElementById('form-error');
+    document.getElementById('repo-input').value = parts[1] || '';
-
+  });
    function splitOwnerRepo() {
      var val = repoSelect.value;
      if (val) {
        var parts = val.split('/');
        ownerInput.value = parts[0] || '';
        repoInput.value = parts[1] || '';
      } else {
        ownerInput.value = '';
        repoInput.value = '';
      }
    }
    repoSelect.addEventListener('change', splitOwnerRepo);
    // Validate before HTMX submit.
    document.getElementById('create-issue-form').addEventListener('htmx:configRequest', function(evt) {
      splitOwnerRepo();
      if (!ownerInput.value || !repoInput.value) {
        evt.preventDefault();
        formError.textContent = 'Please select a repository before submitting.';
        formError.style.display = 'block';
        return false;
      }
      formError.style.display = 'none';
    });
    // Show server-side errors inline on HTMX error responses.
    document.getElementById('create-issue-form').addEventListener('htmx:responseError', function(evt) {
      formError.textContent = evt.detail.xhr.responseText || 'An error occurred. Please try again.';
      formError.style.display = 'block';
    });
  })();
 </script>
 {{end}}
@@ -9,9 +9,7 @@
    <span class="label" style="color:#{{.Color}};border:1px solid #{{.Color}}">{{.Name}}</span>
    {{end}}
  </div>
-  {{if .RenderedBody}}
+  {{if .Issue.Body}}
  <div class="card-body markdown-body">{{.RenderedBody}}</div>
  {{else if .Issue.Body}}
  <div class="card-body">{{.Issue.Body}}</div>
  {{end}}
 </div>
@@ -13,10 +13,6 @@
  <script src="/static/htmx.min.js"></script>
 </head>
 <body>
  <header class="top-bar">
    <span class="top-bar-title">Gitea Mobile</span>
    <button class="refresh-btn" hx-get="" hx-target="#main-content" hx-swap="innerHTML" aria-label="Refresh">&#8635;</button>
  </header>
  <div class="content" id="main-content">
    {{template "content" .}}
  </div>
@@ -15,9 +15,7 @@
    <span class="diff-del">-{{.Pull.Deletions}}</span>
    {{if .Pull.Mergeable}}<span style="color:var(--accent-green);">Mergeable</span>{{end}}
  </div>
-  {{if .RenderedBody}}
+  {{if .Pull.Body}}
  <div class="card-body markdown-body">{{.RenderedBody}}</div>
  {{else if .Pull.Body}}
  <div class="card-body">{{.Pull.Body}}</div>
  {{end}}
 </div>
@@ -47,53 +47,10 @@ body {
  -moz-osx-font-smoothing: grayscale;
 }
 /* Top bar */
 .top-bar {
  position: sticky;
  top: 0;
  z-index: 100;
  display: flex;
  align-items: center;
  justify-content: space-between;
  padding: var(--spacing-sm) var(--spacing-lg);
  padding-top: max(var(--spacing-sm), env(safe-area-inset-top));
  background: var(--bg-secondary);
  border-bottom: 1px solid var(--border);
 }
 .top-bar-title {
  font-size: var(--font-base);
  font-weight: 600;
  color: var(--text-primary);
 }
 .refresh-btn {
  background: none;
  border: none;
  color: var(--text-secondary);
  font-size: 1.4rem;
  padding: var(--spacing-xs) var(--spacing-sm);
  cursor: pointer;
  -webkit-tap-highlight-color: transparent;
  line-height: 1;
  border-radius: var(--radius-sm);
  transition: color 0.15s ease, background 0.15s ease;
 }
 .refresh-btn:active {
  color: var(--accent-blue);
  background: var(--bg-tertiary);
 }
 .refresh-btn.htmx-request {
  animation: spin 0.6s linear infinite;
  pointer-events: none;
 }
 /* Content area */
 .content {
  padding: var(--spacing-lg);
-  padding-top: var(--spacing-lg);
+  padding-top: max(var(--spacing-lg), env(safe-area-inset-top));
  max-width: 640px;
  margin: 0 auto;
 }