diff --git a/appview/pages/pages.go b/appview/pages/pages.go index d89add7a..2c091ad1 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -14,6 +14,7 @@ import ( "path/filepath" "strings" + "github.com/alecthomas/chroma/v2" chromahtml "github.com/alecthomas/chroma/v2/formatters/html" "github.com/alecthomas/chroma/v2/lexers" "github.com/alecthomas/chroma/v2/styles" @@ -364,9 +365,13 @@ type RepoBlobParams struct { } func (p *Pages) RepoBlob(w io.Writer, params RepoBlobParams) error { + style := styles.Get("bw") + b := style.Builder() + b.Add(chroma.LiteralString, "noitalic") + style, _ = b.Build() + if params.Lines < 5000 { c := params.Contents - style := styles.Get("bw") formatter := chromahtml.New( chromahtml.InlineCode(true), chromahtml.WithLineNumbers(true), diff --git a/appview/pages/templates/layouts/topbar.html b/appview/pages/templates/layouts/topbar.html index 7f6d37b1..df6115c8 100644 --- a/appview/pages/templates/layouts/topbar.html +++ b/appview/pages/templates/layouts/topbar.html @@ -1,50 +1,28 @@ {{ define "layouts/topbar" }} - {{ with .LoggedInUser }} - - {{ else }} - login - {{ end }} + {{ $linkstyle := "text-gray-400 hover:text-gray-900 no-underline" }} + {{ end }} diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html index e81f73a1..93b64801 100644 --- a/appview/pages/templates/repo/commit.html +++ b/appview/pages/templates/repo/commit.html @@ -109,7 +109,6 @@
             {{- range .TextFragments -}}
               
{{ .Header }}
- {{- range .Lines -}} {{- if eq .Op.String "+" -}}
{{ .Op.String }}{{ .Line }}
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html index bcc9bdec..800c7196 100644 --- a/appview/pages/templates/repo/index.html +++ b/appview/pages/templates/repo/index.html @@ -13,7 +13,7 @@ onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + this.value" class="p-1 border border-gray-500 bg-white" > - + {{ range .Branches }} - + {{ range .Tags }} + {{ else }} + {{ end }} diff --git a/appview/state/middleware.go b/appview/state/middleware.go index 6b40b1cd..bb874901 100644 --- a/appview/state/middleware.go +++ b/appview/state/middleware.go @@ -150,7 +150,6 @@ func ResolveIdent(s *State) Middleware { start := time.Now() didOrHandle := chi.URLParam(req, "user") - log.Println(didOrHandle) id, err := s.resolver.ResolveIdent(req.Context(), didOrHandle) if err != nil { // invalid did or handle diff --git a/appview/state/repo.go b/appview/state/repo.go index ad03dbed..24396cee 100644 --- a/appview/state/repo.go +++ b/appview/state/repo.go @@ -53,8 +53,6 @@ func (s *State) RepoIndex(w http.ResponseWriter, r *http.Request) { return } - log.Println(resp.Status, result) - user := s.auth.GetUser(r) s.pages.RepoIndexPage(w, pages.RepoIndexParams{ LoggedInUser: user, @@ -275,8 +273,6 @@ func (s *State) RepoBranches(w http.ResponseWriter, r *http.Request) { return } - log.Println(result) - user := s.auth.GetUser(r) s.pages.RepoBranches(w, pages.RepoBranchesParams{ LoggedInUser: user, diff --git a/knotserver/git/diff.go b/knotserver/git/diff.go index 415c771f..da82724e 100644 --- a/knotserver/git/diff.go +++ b/knotserver/git/diff.go @@ -65,10 +65,7 @@ func (g *GitRepo) Diff() (*types.NiceDiff, error) { ndiff.IsDelete = d.IsDelete for _, tf := range d.TextFragments { - ndiff.TextFragments = append(ndiff.TextFragments, types.TextFragment{ - Header: tf.Header(), - Lines: tf.Lines, - }) + ndiff.TextFragments = append(ndiff.TextFragments, *tf) for _, l := range tf.Lines { switch l.Op { case gitdiff.OpAdd: diff --git a/types/diff.go b/types/diff.go index a17e569b..16483c4d 100644 --- a/types/diff.go +++ b/types/diff.go @@ -15,10 +15,10 @@ type Diff struct { Old string `json:"old"` New string `json:"new"` } `json:"name"` - TextFragments []TextFragment `json:"text_fragments"` - IsBinary bool `json:"is_binary"` - IsNew bool `json:"is_new"` - IsDelete bool `json:"is_delete"` + TextFragments []gitdiff.TextFragment `json:"text_fragments"` + IsBinary bool `json:"is_binary"` + IsNew bool `json:"is_new"` + IsDelete bool `json:"is_delete"` } // A nicer git diff representation.