Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e7280d0e7 | |||
| 919a91d6aa | |||
| 3c9a947017 | |||
| 04e1f21405 | |||
| cc90857cf5 | |||
| 2367c19e42 | |||
| abd879ab66 | |||
| eb1252f902 |
@@ -24,25 +24,18 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set image tag
|
|
||||||
id: tag
|
|
||||||
run: |
|
|
||||||
TIMESTAMP=$(date +%Y%m%d%H%M%S)
|
|
||||||
SHA=$(echo ${{ github.sha }} | cut -c1-7)
|
|
||||||
echo "tag=${TIMESTAMP}-${SHA}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Build Docker image
|
|
||||||
run: |
|
|
||||||
docker build -t gitea.leeworks.dev/0xwheatyz/gitea-mobile:${{ steps.tag.outputs.tag }} .
|
|
||||||
docker tag gitea.leeworks.dev/0xwheatyz/gitea-mobile:${{ steps.tag.outputs.tag }} \
|
|
||||||
gitea.leeworks.dev/0xwheatyz/gitea-mobile:latest
|
|
||||||
|
|
||||||
- name: Login to Gitea registry
|
- name: Login to Gitea registry
|
||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login gitea.leeworks.dev \
|
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login gitea.leeworks.dev \
|
||||||
-u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
|
-u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
|
||||||
|
|
||||||
- name: Push image
|
- name: Build and push Docker image
|
||||||
run: |
|
run: |
|
||||||
docker push gitea.leeworks.dev/0xwheatyz/gitea-mobile:${{ steps.tag.outputs.tag }}
|
TIMESTAMP=$(date +%Y%m%d%H%M%S)
|
||||||
|
SHA=$(echo ${{ gitea.sha }} | cut -c1-7)
|
||||||
|
TAG="${TIMESTAMP}-${SHA}"
|
||||||
|
docker build -t gitea.leeworks.dev/0xwheatyz/gitea-mobile:${TAG} .
|
||||||
|
docker tag gitea.leeworks.dev/0xwheatyz/gitea-mobile:${TAG} \
|
||||||
|
gitea.leeworks.dev/0xwheatyz/gitea-mobile:latest
|
||||||
|
docker push gitea.leeworks.dev/0xwheatyz/gitea-mobile:${TAG}
|
||||||
docker push gitea.leeworks.dev/0xwheatyz/gitea-mobile:latest
|
docker push gitea.leeworks.dev/0xwheatyz/gitea-mobile:latest
|
||||||
|
|||||||
@@ -530,6 +530,103 @@ func (c *Client) GetTriageQueue(ctx context.Context, token string, orgs []string
|
|||||||
return queue, nil
|
return queue, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Comment represents a comment on an issue or pull request.
|
||||||
|
type Comment struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Body string `json:"body"`
|
||||||
|
User string `json:"-"` // populated from nested object
|
||||||
|
CreatedAt string `json:"-"` // formatted after fetch
|
||||||
|
RawUser struct {
|
||||||
|
Login string `json:"login"`
|
||||||
|
} `json:"user"`
|
||||||
|
RawCreatedAt time.Time `json:"created_at"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Label represents a Gitea label (used for available labels list).
|
||||||
|
type Label struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Color string `json:"color"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetIssue fetches a single issue by owner, repo, and index.
|
||||||
|
func (c *Client) GetIssue(ctx context.Context, token, owner, repo string, index int64) (*Issue, error) {
|
||||||
|
path := fmt.Sprintf("/repos/%s/%s/issues/%d", owner, repo, index)
|
||||||
|
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("fetching issue: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
var issue Issue
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&issue); err != nil {
|
||||||
|
return nil, fmt.Errorf("decoding issue: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
issue.RepoOwner = owner
|
||||||
|
issue.RepoName = repo
|
||||||
|
return &issue, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPull fetches a single pull request by owner, repo, and index.
|
||||||
|
func (c *Client) GetPull(ctx context.Context, token, owner, repo string, index int64) (*PullRequest, error) {
|
||||||
|
path := fmt.Sprintf("/repos/%s/%s/pulls/%d", owner, repo, index)
|
||||||
|
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("fetching pull request: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
var pr PullRequest
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&pr); err != nil {
|
||||||
|
return nil, fmt.Errorf("decoding pull request: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
pr.RepoOwner = owner
|
||||||
|
pr.RepoName = repo
|
||||||
|
return &pr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetIssueComments fetches comments for an issue or pull request.
|
||||||
|
func (c *Client) GetIssueComments(ctx context.Context, token, owner, repo string, index int64) ([]Comment, error) {
|
||||||
|
path := fmt.Sprintf("/repos/%s/%s/issues/%d/comments?limit=50", owner, repo, index)
|
||||||
|
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("fetching comments: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
var comments []Comment
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&comments); err != nil {
|
||||||
|
return nil, fmt.Errorf("decoding comments: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Populate convenience fields.
|
||||||
|
for i := range comments {
|
||||||
|
comments[i].User = comments[i].RawUser.Login
|
||||||
|
comments[i].CreatedAt = comments[i].RawCreatedAt.Format("Jan 2, 2006 15:04")
|
||||||
|
}
|
||||||
|
|
||||||
|
return comments, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRepoLabels fetches all labels for a repository.
|
||||||
|
func (c *Client) GetRepoLabels(ctx context.Context, token, owner, repo string) ([]Label, error) {
|
||||||
|
path := fmt.Sprintf("/repos/%s/%s/labels?limit=50", owner, repo)
|
||||||
|
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("fetching labels: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
var labels []Label
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&labels); err != nil {
|
||||||
|
return nil, fmt.Errorf("decoding labels: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return labels, nil
|
||||||
|
}
|
||||||
|
|
||||||
// CreateIssue creates a new issue in the specified repository.
|
// CreateIssue creates a new issue in the specified repository.
|
||||||
func (c *Client) CreateIssue(ctx context.Context, token, owner, repo, title, body string, labels []int64) (*Issue, error) {
|
func (c *Client) CreateIssue(ctx context.Context, token, owner, repo, title, body string, labels []int64) (*Issue, error) {
|
||||||
payload := map[string]interface{}{
|
payload := map[string]interface{}{
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/config"
|
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/config"
|
||||||
giteaclient "gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/gitea"
|
giteaclient "gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/gitea"
|
||||||
@@ -40,8 +41,12 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
|
|||||||
mux.HandleFunc("POST /issues", h.CreateIssue)
|
mux.HandleFunc("POST /issues", h.CreateIssue)
|
||||||
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/labels", h.ApplyLabels)
|
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/labels", h.ApplyLabels)
|
||||||
|
|
||||||
|
// Issue detail.
|
||||||
|
mux.HandleFunc("GET /issues/{owner}/{repo}/{index}", h.IssueDetail)
|
||||||
|
|
||||||
// Pull requests.
|
// Pull requests.
|
||||||
mux.HandleFunc("GET /pulls", h.ListPulls)
|
mux.HandleFunc("GET /pulls", h.ListPulls)
|
||||||
|
mux.HandleFunc("GET /pulls/{owner}/{repo}/{index}", h.PullDetail)
|
||||||
mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/review", h.SubmitReview)
|
mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/review", h.SubmitReview)
|
||||||
|
|
||||||
// Settings (handled separately for auth bypass).
|
// Settings (handled separately for auth bypass).
|
||||||
@@ -329,6 +334,116 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
|
|||||||
renderPage(w, r, "Pull Requests", "pulls", content)
|
renderPage(w, r, "Pull Requests", "pulls", content)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IssueDetail handles GET /issues/{owner}/{repo}/{index}.
|
||||||
|
func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
|
||||||
|
token := getToken(r)
|
||||||
|
owner := r.PathValue("owner")
|
||||||
|
repo := r.PathValue("repo")
|
||||||
|
indexStr := r.PathValue("index")
|
||||||
|
|
||||||
|
index, err := strconv.ParseInt(indexStr, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "invalid issue index", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
issue, err := h.Client.GetIssue(r.Context(), token, owner, repo, index)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to get issue", "error", err, "owner", owner, "repo", repo, "index", index)
|
||||||
|
renderPage(w, r, "Issue Not Found", "issues",
|
||||||
|
`<h1>Issue Not Found</h1><p class="empty">Could not load the requested issue.</p>`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
comments, err := h.Client.GetIssueComments(r.Context(), token, owner, repo, index)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to get comments", "error", err)
|
||||||
|
comments = nil // non-fatal, render without comments
|
||||||
|
}
|
||||||
|
|
||||||
|
labels, err := h.Client.GetRepoLabels(r.Context(), token, owner, repo)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to get repo labels", "error", err)
|
||||||
|
labels = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build the content HTML using the template.
|
||||||
|
tmpl, err := template.ParseFiles("internal/templates/issue_detail.html")
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to parse issue_detail template", "error", err)
|
||||||
|
http.Error(w, "template error", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
type templateData struct {
|
||||||
|
Issue *giteaclient.Issue
|
||||||
|
Comments []giteaclient.Comment
|
||||||
|
AvailableLabels []giteaclient.Label
|
||||||
|
}
|
||||||
|
|
||||||
|
data := templateData{
|
||||||
|
Issue: issue,
|
||||||
|
Comments: comments,
|
||||||
|
AvailableLabels: labels,
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf strings.Builder
|
||||||
|
if err := tmpl.ExecuteTemplate(&buf, "content", data); err != nil {
|
||||||
|
slog.Error("failed to execute issue_detail template", "error", err)
|
||||||
|
http.Error(w, "template error", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
renderPage(w, r, fmt.Sprintf("Issue #%d", index), "issues", buf.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// PullDetail handles GET /pulls/{owner}/{repo}/{index}.
|
||||||
|
func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
|
||||||
|
token := getToken(r)
|
||||||
|
owner := r.PathValue("owner")
|
||||||
|
repo := r.PathValue("repo")
|
||||||
|
indexStr := r.PathValue("index")
|
||||||
|
|
||||||
|
index, err := strconv.ParseInt(indexStr, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "invalid PR index", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pr, err := h.Client.GetPull(r.Context(), token, owner, repo, index)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to get pull request", "error", err, "owner", owner, "repo", repo, "index", index)
|
||||||
|
renderPage(w, r, "PR Not Found", "pulls",
|
||||||
|
`<h1>Pull Request Not Found</h1><p class="empty">Could not load the requested pull request.</p>`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build the content HTML using the template.
|
||||||
|
tmpl, err := template.ParseFiles("internal/templates/pull_detail.html")
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to parse pull_detail template", "error", err)
|
||||||
|
http.Error(w, "template error", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
type templateData struct {
|
||||||
|
Pull *giteaclient.PullRequest
|
||||||
|
}
|
||||||
|
|
||||||
|
data := templateData{
|
||||||
|
Pull: pr,
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf strings.Builder
|
||||||
|
if err := tmpl.ExecuteTemplate(&buf, "content", data); err != nil {
|
||||||
|
slog.Error("failed to execute pull_detail template", "error", err)
|
||||||
|
http.Error(w, "template error", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
renderPage(w, r, fmt.Sprintf("PR #%d", index), "pulls", buf.String())
|
||||||
|
}
|
||||||
|
|
||||||
// CreateIssue handles POST /issues.
|
// CreateIssue handles POST /issues.
|
||||||
func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
||||||
token := getToken(r)
|
token := getToken(r)
|
||||||
@@ -343,6 +458,12 @@ func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
|||||||
body := r.FormValue("body")
|
body := r.FormValue("body")
|
||||||
|
|
||||||
if owner == "" || repo == "" || title == "" {
|
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)
|
http.Error(w, "owner, repo, and title are required", http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -350,6 +471,12 @@ func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
|||||||
issue, err := h.Client.CreateIssue(r.Context(), token, owner, repo, title, body, nil)
|
issue, err := h.Client.CreateIssue(r.Context(), token, owner, repo, title, body, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("failed to create issue", "error", err)
|
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)
|
http.Error(w, "failed to create issue", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
{{define "content"}}
|
{{define "content"}}
|
||||||
<h1>Create Issue</h1>
|
<h1>Create Issue</h1>
|
||||||
|
|
||||||
<form hx-post="/issues" hx-swap="innerHTML" hx-target="#main-content">
|
<div id="form-error" class="empty" style="display:none;"></div>
|
||||||
|
|
||||||
|
<form id="create-issue-form" hx-post="/issues" hx-swap="innerHTML" hx-target="#main-content">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="repo-select">Repository</label>
|
<label for="repo-select">Repository</label>
|
||||||
<select id="repo-select" name="owner_repo" required>
|
<select id="repo-select" name="owner_repo" required>
|
||||||
@@ -32,11 +34,43 @@
|
|||||||
</form>
|
</form>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// Split owner/repo from select into hidden fields.
|
(function() {
|
||||||
document.getElementById('repo-select').addEventListener('change', function() {
|
var repoSelect = document.getElementById('repo-select');
|
||||||
var parts = this.value.split('/');
|
var ownerInput = document.getElementById('owner-input');
|
||||||
document.getElementById('owner-input').value = parts[0] || '';
|
var repoInput = document.getElementById('repo-input');
|
||||||
document.getElementById('repo-input').value = parts[1] || '';
|
var formError = document.getElementById('form-error');
|
||||||
|
|
||||||
|
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>
|
</script>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|||||||
Reference in New Issue
Block a user