BlueGit

timfa bluegit

Merge branch 'stage' into master

timfa Grok Bot · pushed by timfa

Authored 2026-11-13 · 4 days ago

Hash
2c0eaf4094423bbb6d7a122f6a899382842f72ad
Pipeline
Passed
16 files changed +242 −35
internal/i18n/catalog.go +1 −1
@@ -113,7 +113,7 @@ var en = map[string]string{
113 113 "group.empty": "No repositories yet.",
114 114 "group.menu": "Menu",
115 115 "group.star": "Star",
116 "group.unstar": "Unstar",
116 "group.unstar": "Remove star",
117 117 "group.secretsNote": "Only secrets of this group.",
118 118 "group.defaultRole": "Default role for new repositories",
119 119
@@ -113,7 +113,7 @@ var en = map[string]string{
113 "group.empty": "No repositories yet.",
113 "group.empty": "No repositories yet.",
114 "group.menu": "Menu",
114 "group.menu": "Menu",
115 "group.star": "Star",
115 "group.star": "Star",
116 "group.unstar": "Unstar",
116 "group.unstar": "Remove star",
117 "group.secretsNote": "Only secrets of this group.",
117 "group.secretsNote": "Only secrets of this group.",
118 "group.defaultRole": "Default role for new repositories",
118 "group.defaultRole": "Default role for new repositories",
119
119
internal/i18n/catalog_lang.go +1 −1
@@ -120,7 +120,7 @@ var nl = map[string]string{
120 120 "group.empty": "Nog geen repositories.",
121 121 "group.menu": "Menu",
122 122 "group.star": "Ster",
123 "group.unstar": "Ster weg",
123 "group.unstar": "Ster verwijderen",
124 124 "group.secretsNote": "Alleen geheimen van deze groep.",
125 125 "group.defaultRole": "Standaardrol voor nieuwe repositories",
126 126 "tab.overview": "Overzicht",
@@ -120,7 +120,7 @@ var nl = map[string]string{
120 "group.empty": "Nog geen repositories.",
120 "group.empty": "Nog geen repositories.",
121 "group.menu": "Menu",
121 "group.menu": "Menu",
122 "group.star": "Ster",
122 "group.star": "Ster",
123 "group.unstar": "Ster weg",
123 "group.unstar": "Ster verwijderen",
124 "group.secretsNote": "Alleen geheimen van deze groep.",
124 "group.secretsNote": "Alleen geheimen van deze groep.",
125 "group.defaultRole": "Standaardrol voor nieuwe repositories",
125 "group.defaultRole": "Standaardrol voor nieuwe repositories",
126 "tab.overview": "Overzicht",
126 "tab.overview": "Overzicht",
internal/server/extra_test.go +8 −2
@@ -173,9 +173,15 @@ func TestSlugAvailabilityDefaultRoleLogoAndLanguage(t *testing.T) {
173 173 t.Fatal(err)
174 174 }
175 175 list := read(t, res)
176 if !strings.Contains(list, "Activity") || !strings.Contains(list, "Created ") || !strings.Contains(list, "★") {
176 if !strings.Contains(list, "Activity") || !strings.Contains(list, "Created ") || !strings.Contains(list, "starbtn") {
177 177 t.Fatalf("lijst:\n%s", list)
178 178 }
179 if strings.Contains(list, `class="rowmenu"`) || strings.Contains(list, "group.menu") {
180 t.Fatalf("groepslijst heeft nog een submenu:\n%s", list)
181 }
182 if !strings.Contains(list, `data-copy="http://127.0.0.1:9/studio/beta"`) {
183 t.Fatalf("kopieerknop mist absolute URL:\n%s", list)
184 }
179 185 res, err = client.PostForm(ts.URL+"/studio/beta/-/star", url.Values{
180 186 "csrf": {csrfOf(t, list)}, "back": {"/groups/studio"},
181 187 })
@@ -183,7 +189,7 @@ func TestSlugAvailabilityDefaultRoleLogoAndLanguage(t *testing.T) {
183 189 t.Fatal(err)
184 190 }
185 191 starred := read(t, res)
186 if !strings.Contains(starred, "★ 1") {
192 if !strings.Contains(starred, `class="starcount">1<`) || !strings.Contains(starred, `aria-label="Remove star"`) {
187 193 t.Fatalf("ster:\n%s", starred)
188 194 }
189 195 res, err = client.Get(ts.URL + "/groups/studio?q=alp&dir=desc")
@@ -173,9 +173,15 @@ func TestSlugAvailabilityDefaultRoleLogoAndLanguage(t *testing.T) {
173 t.Fatal(err)
173 t.Fatal(err)
174 }
174 }
175 list := read(t, res)
175 list := read(t, res)
176 if !strings.Contains(list, "Activity") || !strings.Contains(list, "Created ") || !strings.Contains(list, "★") {
176 if !strings.Contains(list, "Activity") || !strings.Contains(list, "Created ") || !strings.Contains(list, "starbtn") {
177 t.Fatalf("lijst:\n%s", list)
177 t.Fatalf("lijst:\n%s", list)
178 }
178 }
179 if strings.Contains(list, `class="rowmenu"`) || strings.Contains(list, "group.menu") {
180 t.Fatalf("groepslijst heeft nog een submenu:\n%s", list)
181 }
182 if !strings.Contains(list, `data-copy="http://127.0.0.1:9/studio/beta"`) {
183 t.Fatalf("kopieerknop mist absolute URL:\n%s", list)
184 }
179 res, err = client.PostForm(ts.URL+"/studio/beta/-/star", url.Values{
185 res, err = client.PostForm(ts.URL+"/studio/beta/-/star", url.Values{
180 "csrf": {csrfOf(t, list)}, "back": {"/groups/studio"},
186 "csrf": {csrfOf(t, list)}, "back": {"/groups/studio"},
181 })
187 })
@@ -183,7 +189,7 @@ func TestSlugAvailabilityDefaultRoleLogoAndLanguage(t *testing.T) {
183 t.Fatal(err)
189 t.Fatal(err)
184 }
190 }
185 starred := read(t, res)
191 starred := read(t, res)
186 if !strings.Contains(starred, "★ 1") {
192 if !strings.Contains(starred, `class="starcount">1<`) || !strings.Contains(starred, `aria-label="Remove star"`) {
187 t.Fatalf("ster:\n%s", starred)
193 t.Fatalf("ster:\n%s", starred)
188 }
194 }
189 res, err = client.Get(ts.URL + "/groups/studio?q=alp&dir=desc")
195 res, err = client.Get(ts.URL + "/groups/studio?q=alp&dir=desc")
internal/server/marks_test.go +6 −0
@@ -102,6 +102,12 @@ func TestDashboardMarksAndCrumbs(t *testing.T) {
102 102 if !strings.Contains(overview, "<h1>Overview</h1>") || !strings.Contains(overview, `class="tile" src="/tim/demo/-/logo"`) {
103 103 t.Fatalf("repo-overzicht:\n%s", overview)
104 104 }
105 if !strings.Contains(overview, `class="btn ghost iconbtn starbtn"`) || !strings.Contains(overview, `class="starcount">0<`) {
106 t.Fatalf("overzicht mist sterknop:\n%s", overview)
107 }
108 if !strings.Contains(overview, `action="/tim/demo/-/star"`) || !strings.Contains(overview, `aria-label="Star"`) {
109 t.Fatalf("overzicht ster-formulier:\n%s", overview)
110 }
105 111
106 112 members := read(t, mustGet(t, tim, ts.URL+"/groups/blue-star?tab=members"))
107 113 if !strings.Contains(members, `src="https://auth.timfalken.com/avatar/tim"`) || !strings.Contains(members, ">tim</a>") {
@@ -102,6 +102,12 @@ func TestDashboardMarksAndCrumbs(t *testing.T) {
102 if !strings.Contains(overview, "<h1>Overview</h1>") || !strings.Contains(overview, `class="tile" src="/tim/demo/-/logo"`) {
102 if !strings.Contains(overview, "<h1>Overview</h1>") || !strings.Contains(overview, `class="tile" src="/tim/demo/-/logo"`) {
103 t.Fatalf("repo-overzicht:\n%s", overview)
103 t.Fatalf("repo-overzicht:\n%s", overview)
104 }
104 }
105 if !strings.Contains(overview, `class="btn ghost iconbtn starbtn"`) || !strings.Contains(overview, `class="starcount">0<`) {
106 t.Fatalf("overzicht mist sterknop:\n%s", overview)
107 }
108 if !strings.Contains(overview, `action="/tim/demo/-/star"`) || !strings.Contains(overview, `aria-label="Star"`) {
109 t.Fatalf("overzicht ster-formulier:\n%s", overview)
110 }
105
111
106 members := read(t, mustGet(t, tim, ts.URL+"/groups/blue-star?tab=members"))
112 members := read(t, mustGet(t, tim, ts.URL+"/groups/blue-star?tab=members"))
107 if !strings.Contains(members, `src="https://auth.timfalken.com/avatar/tim"`) || !strings.Contains(members, ">tim</a>") {
113 if !strings.Contains(members, `src="https://auth.timfalken.com/avatar/tim"`) || !strings.Contains(members, ">tim</a>") {
internal/server/media.go +29 −0
@@ -2,6 +2,7 @@ package server
2 2
3 3 import (
4 4 "bytes"
5 "context"
5 6 "encoding/json"
6 7 "io"
7 8 "net/http"
@@ -225,3 +226,31 @@ func (s *Server) logoRepo(w http.ResponseWriter, r *http.Request) (store.Repo, b
225 226 _, repo, _, ok := s.guard(w, r, access.RoleReadonly)
226 227 return repo, ok
227 228 }
229
230 func (s *Server) repoCards(ctx context.Context, uid int64, repos []store.Repo, lang i18n.Lang) []RepoCard {
231 if len(repos) == 0 {
232 return nil
233 }
234 ids := make([]int64, len(repos))
235 for i, repo := range repos {
236 ids[i] = repo.ID
237 }
238 counts, mine, _ := s.Store.StarInfo(ctx, uid, ids)
239 cards := make([]RepoCard, 0, len(repos))
240 for _, repo := range repos {
241 cards = append(cards, RepoCard{
242 Repo: repo, Stars: counts[repo.ID], Starred: mine[repo.ID],
243 URL: s.absURL("/" + repo.FullPath()),
244 When: i18n.FormatDate(lang, repo.CreatedAt), Pushed: pushedLabel(lang, repo),
245 })
246 }
247 return cards
248 }
249
250 func (s *Server) starState(ctx context.Context, uid, repoID int64) (int, bool) {
251 counts, mine, err := s.Store.StarInfo(ctx, uid, []int64{repoID})
252 if err != nil {
253 return 0, false
254 }
255 return counts[repoID], mine[repoID]
256 }
@@ -2,6 +2,7 @@ package server
2
2
3import (
3import (
4 "bytes"
4 "bytes"
5 "context"
5 "encoding/json"
6 "encoding/json"
6 "io"
7 "io"
7 "net/http"
8 "net/http"
@@ -225,3 +226,31 @@ func (s *Server) logoRepo(w http.ResponseWriter, r *http.Request) (store.Repo, b
225 _, repo, _, ok := s.guard(w, r, access.RoleReadonly)
226 _, repo, _, ok := s.guard(w, r, access.RoleReadonly)
226 return repo, ok
227 return repo, ok
227}
228}
229
230func (s *Server) repoCards(ctx context.Context, uid int64, repos []store.Repo, lang i18n.Lang) []RepoCard {
231 if len(repos) == 0 {
232 return nil
233 }
234 ids := make([]int64, len(repos))
235 for i, repo := range repos {
236 ids[i] = repo.ID
237 }
238 counts, mine, _ := s.Store.StarInfo(ctx, uid, ids)
239 cards := make([]RepoCard, 0, len(repos))
240 for _, repo := range repos {
241 cards = append(cards, RepoCard{
242 Repo: repo, Stars: counts[repo.ID], Starred: mine[repo.ID],
243 URL: s.absURL("/" + repo.FullPath()),
244 When: i18n.FormatDate(lang, repo.CreatedAt), Pushed: pushedLabel(lang, repo),
245 })
246 }
247 return cards
248}
249
250func (s *Server) starState(ctx context.Context, uid, repoID int64) (int, bool) {
251 counts, mine, err := s.Store.StarInfo(ctx, uid, []int64{repoID})
252 if err != nil {
253 return 0, false
254 }
255 return counts[repoID], mine[repoID]
256}
internal/server/people.go +1 −0
@@ -56,6 +56,7 @@ func (s *Server) profile(w http.ResponseWriter, r *http.Request) {
56 56 card.Heading = "h1"
57 57 v.Card = &card
58 58 v.Repos = repos
59 v.Cards = s.repoCards(r.Context(), viewer, repos, s.langOf(r))
59 60 v.Groups = groups
60 61 s.render(w, "profile", v)
61 62 }
@@ -56,6 +56,7 @@ func (s *Server) profile(w http.ResponseWriter, r *http.Request) {
56 card.Heading = "h1"
56 card.Heading = "h1"
57 v.Card = &card
57 v.Card = &card
58 v.Repos = repos
58 v.Repos = repos
59 v.Cards = s.repoCards(r.Context(), viewer, repos, s.langOf(r))
59 v.Groups = groups
60 v.Groups = groups
60 s.render(w, "profile", v)
61 s.render(w, "profile", v)
61}
62}
internal/server/profile_test.go +6 −0
@@ -138,11 +138,17 @@ func TestProfilePage(t *testing.T) {
138 138 `<strong>1</strong> <span>Repositories</span>`,
139 139 `<strong>1</strong> <span>Groups</span>`,
140 140 `<strong>1</strong> <span>Contributions</span>`,
141 `class="repoacts"`,
142 `data-copy="` + ts.URL + `/tim/zichtbaar"`,
143 `class="starbtn"`,
141 144 } {
142 145 if !strings.Contains(pub, want) {
143 146 t.Fatalf("openbaar profiel mist %q", want)
144 147 }
145 148 }
149 if strings.Contains(pub, `action="/tim/zichtbaar/-/star"`) {
150 t.Fatal("anonieme bezoeker krijgt een ster-formulier")
151 }
146 152 for _, ban := range []string{"geheim", "Geheim project", "kluis", "Kluis", "Edit profile", "plein/gedeeld"} {
147 153 if strings.Contains(pub, ban) {
148 154 t.Fatalf("openbaar profiel toont %q", ban)
@@ -138,11 +138,17 @@ func TestProfilePage(t *testing.T) {
138 `<strong>1</strong> <span>Repositories</span>`,
138 `<strong>1</strong> <span>Repositories</span>`,
139 `<strong>1</strong> <span>Groups</span>`,
139 `<strong>1</strong> <span>Groups</span>`,
140 `<strong>1</strong> <span>Contributions</span>`,
140 `<strong>1</strong> <span>Contributions</span>`,
141 `class="repoacts"`,
142 `data-copy="` + ts.URL + `/tim/zichtbaar"`,
143 `class="starbtn"`,
141 } {
144 } {
142 if !strings.Contains(pub, want) {
145 if !strings.Contains(pub, want) {
143 t.Fatalf("openbaar profiel mist %q", want)
146 t.Fatalf("openbaar profiel mist %q", want)
144 }
147 }
145 }
148 }
149 if strings.Contains(pub, `action="/tim/zichtbaar/-/star"`) {
150 t.Fatal("anonieme bezoeker krijgt een ster-formulier")
151 }
146 for _, ban := range []string{"geheim", "Geheim project", "kluis", "Kluis", "Edit profile", "plein/gedeeld"} {
152 for _, ban := range []string{"geheim", "Geheim project", "kluis", "Kluis", "Edit profile", "plein/gedeeld"} {
147 if strings.Contains(pub, ban) {
153 if strings.Contains(pub, ban) {
148 t.Fatalf("openbaar profiel toont %q", ban)
154 t.Fatalf("openbaar profiel toont %q", ban)
internal/server/repo_handlers.go +1 −0
@@ -88,6 +88,7 @@ func (s *Server) repoHome(w http.ResponseWriter, r *http.Request) {
88 88 uid = v.User.ID
89 89 v.ForkTargets = s.forkTargets(r.Context(), *v.User)
90 90 }
91 v.Stars, v.Starred = s.starState(r.Context(), uid, repo.ID)
91 92 v.Fork = s.forkInfo(r.Context(), uid, repo)
92 93 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID}, s.langOf(r))
93 94 s.render(w, "repo", v)
@@ -88,6 +88,7 @@ func (s *Server) repoHome(w http.ResponseWriter, r *http.Request) {
88 uid = v.User.ID
88 uid = v.User.ID
89 v.ForkTargets = s.forkTargets(r.Context(), *v.User)
89 v.ForkTargets = s.forkTargets(r.Context(), *v.User)
90 }
90 }
91 v.Stars, v.Starred = s.starState(r.Context(), uid, repo.ID)
91 v.Fork = s.forkInfo(r.Context(), uid, repo)
92 v.Fork = s.forkInfo(r.Context(), uid, repo)
92 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID}, s.langOf(r))
93 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID}, s.langOf(r))
93 s.render(w, "repo", v)
94 s.render(w, "repo", v)
internal/server/server.go +3 −0
@@ -742,6 +742,8 @@ type View struct {
742 742 DashRepoN int
743 743 DashGroupN int
744 744 Fork ForkInfo
745 Stars int
746 Starred bool
745 747 ForkTargets []ForkTarget
746 748 ForkList []store.Repo
747 749 UpstreamBranches []string
@@ -794,6 +796,7 @@ type RepoCard struct {
794 796 Repo store.Repo
795 797 Stars int
796 798 Starred bool
799 URL string
797 800 When string
798 801 Pushed string
799 802 }
@@ -742,6 +742,8 @@ type View struct {
742 DashRepoN int
742 DashRepoN int
743 DashGroupN int
743 DashGroupN int
744 Fork ForkInfo
744 Fork ForkInfo
745 Stars int
746 Starred bool
745 ForkTargets []ForkTarget
747 ForkTargets []ForkTarget
746 ForkList []store.Repo
748 ForkList []store.Repo
747 UpstreamBranches []string
749 UpstreamBranches []string
@@ -794,6 +796,7 @@ type RepoCard struct {
794 Repo store.Repo
796 Repo store.Repo
795 Stars int
797 Stars int
796 Starred bool
798 Starred bool
799 URL string
797 When string
800 When string
798 Pushed string
801 Pushed string
799}
802}
internal/server/settings_handlers.go +1 −11
@@ -657,18 +657,8 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
657 657 return a < b
658 658 })
659 659 }
660 ids := make([]int64, len(repos))
661 for i, repo := range repos {
662 ids[i] = repo.ID
663 }
664 counts, mine, _ := s.Store.StarInfo(r.Context(), uid, ids)
665 660 lang := s.langOf(r)
666 for _, repo := range repos {
667 v.Cards = append(v.Cards, RepoCard{
668 Repo: repo, Stars: counts[repo.ID], Starred: mine[repo.ID],
669 When: i18n.FormatDate(lang, repo.CreatedAt), Pushed: pushedLabel(lang, repo),
670 })
671 }
661 v.Cards = s.repoCards(r.Context(), uid, repos, lang)
672 662 v.Repos = repos
673 663 v.GroupRepoCount = len(all)
674 664 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), uid, repos), lang)
@@ -657,18 +657,8 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
657 return a < b
657 return a < b
658 })
658 })
659 }
659 }
660 ids := make([]int64, len(repos))
661 for i, repo := range repos {
662 ids[i] = repo.ID
663 }
664 counts, mine, _ := s.Store.StarInfo(r.Context(), uid, ids)
665 lang := s.langOf(r)
660 lang := s.langOf(r)
666 for _, repo := range repos {
661 v.Cards = s.repoCards(r.Context(), uid, repos, lang)
667 v.Cards = append(v.Cards, RepoCard{
668 Repo: repo, Stars: counts[repo.ID], Starred: mine[repo.ID],
669 When: i18n.FormatDate(lang, repo.CreatedAt), Pushed: pushedLabel(lang, repo),
670 })
671 }
672 v.Repos = repos
662 v.Repos = repos
673 v.GroupRepoCount = len(all)
663 v.GroupRepoCount = len(all)
674 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), uid, repos), lang)
664 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), uid, repos), lang)
internal/server/star_copy_test.go added +101 −0
@@ -0,0 +1,101 @@
1 package server
2
3 import (
4 "net/http"
5 "net/http/cookiejar"
6 "net/http/httptest"
7 "net/url"
8 "os/exec"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16 )
17
18 func TestStarAndCopyButtons(t *testing.T) {
19 if _, err := exec.LookPath("git"); err != nil {
20 t.Skip("git ontbreekt")
21 }
22 storage := t.TempDir()
23 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24 if err != nil {
25 t.Fatal(err)
26 }
27 t.Cleanup(func() { _ = st.Close() })
28 cfg := config.Config{
29 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
30 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
31 Git: config.Git{Binary: "git", DefaultBranch: "master"},
32 }
33 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
34 ts := httptest.NewServer(srv.Handler())
35 t.Cleanup(ts.Close)
36 jar, _ := cookiejar.New(nil)
37 tim := &http.Client{Jar: jar}
38 page := read(t, mustGet(t, tim, ts.URL+"/login"))
39 page = read(t, mustPost(t, tim, ts.URL+"/new/group", url.Values{
40 "csrf": {csrfOf(t, page)}, "name": {"Studio"},
41 }))
42 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
43 "csrf": {csrfOf(t, page)}, "name": {"app"}, "group": {"studio"}, "visibility": {"public"},
44 }))
45 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
46 "csrf": {csrfOf(t, page)}, "name": {"eigen"}, "group": {""}, "visibility": {"public"},
47 }))
48
49 group := read(t, mustGet(t, tim, ts.URL+"/groups/studio"))
50 if strings.Contains(group, `class="rowmenu"`) {
51 t.Fatalf("groepspagina heeft nog een submenu:\n%s", group)
52 }
53 if !strings.Contains(group, `class="repoacts"`) || !strings.Contains(group, `class="iconbtn copybtn"`) {
54 t.Fatalf("groepspagina mist icoonknoppen:\n%s", group)
55 }
56 if !strings.Contains(group, `data-copy="http://127.0.0.1:9/studio/app"`) {
57 t.Fatalf("groepspagina kopieert geen absolute project-URL:\n%s", group)
58 }
59 if !strings.Contains(group, `action="/studio/app/-/star"`) || !strings.Contains(group, `aria-label="Star"`) {
60 t.Fatalf("groepspagina sterknop:\n%s", group)
61 }
62
63 profile := read(t, mustGet(t, tim, ts.URL+"/users/tim"))
64 if strings.Contains(profile, `class="rowmenu"`) {
65 t.Fatalf("gebruikerspagina heeft een submenu:\n%s", profile)
66 }
67 if !strings.Contains(profile, `data-copy="http://127.0.0.1:9/tim/eigen"`) || !strings.Contains(profile, `action="/tim/eigen/-/star"`) {
68 t.Fatalf("gebruikerspagina knoppen:\n%s", profile)
69 }
70
71 overview := read(t, mustGet(t, tim, ts.URL+"/tim/eigen"))
72 if !strings.Contains(overview, `class="btn ghost iconbtn starbtn"`) || !strings.Contains(overview, `class="starcount">0<`) {
73 t.Fatalf("overzicht sterknop:\n%s", overview)
74 }
75
76 starred := read(t, mustPost(t, tim, ts.URL+"/tim/eigen/-/star", url.Values{
77 "csrf": {csrfOf(t, overview)}, "back": {"/users/tim"},
78 }))
79 if !strings.Contains(starred, "starbtn starred") || !strings.Contains(starred, `class="starcount">1<`) || !strings.Contains(starred, `aria-label="Remove star"`) {
80 t.Fatalf("ster na toggle op profiel:\n%s", starred)
81 }
82 home := read(t, mustGet(t, tim, ts.URL+"/tim/eigen"))
83 if !strings.Contains(home, "starbtn starred") || !strings.Contains(home, `class="starcount">1<`) {
84 t.Fatalf("overzicht na ster:\n%s", home)
85 }
86
87 anon := read(t, mustGet(t, &http.Client{}, ts.URL+"/tim/eigen"))
88 if !strings.Contains(anon, "starbtn") || !strings.Contains(anon, `class="starcount">1<`) {
89 t.Fatalf("anonieme overzicht mist ster-aantal:\n%s", anon)
90 }
91 if strings.Contains(anon, `action="/tim/eigen/-/star"`) {
92 t.Fatal("anonieme bezoeker krijgt een ster-formulier")
93 }
94 anonProf := read(t, mustGet(t, &http.Client{}, ts.URL+"/users/tim"))
95 if !strings.Contains(anonProf, `data-copy="http://127.0.0.1:9/tim/eigen"`) {
96 t.Fatalf("anonieme kopieerknop ontbreekt:\n%s", anonProf)
97 }
98 if strings.Contains(anonProf, `action="/tim/eigen/-/star"`) {
99 t.Fatal("anonieme bezoeker krijgt een ster-formulier op het profiel")
100 }
101 }
@@ -0,0 +1,101 @@
1package server
2
3import (
4 "net/http"
5 "net/http/cookiejar"
6 "net/http/httptest"
7 "net/url"
8 "os/exec"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18func TestStarAndCopyButtons(t *testing.T) {
19 if _, err := exec.LookPath("git"); err != nil {
20 t.Skip("git ontbreekt")
21 }
22 storage := t.TempDir()
23 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24 if err != nil {
25 t.Fatal(err)
26 }
27 t.Cleanup(func() { _ = st.Close() })
28 cfg := config.Config{
29 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
30 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
31 Git: config.Git{Binary: "git", DefaultBranch: "master"},
32 }
33 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
34 ts := httptest.NewServer(srv.Handler())
35 t.Cleanup(ts.Close)
36 jar, _ := cookiejar.New(nil)
37 tim := &http.Client{Jar: jar}
38 page := read(t, mustGet(t, tim, ts.URL+"/login"))
39 page = read(t, mustPost(t, tim, ts.URL+"/new/group", url.Values{
40 "csrf": {csrfOf(t, page)}, "name": {"Studio"},
41 }))
42 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
43 "csrf": {csrfOf(t, page)}, "name": {"app"}, "group": {"studio"}, "visibility": {"public"},
44 }))
45 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
46 "csrf": {csrfOf(t, page)}, "name": {"eigen"}, "group": {""}, "visibility": {"public"},
47 }))
48
49 group := read(t, mustGet(t, tim, ts.URL+"/groups/studio"))
50 if strings.Contains(group, `class="rowmenu"`) {
51 t.Fatalf("groepspagina heeft nog een submenu:\n%s", group)
52 }
53 if !strings.Contains(group, `class="repoacts"`) || !strings.Contains(group, `class="iconbtn copybtn"`) {
54 t.Fatalf("groepspagina mist icoonknoppen:\n%s", group)
55 }
56 if !strings.Contains(group, `data-copy="http://127.0.0.1:9/studio/app"`) {
57 t.Fatalf("groepspagina kopieert geen absolute project-URL:\n%s", group)
58 }
59 if !strings.Contains(group, `action="/studio/app/-/star"`) || !strings.Contains(group, `aria-label="Star"`) {
60 t.Fatalf("groepspagina sterknop:\n%s", group)
61 }
62
63 profile := read(t, mustGet(t, tim, ts.URL+"/users/tim"))
64 if strings.Contains(profile, `class="rowmenu"`) {
65 t.Fatalf("gebruikerspagina heeft een submenu:\n%s", profile)
66 }
67 if !strings.Contains(profile, `data-copy="http://127.0.0.1:9/tim/eigen"`) || !strings.Contains(profile, `action="/tim/eigen/-/star"`) {
68 t.Fatalf("gebruikerspagina knoppen:\n%s", profile)
69 }
70
71 overview := read(t, mustGet(t, tim, ts.URL+"/tim/eigen"))
72 if !strings.Contains(overview, `class="btn ghost iconbtn starbtn"`) || !strings.Contains(overview, `class="starcount">0<`) {
73 t.Fatalf("overzicht sterknop:\n%s", overview)
74 }
75
76 starred := read(t, mustPost(t, tim, ts.URL+"/tim/eigen/-/star", url.Values{
77 "csrf": {csrfOf(t, overview)}, "back": {"/users/tim"},
78 }))
79 if !strings.Contains(starred, "starbtn starred") || !strings.Contains(starred, `class="starcount">1<`) || !strings.Contains(starred, `aria-label="Remove star"`) {
80 t.Fatalf("ster na toggle op profiel:\n%s", starred)
81 }
82 home := read(t, mustGet(t, tim, ts.URL+"/tim/eigen"))
83 if !strings.Contains(home, "starbtn starred") || !strings.Contains(home, `class="starcount">1<`) {
84 t.Fatalf("overzicht na ster:\n%s", home)
85 }
86
87 anon := read(t, mustGet(t, &http.Client{}, ts.URL+"/tim/eigen"))
88 if !strings.Contains(anon, "starbtn") || !strings.Contains(anon, `class="starcount">1<`) {
89 t.Fatalf("anonieme overzicht mist ster-aantal:\n%s", anon)
90 }
91 if strings.Contains(anon, `action="/tim/eigen/-/star"`) {
92 t.Fatal("anonieme bezoeker krijgt een ster-formulier")
93 }
94 anonProf := read(t, mustGet(t, &http.Client{}, ts.URL+"/users/tim"))
95 if !strings.Contains(anonProf, `data-copy="http://127.0.0.1:9/tim/eigen"`) {
96 t.Fatalf("anonieme kopieerknop ontbreekt:\n%s", anonProf)
97 }
98 if strings.Contains(anonProf, `action="/tim/eigen/-/star"`) {
99 t.Fatal("anonieme bezoeker krijgt een ster-formulier op het profiel")
100 }
101}
internal/server/static/float.js +16 −1
@@ -294,8 +294,23 @@
294 294 return;
295 295 }
296 296 shown = true;
297 var copied = document.body.getAttribute("data-copied") || "Copied";
298 var hasIcon = btn.querySelector("svg");
299 if (hasIcon) {
300 var prevLabel = btn.getAttribute("aria-label");
301 var prevTitle = btn.getAttribute("title");
302 btn.classList.add("copied");
303 btn.setAttribute("aria-label", copied);
304 btn.setAttribute("title", copied);
305 setTimeout(function () {
306 btn.classList.remove("copied");
307 if (prevLabel) { btn.setAttribute("aria-label", prevLabel); } else { btn.removeAttribute("aria-label"); }
308 if (prevTitle) { btn.setAttribute("title", prevTitle); } else { btn.removeAttribute("title"); }
309 }, 2500);
310 return;
311 }
297 312 var old = btn.textContent;
298 btn.textContent = document.body.getAttribute("data-copied") || "Copied";
313 btn.textContent = copied;
299 314 setTimeout(function () { btn.textContent = old; }, 2500);
300 315 }
301 316 if (copyNow(value)) {
@@ -294,8 +294,23 @@
294 return;
294 return;
295 }
295 }
296 shown = true;
296 shown = true;
297 var copied = document.body.getAttribute("data-copied") || "Copied";
298 var hasIcon = btn.querySelector("svg");
299 if (hasIcon) {
300 var prevLabel = btn.getAttribute("aria-label");
301 var prevTitle = btn.getAttribute("title");
302 btn.classList.add("copied");
303 btn.setAttribute("aria-label", copied);
304 btn.setAttribute("title", copied);
305 setTimeout(function () {
306 btn.classList.remove("copied");
307 if (prevLabel) { btn.setAttribute("aria-label", prevLabel); } else { btn.removeAttribute("aria-label"); }
308 if (prevTitle) { btn.setAttribute("title", prevTitle); } else { btn.removeAttribute("title"); }
309 }, 2500);
310 return;
311 }
297 var old = btn.textContent;
312 var old = btn.textContent;
298 btn.textContent = document.body.getAttribute("data-copied") || "Copied";
313 btn.textContent = copied;
299 setTimeout(function () { btn.textContent = old; }, 2500);
314 setTimeout(function () { btn.textContent = old; }, 2500);
300 }
315 }
301 if (copyNow(value)) {
316 if (copyNow(value)) {
internal/server/static/style.css +21 −0
@@ -1853,3 +1853,24 @@ form.cancelform { display: inline; }
1853 1853 }
1854 1854 .commitgraph-slot.is-hidden { display: none !important; }
1855 1855
1856 .repoacts { display: inline-flex; align-items: center; gap: 0.35rem; flex: none; }
1857 .repoacts .starform, .pageacts .starform { margin: 0; display: inline-flex; }
1858 .repoacts .iconbtn, .pageacts .starbtn.iconbtn {
1859 min-height: 24px; min-width: 24px; width: auto; padding: 0 0.35rem;
1860 background: var(--card); color: var(--ink);
1861 }
1862 .pageacts .starbtn.btn { min-width: auto; }
1863 .starbtn.starred { color: #9a6700; }
1864 .starbtn .ico-star-on { display: none; }
1865 .starbtn.starred .ico-star-off { display: none; }
1866 .starbtn.starred .ico-star-on { display: block; }
1867 .iconbtn .ico-check { display: none; }
1868 .iconbtn.copied .ico-copy { display: none; }
1869 .iconbtn.copied .ico-check { display: block; }
1870 .starcount { font-size: var(--fs-sm); font-variant-numeric: tabular-nums; }
1871 span.starbtn {
1872 display: inline-flex; align-items: center; gap: var(--sp-1);
1873 color: var(--muted); min-height: 24px; padding: 0 0.35rem;
1874 }
1875 span.starbtn.btn { border: 1px solid var(--line); border-radius: var(--radius); color: var(--ink); }
1876 span.starbtn.starred { color: #9a6700; }
@@ -1853,3 +1853,24 @@ form.cancelform { display: inline; }
1853}
1853}
1854.commitgraph-slot.is-hidden { display: none !important; }
1854.commitgraph-slot.is-hidden { display: none !important; }
1855
1855
1856.repoacts { display: inline-flex; align-items: center; gap: 0.35rem; flex: none; }
1857.repoacts .starform, .pageacts .starform { margin: 0; display: inline-flex; }
1858.repoacts .iconbtn, .pageacts .starbtn.iconbtn {
1859 min-height: 24px; min-width: 24px; width: auto; padding: 0 0.35rem;
1860 background: var(--card); color: var(--ink);
1861}
1862.pageacts .starbtn.btn { min-width: auto; }
1863.starbtn.starred { color: #9a6700; }
1864.starbtn .ico-star-on { display: none; }
1865.starbtn.starred .ico-star-off { display: none; }
1866.starbtn.starred .ico-star-on { display: block; }
1867.iconbtn .ico-check { display: none; }
1868.iconbtn.copied .ico-copy { display: none; }
1869.iconbtn.copied .ico-check { display: block; }
1870.starcount { font-size: var(--fs-sm); font-variant-numeric: tabular-nums; }
1871span.starbtn {
1872 display: inline-flex; align-items: center; gap: var(--sp-1);
1873 color: var(--muted); min-height: 24px; padding: 0 0.35rem;
1874}
1875span.starbtn.btn { border: 1px solid var(--line); border-radius: var(--radius); color: var(--ink); }
1876span.starbtn.starred { color: #9a6700; }
internal/server/templates/collab.html +1 −14
@@ -1041,21 +1041,8 @@
1041 1041 {{template "namemark" .Repo}}
1042 1042 <a class="reponame" href="/{{.Repo.FullPath}}">{{.Repo.Name}}</a>
1043 1043 {{template "visicon" .Repo.Visibility}}
1044 <span class="stars" aria-label="{{t "group.star"}}">★ {{.Stars}}</span>
1045 1044 <span class="muted grown"><span data-tip="{{t "repo.sortPushedTip"}}">{{.Pushed}}</span> · {{t "group.created" .When}}</span>
1046 <details class="rowmenu">
1047 <summary aria-label="{{t "group.menu"}}">⋯</summary>
1048 <div class="menu-panel">
1049 {{if $.User}}
1050 <form method="post" action="/{{.Repo.FullPath}}/-/star">
1051 <input type="hidden" name="csrf" value="{{$.CSRF}}">
1052 <input type="hidden" name="back" value="/groups/{{$.Group.Path}}?q={{$.Query}}&amp;dir={{$.SortDir}}">
1053 <button type="submit">{{if .Starred}}{{t "group.unstar"}}{{else}}{{t "group.star"}}{{end}}</button>
1054 </form>
1055 {{end}}
1056 <button type="button" data-copy="{{.Repo.FullPath}}">{{t "action.copy"}}</button>
1057 </div>
1058 </details>
1045 {{template "starcopy" (dict "User" $.User "CSRF" $.CSRF "Path" .Repo.FullPath "Back" (printf "/groups/%s?q=%s&dir=%s" $.Group.Path $.Query $.SortDir) "Starred" .Starred "Stars" .Stars "Count" true "URL" .URL)}}
1059 1046 </li>
1060 1047 {{else}}<li class="muted">{{t "group.empty"}}</li>{{end}}
1061 1048 </ul>
@@ -1041,21 +1041,8 @@
1041 {{template "namemark" .Repo}}
1041 {{template "namemark" .Repo}}
1042 <a class="reponame" href="/{{.Repo.FullPath}}">{{.Repo.Name}}</a>
1042 <a class="reponame" href="/{{.Repo.FullPath}}">{{.Repo.Name}}</a>
1043 {{template "visicon" .Repo.Visibility}}
1043 {{template "visicon" .Repo.Visibility}}
1044 <span class="stars" aria-label="{{t "group.star"}}">★ {{.Stars}}</span>
1045 <span class="muted grown"><span data-tip="{{t "repo.sortPushedTip"}}">{{.Pushed}}</span> · {{t "group.created" .When}}</span>
1044 <span class="muted grown"><span data-tip="{{t "repo.sortPushedTip"}}">{{.Pushed}}</span> · {{t "group.created" .When}}</span>
1046 <details class="rowmenu">
1045 {{template "starcopy" (dict "User" $.User "CSRF" $.CSRF "Path" .Repo.FullPath "Back" (printf "/groups/%s?q=%s&dir=%s" $.Group.Path $.Query $.SortDir) "Starred" .Starred "Stars" .Stars "Count" true "URL" .URL)}}
1047 <summary aria-label="{{t "group.menu"}}">⋯</summary>
1048 <div class="menu-panel">
1049 {{if $.User}}
1050 <form method="post" action="/{{.Repo.FullPath}}/-/star">
1051 <input type="hidden" name="csrf" value="{{$.CSRF}}">
1052 <input type="hidden" name="back" value="/groups/{{$.Group.Path}}?q={{$.Query}}&amp;dir={{$.SortDir}}">
1053 <button type="submit">{{if .Starred}}{{t "group.unstar"}}{{else}}{{t "group.star"}}{{end}}</button>
1054 </form>
1055 {{end}}
1056 <button type="button" data-copy="{{.Repo.FullPath}}">{{t "action.copy"}}</button>
1057 </div>
1058 </details>
1059 </li>
1046 </li>
1060 {{else}}<li class="muted">{{t "group.empty"}}</li>{{end}}
1047 {{else}}<li class="muted">{{t "group.empty"}}</li>{{end}}
1061</ul>
1048</ul>
internal/server/templates/layout.html +39 −0
@@ -177,3 +177,42 @@
177 177 </nav>
178 178 </aside>
179 179 {{end}}
180
181 {{define "staricon"}}
182 <svg class="ico ico-star-off" viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.75.75 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694z"/></svg>
183 <svg class="ico ico-star-on" viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.75.75 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25z"/></svg>
184 {{end}}
185
186 {{define "starbtn"}}
187 {{/* User, CSRF, Path, Back, Starred, Stars, Count, Large */}}
188 {{$label := t "group.star"}}{{if .Starred}}{{$label = t "group.unstar"}}{{end}}
189 {{if .User}}
190 <form method="post" action="/{{.Path}}/-/star" class="starform">
191 <input type="hidden" name="csrf" value="{{.CSRF}}">
192 <input type="hidden" name="back" value="{{.Back}}">
193 <button type="submit" class="{{if .Large}}btn ghost {{end}}iconbtn starbtn{{if .Starred}} starred{{end}}" title="{{$label}}" aria-label="{{$label}}" aria-pressed="{{if .Starred}}true{{else}}false{{end}}">
194 {{template "staricon" .}}
195 {{if .Count}}<span class="starcount">{{.Stars}}</span>{{end}}
196 </button>
197 </form>
198 {{else}}
199 <span class="starbtn{{if .Starred}} starred{{end}}{{if .Large}} btn ghost{{end}}" title="{{t "group.star"}}" aria-label="{{t "group.star"}}">
200 {{template "staricon" .}}
201 {{if .Count}}<span class="starcount">{{.Stars}}</span>{{end}}
202 </span>
203 {{end}}
204 {{end}}
205
206 {{define "copybtn"}}
207 <button type="button" class="iconbtn copybtn" data-copy="{{.URL}}" title="{{t "action.copy"}}" aria-label="{{t "action.copy"}}">
208 <svg class="ico ico-copy" viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M5.5 1A1.5 1.5 0 0 0 4 2.5V10a1.5 1.5 0 0 0 1.5 1.5h6A1.5 1.5 0 0 0 13 10V2.5A1.5 1.5 0 0 0 11.5 1h-6zM2 5.5A1.5 1.5 0 0 1 3.5 4H4v6.5A2.5 2.5 0 0 0 6.5 13H11v.5A1.5 1.5 0 0 1 9.5 15h-6A1.5 1.5 0 0 1 2 13.5v-8z"/></svg>
209 <svg class="ico ico-check" viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.75.75 0 0 1 1.06-1.06L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0z"/></svg>
210 </button>
211 {{end}}
212
213 {{define "starcopy"}}
214 <span class="repoacts">
215 {{template "starbtn" .}}
216 {{template "copybtn" .}}
217 </span>
218 {{end}}
@@ -177,3 +177,42 @@
177 </nav>
177 </nav>
178</aside>
178</aside>
179{{end}}
179{{end}}
180
181{{define "staricon"}}
182<svg class="ico ico-star-off" viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.75.75 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694z"/></svg>
183<svg class="ico ico-star-on" viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.75.75 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25z"/></svg>
184{{end}}
185
186{{define "starbtn"}}
187{{/* User, CSRF, Path, Back, Starred, Stars, Count, Large */}}
188{{$label := t "group.star"}}{{if .Starred}}{{$label = t "group.unstar"}}{{end}}
189{{if .User}}
190<form method="post" action="/{{.Path}}/-/star" class="starform">
191 <input type="hidden" name="csrf" value="{{.CSRF}}">
192 <input type="hidden" name="back" value="{{.Back}}">
193 <button type="submit" class="{{if .Large}}btn ghost {{end}}iconbtn starbtn{{if .Starred}} starred{{end}}" title="{{$label}}" aria-label="{{$label}}" aria-pressed="{{if .Starred}}true{{else}}false{{end}}">
194 {{template "staricon" .}}
195 {{if .Count}}<span class="starcount">{{.Stars}}</span>{{end}}
196 </button>
197</form>
198{{else}}
199<span class="starbtn{{if .Starred}} starred{{end}}{{if .Large}} btn ghost{{end}}" title="{{t "group.star"}}" aria-label="{{t "group.star"}}">
200 {{template "staricon" .}}
201 {{if .Count}}<span class="starcount">{{.Stars}}</span>{{end}}
202</span>
203{{end}}
204{{end}}
205
206{{define "copybtn"}}
207<button type="button" class="iconbtn copybtn" data-copy="{{.URL}}" title="{{t "action.copy"}}" aria-label="{{t "action.copy"}}">
208 <svg class="ico ico-copy" viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M5.5 1A1.5 1.5 0 0 0 4 2.5V10a1.5 1.5 0 0 0 1.5 1.5h6A1.5 1.5 0 0 0 13 10V2.5A1.5 1.5 0 0 0 11.5 1h-6zM2 5.5A1.5 1.5 0 0 1 3.5 4H4v6.5A2.5 2.5 0 0 0 6.5 13H11v.5A1.5 1.5 0 0 1 9.5 15h-6A1.5 1.5 0 0 1 2 13.5v-8z"/></svg>
209 <svg class="ico ico-check" viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.75.75 0 0 1 1.06-1.06L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0z"/></svg>
210</button>
211{{end}}
212
213{{define "starcopy"}}
214<span class="repoacts">
215 {{template "starbtn" .}}
216 {{template "copybtn" .}}
217</span>
218{{end}}
internal/server/templates/pages.html +7 −5
@@ -148,12 +148,13 @@
148 148 <section>
149 149 <h2><span data-tip="{{t "repo.sortPushedTip"}}">{{t "dash.repos"}}</span></h2>
150 150 <ul class="repolist">
151 {{range .Repos}}
151 {{range .Cards}}
152 152 <li>
153 {{template "namemark" .}}
154 <a class="reponame" href="/{{.FullPath}}" title="{{pushedLabel .}}">{{.Name}}</a>
155 {{template "visicon" .Visibility}}
156 <span class="muted grown">{{.Description}}</span>
153 {{template "namemark" .Repo}}
154 <a class="reponame" href="/{{.Repo.FullPath}}" title="{{pushedLabel .Repo}}">{{.Repo.Name}}</a>
155 {{template "visicon" .Repo.Visibility}}
156 <span class="muted grown">{{.Repo.Description}}</span>
157 {{template "starcopy" (dict "User" $.User "CSRF" $.CSRF "Path" .Repo.FullPath "Back" (printf "/users/%s" $.Profile.Username) "Starred" .Starred "Stars" .Stars "Count" true "URL" .URL)}}
157 158 </li>
158 159 {{else}}<li class="muted">{{t "dash.noRepos"}}</li>{{end}}
159 160 </ul>
@@ -516,6 +517,7 @@
516 517 <header class="pagehead">
517 518 <h1>{{t "tab.overview"}}</h1>
518 519 <div class="pageacts">
520 {{if not .ReleaseOnly}}{{template "starbtn" (dict "User" .User "CSRF" .CSRF "Path" .Repo.FullPath "Back" (printf "/%s" .Repo.FullPath) "Starred" .Starred "Stars" .Stars "Count" true "Large" true)}}{{end}}
519 521 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&amp;focus=1">{{t "repo.searchFile"}}</a>
520 522 {{if and .User .ForkTargets (not .ReleaseOnly)}}<button type="button" class="btn ghost" data-fork-open data-tip="{{t "fork.tip"}}">{{t "fork.button"}}{{if .Fork.Forks}} <span class="count">{{.Fork.Forks}}</span>{{end}}</button>{{end}}
521 523 </div>
@@ -148,12 +148,13 @@
148 <section>
148 <section>
149 <h2><span data-tip="{{t "repo.sortPushedTip"}}">{{t "dash.repos"}}</span></h2>
149 <h2><span data-tip="{{t "repo.sortPushedTip"}}">{{t "dash.repos"}}</span></h2>
150 <ul class="repolist">
150 <ul class="repolist">
151 {{range .Repos}}
151 {{range .Cards}}
152 <li>
152 <li>
153 {{template "namemark" .}}
153 {{template "namemark" .Repo}}
154 <a class="reponame" href="/{{.FullPath}}" title="{{pushedLabel .}}">{{.Name}}</a>
154 <a class="reponame" href="/{{.Repo.FullPath}}" title="{{pushedLabel .Repo}}">{{.Repo.Name}}</a>
155 {{template "visicon" .Visibility}}
155 {{template "visicon" .Repo.Visibility}}
156 <span class="muted grown">{{.Description}}</span>
156 <span class="muted grown">{{.Repo.Description}}</span>
157 {{template "starcopy" (dict "User" $.User "CSRF" $.CSRF "Path" .Repo.FullPath "Back" (printf "/users/%s" $.Profile.Username) "Starred" .Starred "Stars" .Stars "Count" true "URL" .URL)}}
157 </li>
158 </li>
158 {{else}}<li class="muted">{{t "dash.noRepos"}}</li>{{end}}
159 {{else}}<li class="muted">{{t "dash.noRepos"}}</li>{{end}}
159 </ul>
160 </ul>
@@ -516,6 +517,7 @@
516<header class="pagehead">
517<header class="pagehead">
517 <h1>{{t "tab.overview"}}</h1>
518 <h1>{{t "tab.overview"}}</h1>
518 <div class="pageacts">
519 <div class="pageacts">
520 {{if not .ReleaseOnly}}{{template "starbtn" (dict "User" .User "CSRF" .CSRF "Path" .Repo.FullPath "Back" (printf "/%s" .Repo.FullPath) "Starred" .Starred "Stars" .Stars "Count" true "Large" true)}}{{end}}
519 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&amp;focus=1">{{t "repo.searchFile"}}</a>
521 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&amp;focus=1">{{t "repo.searchFile"}}</a>
520 {{if and .User .ForkTargets (not .ReleaseOnly)}}<button type="button" class="btn ghost" data-fork-open data-tip="{{t "fork.tip"}}">{{t "fork.button"}}{{if .Fork.Forks}} <span class="count">{{.Fork.Forks}}</span>{{end}}</button>{{end}}
522 {{if and .User .ForkTargets (not .ReleaseOnly)}}<button type="button" class="btn ghost" data-fork-open data-tip="{{t "fork.tip"}}">{{t "fork.button"}}{{if .Fork.Forks}} <span class="count">{{.Fork.Forks}}</span>{{end}}</button>{{end}}
521 </div>
523 </div>