BlueGit

timfa bluegit

Merge branch 'cursor/dashboard-iconen-674d' into 'stage'

timfa

Authored 2026-10-23 · 3 weeks ago

Hash
634c29693641889d746042375d83634e5d9be9cb
Pipeline
Passed
10 files changed +223 −37
internal/server/issues.go +6 −5
@@ -48,9 +48,10 @@ type IssueBoard struct {
48 48
49 49 // IssueChoice is een label of persoon in een formulier.
50 50 type IssueChoice struct {
51 Name string
52 Color string
53 On bool
51 Name string
52 Color string
53 AvatarURL string
54 On bool
54 55 }
55 56
56 57 // IssueRow is één issue in een lijst of op de detailpagina.
@@ -445,7 +446,7 @@ func (s *Server) issueBoard(r *http.Request, repo store.Repo, role access.Role,
445 446 b.Labels = append(b.Labels, IssueChoice{Name: l.Name, Color: l.Color})
446 447 }
447 448 for _, p := range s.issueCandidates(r.Context(), repo) {
448 b.People = append(b.People, IssueChoice{Name: p.Username})
449 b.People = append(b.People, IssueChoice{Name: p.Username, AvatarURL: p.AvatarURL})
449 450 }
450 451 return b
451 452 }
@@ -510,7 +511,7 @@ func (s *Server) issueCandidates(ctx context.Context, repo store.Repo) []store.M
510 511 }
511 512 if repo.OwnerKind == "user" {
512 513 if u, err := s.Store.UserByID(ctx, repo.OwnerID); err == nil {
513 seen[u.Username] = store.Member{UserID: u.ID, Username: u.Username, Role: access.RoleMaintainer}
514 seen[u.Username] = store.Member{UserID: u.ID, Username: u.Username, AvatarURL: u.AvatarURL, Role: access.RoleMaintainer}
514 515 }
515 516 }
516 517 if members, err := s.Store.ListMembers(ctx, "repo", repo.ID); err == nil {
@@ -48,9 +48,10 @@ type IssueBoard struct {
48
48
49// IssueChoice is een label of persoon in een formulier.
49// IssueChoice is een label of persoon in een formulier.
50type IssueChoice struct {
50type IssueChoice struct {
51 Name string
51 Name string
52 Color string
52 Color string
53 On bool
53 AvatarURL string
54 On bool
54}
55}
55
56
56// IssueRow is één issue in een lijst of op de detailpagina.
57// IssueRow is één issue in een lijst of op de detailpagina.
@@ -445,7 +446,7 @@ func (s *Server) issueBoard(r *http.Request, repo store.Repo, role access.Role,
445 b.Labels = append(b.Labels, IssueChoice{Name: l.Name, Color: l.Color})
446 b.Labels = append(b.Labels, IssueChoice{Name: l.Name, Color: l.Color})
446 }
447 }
447 for _, p := range s.issueCandidates(r.Context(), repo) {
448 for _, p := range s.issueCandidates(r.Context(), repo) {
448 b.People = append(b.People, IssueChoice{Name: p.Username})
449 b.People = append(b.People, IssueChoice{Name: p.Username, AvatarURL: p.AvatarURL})
449 }
450 }
450 return b
451 return b
451}
452}
@@ -510,7 +511,7 @@ func (s *Server) issueCandidates(ctx context.Context, repo store.Repo) []store.M
510 }
511 }
511 if repo.OwnerKind == "user" {
512 if repo.OwnerKind == "user" {
512 if u, err := s.Store.UserByID(ctx, repo.OwnerID); err == nil {
513 if u, err := s.Store.UserByID(ctx, repo.OwnerID); err == nil {
513 seen[u.Username] = store.Member{UserID: u.ID, Username: u.Username, Role: access.RoleMaintainer}
514 seen[u.Username] = store.Member{UserID: u.ID, Username: u.Username, AvatarURL: u.AvatarURL, Role: access.RoleMaintainer}
514 }
515 }
515 }
516 }
516 if members, err := s.Store.ListMembers(ctx, "repo", repo.ID); err == nil {
517 if members, err := s.Store.ListMembers(ctx, "repo", repo.ID); err == nil {
internal/server/marks_test.go added +121 −0
@@ -0,0 +1,121 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/store"
17 )
18
19 func TestTileHueIsStable(t *testing.T) {
20 if tileHue("BlueGit") != tileHue("bluegit") {
21 t.Fatal("hoofdletters horen dezelfde kleur te geven")
22 }
23 if tileHue("BlueGit") == tileHue("Storage") {
24 t.Fatal("twee verschillende namen horen uit elkaar te lopen")
25 }
26 for _, name := range []string{"", "a", "Blue Star", "timfa/bluegit"} {
27 hue := tileHue(name)
28 if len(hue) != 4 || hue[0:3] != "hue" || hue[3] < '0' || hue[3] > '7' {
29 t.Fatalf("kleur %q voor %q", hue, name)
30 }
31 }
32 }
33
34 func TestDashboardMarksAndCrumbs(t *testing.T) {
35 if _, err := exec.LookPath("git"); err != nil {
36 t.Skip("git ontbreekt")
37 }
38 storage := t.TempDir()
39 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
40 if err != nil {
41 t.Fatal(err)
42 }
43 t.Cleanup(func() { _ = st.Close() })
44 cfg := config.Config{
45 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
46 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
47 Git: config.Git{Binary: "git", DefaultBranch: "master"},
48 }
49 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
50 ts := httptest.NewServer(srv.Handler())
51 t.Cleanup(ts.Close)
52 jar, _ := cookiejar.New(nil)
53 tim := &http.Client{Jar: jar}
54 page := read(t, mustGet(t, tim, ts.URL+"/login"))
55 if _, err := st.UpsertUser(context.Background(), 1, "tim", "https://auth.timfalken.com/avatar/tim", false); err != nil {
56 t.Fatal(err)
57 }
58 page = read(t, mustPost(t, tim, ts.URL+"/new/group", url.Values{
59 "csrf": {csrfOf(t, page)}, "name": {"Blue Star"}, "description": {"sterren"},
60 }))
61 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
62 "csrf": {csrfOf(t, page)}, "name": {"demo"}, "description": {"eerste"}, "visibility": {"public"}, "group": {""},
63 }))
64 repo, err := st.RepoByPath(context.Background(), "tim", "demo")
65 if err != nil {
66 t.Fatal(err)
67 }
68 if err := st.SetLogoMIME(context.Background(), "repo", repo.ID, "image/png"); err != nil {
69 t.Fatal(err)
70 }
71
72 dash := read(t, mustGet(t, tim, ts.URL+"/"))
73 if strings.Contains(dash, `<p class="crumbs"`) {
74 t.Fatalf("dashboard herhaalt de titel in een broodkruimel:\n%s", dash)
75 }
76 if !strings.Contains(dash, "<h1>Overview</h1>") {
77 t.Fatal("dashboard mist de kop")
78 }
79 for _, want := range []string{
80 `class="tile" src="/tim/demo/-/logo"`,
81 `class="tile ` + tileHue("Blue Star") + `"`,
82 `href="/groups/blue-star"`,
83 ">B<",
84 } {
85 if !strings.Contains(dash, want) {
86 t.Fatalf("dashboard mist %q\n%s", want, dash)
87 }
88 }
89
90 account := read(t, mustGet(t, tim, ts.URL+"/settings"))
91 if !strings.Contains(account, `<p class="crumbs"><a href="/">Overview</a></p>`) || !strings.Contains(account, "<h1>Account</h1>") {
92 t.Fatalf("account-kruimel:\n%s", account)
93 }
94 if strings.Contains(account, `<p class="crumbs"><span>Overview</span>`) || strings.Contains(account, "<h1>Overview</h1>") {
95 t.Fatal("account herhaalt Overview als titel")
96 }
97
98 overview := read(t, mustGet(t, tim, ts.URL+"/tim/demo"))
99 if !strings.Contains(overview, `<p class="crumbs">`) || !strings.Contains(overview, `href="/users/tim"`) || !strings.Contains(overview, ">demo</a>") {
100 t.Fatalf("repo-kruimel hoort owner/naam te blijven:\n%s", overview)
101 }
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)
104 }
105
106 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>") {
108 t.Fatalf("groepsleden:\n%s", members)
109 }
110 repoMembers := read(t, mustPost(t, tim, ts.URL+"/tim/demo/-/members", url.Values{
111 "csrf": {csrfOf(t, read(t, mustGet(t, tim, ts.URL+"/tim/demo/-/settings?tab=members")))}, "username": {"tim"}, "role": {"developer"},
112 }))
113 if !strings.Contains(repoMembers, `src="https://auth.timfalken.com/avatar/tim"`) {
114 t.Fatalf("repoleden:\n%s", repoMembers)
115 }
116
117 fresh := read(t, mustGet(t, tim, ts.URL+"/new"))
118 if !strings.Contains(fresh, `name="group"`) || !strings.Contains(fresh, `value="blue-star"`) || !strings.Contains(fresh, `class="tile `+tileHue("Blue Star")+`"`) {
119 t.Fatalf("kiezer:\n%s", fresh)
120 }
121 }
@@ -0,0 +1,121 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/store"
17)
18
19func TestTileHueIsStable(t *testing.T) {
20 if tileHue("BlueGit") != tileHue("bluegit") {
21 t.Fatal("hoofdletters horen dezelfde kleur te geven")
22 }
23 if tileHue("BlueGit") == tileHue("Storage") {
24 t.Fatal("twee verschillende namen horen uit elkaar te lopen")
25 }
26 for _, name := range []string{"", "a", "Blue Star", "timfa/bluegit"} {
27 hue := tileHue(name)
28 if len(hue) != 4 || hue[0:3] != "hue" || hue[3] < '0' || hue[3] > '7' {
29 t.Fatalf("kleur %q voor %q", hue, name)
30 }
31 }
32}
33
34func TestDashboardMarksAndCrumbs(t *testing.T) {
35 if _, err := exec.LookPath("git"); err != nil {
36 t.Skip("git ontbreekt")
37 }
38 storage := t.TempDir()
39 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
40 if err != nil {
41 t.Fatal(err)
42 }
43 t.Cleanup(func() { _ = st.Close() })
44 cfg := config.Config{
45 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
46 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
47 Git: config.Git{Binary: "git", DefaultBranch: "master"},
48 }
49 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
50 ts := httptest.NewServer(srv.Handler())
51 t.Cleanup(ts.Close)
52 jar, _ := cookiejar.New(nil)
53 tim := &http.Client{Jar: jar}
54 page := read(t, mustGet(t, tim, ts.URL+"/login"))
55 if _, err := st.UpsertUser(context.Background(), 1, "tim", "https://auth.timfalken.com/avatar/tim", false); err != nil {
56 t.Fatal(err)
57 }
58 page = read(t, mustPost(t, tim, ts.URL+"/new/group", url.Values{
59 "csrf": {csrfOf(t, page)}, "name": {"Blue Star"}, "description": {"sterren"},
60 }))
61 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
62 "csrf": {csrfOf(t, page)}, "name": {"demo"}, "description": {"eerste"}, "visibility": {"public"}, "group": {""},
63 }))
64 repo, err := st.RepoByPath(context.Background(), "tim", "demo")
65 if err != nil {
66 t.Fatal(err)
67 }
68 if err := st.SetLogoMIME(context.Background(), "repo", repo.ID, "image/png"); err != nil {
69 t.Fatal(err)
70 }
71
72 dash := read(t, mustGet(t, tim, ts.URL+"/"))
73 if strings.Contains(dash, `<p class="crumbs"`) {
74 t.Fatalf("dashboard herhaalt de titel in een broodkruimel:\n%s", dash)
75 }
76 if !strings.Contains(dash, "<h1>Overview</h1>") {
77 t.Fatal("dashboard mist de kop")
78 }
79 for _, want := range []string{
80 `class="tile" src="/tim/demo/-/logo"`,
81 `class="tile ` + tileHue("Blue Star") + `"`,
82 `href="/groups/blue-star"`,
83 ">B<",
84 } {
85 if !strings.Contains(dash, want) {
86 t.Fatalf("dashboard mist %q\n%s", want, dash)
87 }
88 }
89
90 account := read(t, mustGet(t, tim, ts.URL+"/settings"))
91 if !strings.Contains(account, `<p class="crumbs"><a href="/">Overview</a></p>`) || !strings.Contains(account, "<h1>Account</h1>") {
92 t.Fatalf("account-kruimel:\n%s", account)
93 }
94 if strings.Contains(account, `<p class="crumbs"><span>Overview</span>`) || strings.Contains(account, "<h1>Overview</h1>") {
95 t.Fatal("account herhaalt Overview als titel")
96 }
97
98 overview := read(t, mustGet(t, tim, ts.URL+"/tim/demo"))
99 if !strings.Contains(overview, `<p class="crumbs">`) || !strings.Contains(overview, `href="/users/tim"`) || !strings.Contains(overview, ">demo</a>") {
100 t.Fatalf("repo-kruimel hoort owner/naam te blijven:\n%s", overview)
101 }
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)
104 }
105
106 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>") {
108 t.Fatalf("groepsleden:\n%s", members)
109 }
110 repoMembers := read(t, mustPost(t, tim, ts.URL+"/tim/demo/-/members", url.Values{
111 "csrf": {csrfOf(t, read(t, mustGet(t, tim, ts.URL+"/tim/demo/-/settings?tab=members")))}, "username": {"tim"}, "role": {"developer"},
112 }))
113 if !strings.Contains(repoMembers, `src="https://auth.timfalken.com/avatar/tim"`) {
114 t.Fatalf("repoleden:\n%s", repoMembers)
115 }
116
117 fresh := read(t, mustGet(t, tim, ts.URL+"/new"))
118 if !strings.Contains(fresh, `name="group"`) || !strings.Contains(fresh, `value="blue-star"`) || !strings.Contains(fresh, `class="tile `+tileHue("Blue Star")+`"`) {
119 t.Fatalf("kiezer:\n%s", fresh)
120 }
121}
internal/server/people.go +13 −0
@@ -177,6 +177,19 @@ func (s *Server) userForEmail(ctx context.Context, email string, cache map[strin
177 177 return u, true
178 178 }
179 179
180 // tileHue kiest een vaste kleurklasse bij een naam, zodat dezelfde
181 // repo of groep steeds hetzelfde vierkantje krijgt.
182 func tileHue(name string) string {
183 n := 0
184 for _, r := range strings.ToLower(strings.TrimSpace(name)) {
185 n = n*33 + int(r)
186 }
187 if n < 0 {
188 n = -n
189 }
190 return "hue" + string(rune('0'+(n%8)))
191 }
192
180 193 func initialOf(s string) string {
181 194 s = strings.TrimSpace(s)
182 195 if s == "" {
@@ -177,6 +177,19 @@ func (s *Server) userForEmail(ctx context.Context, email string, cache map[strin
177 return u, true
177 return u, true
178}
178}
179
179
180// tileHue kiest een vaste kleurklasse bij een naam, zodat dezelfde
181// repo of groep steeds hetzelfde vierkantje krijgt.
182func tileHue(name string) string {
183 n := 0
184 for _, r := range strings.ToLower(strings.TrimSpace(name)) {
185 n = n*33 + int(r)
186 }
187 if n < 0 {
188 n = -n
189 }
190 return "hue" + string(rune('0'+(n%8)))
191}
192
180func initialOf(s string) string {
193func initialOf(s string) string {
181 s = strings.TrimSpace(s)
194 s = strings.TrimSpace(s)
182 if s == "" {
195 if s == "" {
internal/server/server.go +1 −0
@@ -258,6 +258,7 @@ func (s *Server) mustTemplates() {
258 258 r, _ := utf8.DecodeRuneInString(s)
259 259 return strings.ToUpper(string(r))
260 260 },
261 "tileHue": tileHue,
261 262 "splitPath": func(p string) []string {
262 263 if p == "" {
263 264 return nil
@@ -258,6 +258,7 @@ func (s *Server) mustTemplates() {
258 r, _ := utf8.DecodeRuneInString(s)
258 r, _ := utf8.DecodeRuneInString(s)
259 return strings.ToUpper(string(r))
259 return strings.ToUpper(string(r))
260 },
260 },
261 "tileHue": tileHue,
261 "splitPath": func(p string) []string {
262 "splitPath": func(p string) []string {
262 if p == "" {
263 if p == "" {
263 return nil
264 return nil
internal/server/static/style.css +20 −2
@@ -183,8 +183,18 @@ td, th { text-align: left; padding: var(--sp-2) var(--sp-3); border-bottom: 1px
183 183 .projhead h1 { margin: 0; font-size: var(--fs-h); }
184 184 .tile {
185 185 width: 42px; height: 42px; border-radius: 8px; display: grid; place-items: center;
186 background: #e56a93; color: white; font-weight: 700; font-size: 1.2rem;
187 }
186 background: #e56a93; color: white; font-weight: 700; font-size: 1.2rem; flex: none;
187 }
188 .tile.hue0, .avatar.hue0 { background: #c0392b; }
189 .tile.hue1, .avatar.hue1 { background: #d35400; }
190 .tile.hue2, .avatar.hue2 { background: #1f6b3a; }
191 .tile.hue3, .avatar.hue3 { background: #1f6feb; }
192 .tile.hue4, .avatar.hue4 { background: #6f42c1; }
193 .tile.hue5, .avatar.hue5 { background: #0e7490; }
194 .tile.hue6, .avatar.hue6 { background: #9a3412; }
195 .tile.hue7, .avatar.hue7 { background: #9d174d; }
196 .avatar.hue0, .avatar.hue1, .avatar.hue2, .avatar.hue3,
197 .avatar.hue4, .avatar.hue5, .avatar.hue6, .avatar.hue7 { color: #fff; }
188 198 .vis { width: 18px; height: 18px; color: var(--muted); }
189 199 .ficon { width: 16px; height: 16px; vertical-align: -2px; margin-right: 0.25rem; }
190 200 .proj { display: grid; grid-template-columns: minmax(0, 1fr) 260px; gap: 1.2rem; align-items: start; }
@@ -475,6 +485,14 @@ table.code td.src { white-space: pre; }
475 485 }
476 486 .repolist { list-style: none; padding: 0; margin: .4rem 0 1rem; }
477 487 .repolist > li { display: flex; align-items: center; gap: .7rem; padding: .75rem .2rem; border-bottom: 1px solid var(--line); }
488 .repolist .tile, .repolist .avatar { width: 32px; height: 32px; font-size: .9rem; }
489 .repolist form { margin: 0; }
490 .picklist { border: 1px solid var(--line); border-radius: 10px; margin: .35rem 0 .8rem; padding: .35rem; }
491 .picklist legend { padding: 0 .25rem; color: var(--muted); font-size: var(--fs-sm); }
492 .picklist label, label.pickrow { display: flex; align-items: center; gap: .55rem; padding: .35rem .45rem; border-radius: 8px; cursor: pointer; }
493 .picklist label:has(input:checked) { background: #eef4ff; }
494 .picklist input, label.pickrow input { margin: 0; }
495 .picklist .tile, .picklist .avatar, label.pickrow .avatar { width: 24px; height: 24px; font-size: .75rem; }
478 496 .reponame { font-weight: 600; text-decoration: none; }
479 497 .stars { color: #9a6700; white-space: nowrap; }
480 498 .grown { flex: 1; }
@@ -183,8 +183,18 @@ td, th { text-align: left; padding: var(--sp-2) var(--sp-3); border-bottom: 1px
183.projhead h1 { margin: 0; font-size: var(--fs-h); }
183.projhead h1 { margin: 0; font-size: var(--fs-h); }
184.tile {
184.tile {
185 width: 42px; height: 42px; border-radius: 8px; display: grid; place-items: center;
185 width: 42px; height: 42px; border-radius: 8px; display: grid; place-items: center;
186 background: #e56a93; color: white; font-weight: 700; font-size: 1.2rem;
186 background: #e56a93; color: white; font-weight: 700; font-size: 1.2rem; flex: none;
187}
187}
188.tile.hue0, .avatar.hue0 { background: #c0392b; }
189.tile.hue1, .avatar.hue1 { background: #d35400; }
190.tile.hue2, .avatar.hue2 { background: #1f6b3a; }
191.tile.hue3, .avatar.hue3 { background: #1f6feb; }
192.tile.hue4, .avatar.hue4 { background: #6f42c1; }
193.tile.hue5, .avatar.hue5 { background: #0e7490; }
194.tile.hue6, .avatar.hue6 { background: #9a3412; }
195.tile.hue7, .avatar.hue7 { background: #9d174d; }
196.avatar.hue0, .avatar.hue1, .avatar.hue2, .avatar.hue3,
197.avatar.hue4, .avatar.hue5, .avatar.hue6, .avatar.hue7 { color: #fff; }
188.vis { width: 18px; height: 18px; color: var(--muted); }
198.vis { width: 18px; height: 18px; color: var(--muted); }
189.ficon { width: 16px; height: 16px; vertical-align: -2px; margin-right: 0.25rem; }
199.ficon { width: 16px; height: 16px; vertical-align: -2px; margin-right: 0.25rem; }
190.proj { display: grid; grid-template-columns: minmax(0, 1fr) 260px; gap: 1.2rem; align-items: start; }
200.proj { display: grid; grid-template-columns: minmax(0, 1fr) 260px; gap: 1.2rem; align-items: start; }
@@ -475,6 +485,14 @@ table.code td.src { white-space: pre; }
475}
485}
476.repolist { list-style: none; padding: 0; margin: .4rem 0 1rem; }
486.repolist { list-style: none; padding: 0; margin: .4rem 0 1rem; }
477.repolist > li { display: flex; align-items: center; gap: .7rem; padding: .75rem .2rem; border-bottom: 1px solid var(--line); }
487.repolist > li { display: flex; align-items: center; gap: .7rem; padding: .75rem .2rem; border-bottom: 1px solid var(--line); }
488.repolist .tile, .repolist .avatar { width: 32px; height: 32px; font-size: .9rem; }
489.repolist form { margin: 0; }
490.picklist { border: 1px solid var(--line); border-radius: 10px; margin: .35rem 0 .8rem; padding: .35rem; }
491.picklist legend { padding: 0 .25rem; color: var(--muted); font-size: var(--fs-sm); }
492.picklist label, label.pickrow { display: flex; align-items: center; gap: .55rem; padding: .35rem .45rem; border-radius: 8px; cursor: pointer; }
493.picklist label:has(input:checked) { background: #eef4ff; }
494.picklist input, label.pickrow input { margin: 0; }
495.picklist .tile, .picklist .avatar, label.pickrow .avatar { width: 24px; height: 24px; font-size: .75rem; }
478.reponame { font-weight: 600; text-decoration: none; }
496.reponame { font-weight: 600; text-decoration: none; }
479.stars { color: #9a6700; white-space: nowrap; }
497.stars { color: #9a6700; white-space: nowrap; }
480.grown { flex: 1; }
498.grown { flex: 1; }
internal/server/templates/collab.html +4 −4
@@ -604,8 +604,8 @@
604 604 <button type="submit">{{t "action.save"}}</button>
605 605 </div>
606 606 </form>
607 <ul class="clean">
608 {{range .Members}}<li>{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
607 <ul class="repolist">
608 {{range .Members}}<li>{{template "usermark" .}}<span class="grown">{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} <span class="muted">· {{roleName .Role}}</span> {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}</span>
609 609 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
610 610 </li>{{end}}
611 611 </ul>
@@ -860,7 +860,7 @@
860 860 </div>
861 861 </form>
862 862 {{end}}
863 <ul class="clean">{{range .Members}}<li>{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} · {{roleName .Role}} {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
863 <ul class="repolist">{{range .Members}}<li>{{template "usermark" .}}<span class="grown">{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} <span class="muted">· {{roleName .Role}}</span> {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}</span>
864 864 {{if and $.CanAdmin (not .Pending) (ne .UserID $.Group.OwnerID)}}<form method="post" action="/groups/{{$.Group.Path}}/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
865 865 </li>{{end}}</ul>
866 866 {{else if eq .Tab "settings"}}
@@ -931,7 +931,7 @@
931 931 <ul class="repolist">
932 932 {{range .Cards}}
933 933 <li>
934 {{if .Repo.HasLogo}}<img class="tile" src="/{{.Repo.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Repo.Name}}</span>{{end}}
934 {{template "namemark" .Repo}}
935 935 <a class="reponame" href="/{{.Repo.FullPath}}">{{.Repo.Name}}</a>
936 936 {{template "visicon" .Repo.Visibility}}
937 937 <span class="stars" aria-label="{{t "group.star"}}">★ {{.Stars}}</span>
@@ -604,8 +604,8 @@
604 <button type="submit">{{t "action.save"}}</button>
604 <button type="submit">{{t "action.save"}}</button>
605 </div>
605 </div>
606</form>
606</form>
607<ul class="clean">
607<ul class="repolist">
608 {{range .Members}}<li>{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
608 {{range .Members}}<li>{{template "usermark" .}}<span class="grown">{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} <span class="muted">· {{roleName .Role}}</span> {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}</span>
609 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
609 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
610 </li>{{end}}
610 </li>{{end}}
611</ul>
611</ul>
@@ -860,7 +860,7 @@
860 </div>
860 </div>
861</form>
861</form>
862{{end}}
862{{end}}
863<ul class="clean">{{range .Members}}<li>{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} · {{roleName .Role}} {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
863<ul class="repolist">{{range .Members}}<li>{{template "usermark" .}}<span class="grown">{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} <span class="muted">· {{roleName .Role}}</span> {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}</span>
864 {{if and $.CanAdmin (not .Pending) (ne .UserID $.Group.OwnerID)}}<form method="post" action="/groups/{{$.Group.Path}}/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
864 {{if and $.CanAdmin (not .Pending) (ne .UserID $.Group.OwnerID)}}<form method="post" action="/groups/{{$.Group.Path}}/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
865</li>{{end}}</ul>
865</li>{{end}}</ul>
866{{else if eq .Tab "settings"}}
866{{else if eq .Tab "settings"}}
@@ -931,7 +931,7 @@
931<ul class="repolist">
931<ul class="repolist">
932 {{range .Cards}}
932 {{range .Cards}}
933 <li>
933 <li>
934 {{if .Repo.HasLogo}}<img class="tile" src="/{{.Repo.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Repo.Name}}</span>{{end}}
934 {{template "namemark" .Repo}}
935 <a class="reponame" href="/{{.Repo.FullPath}}">{{.Repo.Name}}</a>
935 <a class="reponame" href="/{{.Repo.FullPath}}">{{.Repo.Name}}</a>
936 {{template "visicon" .Repo.Visibility}}
936 {{template "visicon" .Repo.Visibility}}
937 <span class="stars" aria-label="{{t "group.star"}}">★ {{.Stars}}</span>
937 <span class="stars" aria-label="{{t "group.star"}}">★ {{.Stars}}</span>
internal/server/templates/issues.html +1 −1
@@ -63,7 +63,7 @@
63 63 </fieldset>
64 64 <fieldset class="checks">
65 65 <legend>{{t "issue.assignees"}}</legend>
66 {{range .Issues.People}}<label><input type="checkbox" name="assignee" value="{{.Name}}"{{if .On}} checked{{end}}> {{.Name}}</label>{{end}}
66 {{range .Issues.People}}<label class="pickrow"><input type="checkbox" name="assignee" value="{{.Name}}"{{if .On}} checked{{end}}> {{if .AvatarURL}}<img class="avatar" src="{{.AvatarURL}}" alt="">{{else}}<span class="avatar {{tileHue .Name}}">{{initial .Name}}</span>{{end}} {{.Name}}</label>{{end}}
67 67 </fieldset>
68 68 <label>{{t "issue.milestone"}}
69 69 <select name="milestone">
@@ -63,7 +63,7 @@
63</fieldset>
63</fieldset>
64<fieldset class="checks">
64<fieldset class="checks">
65 <legend>{{t "issue.assignees"}}</legend>
65 <legend>{{t "issue.assignees"}}</legend>
66 {{range .Issues.People}}<label><input type="checkbox" name="assignee" value="{{.Name}}"{{if .On}} checked{{end}}> {{.Name}}</label>{{end}}
66 {{range .Issues.People}}<label class="pickrow"><input type="checkbox" name="assignee" value="{{.Name}}"{{if .On}} checked{{end}}> {{if .AvatarURL}}<img class="avatar" src="{{.AvatarURL}}" alt="">{{else}}<span class="avatar {{tileHue .Name}}">{{initial .Name}}</span>{{end}} {{.Name}}</label>{{end}}
67</fieldset>
67</fieldset>
68<label>{{t "issue.milestone"}}
68<label>{{t "issue.milestone"}}
69 <select name="milestone">
69 <select name="milestone">
internal/server/templates/layout.html +12 −4
@@ -55,8 +55,8 @@
55 55 <p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Group.Name}}</span></p>
56 56 {{else if .Profile}}
57 57 <p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Profile.Username}}</span></p>
58 {{else if .User}}
59 <p class="crumbs"><span>{{t "nav.dashboard"}}</span></p>
58 {{else if and .User (ne .Page "dashboard")}}
59 <p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a></p>
60 60 {{end}}
61 61 {{end}}
62 62
@@ -73,7 +73,7 @@
73 73 {{define "reposide"}}
74 74 <aside class="sidenav">
75 75 <a class="sidecontext" href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">
76 {{if .Repo.HasLogo}}<img class="tile" src="/{{.Repo.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Repo.Name}}</span>{{end}}
76 {{template "namemark" .Repo}}
77 77 <span class="sidename">{{.Repo.Name}}</span>
78 78 {{template "visicon" .Repo.Visibility}}
79 79 </a>
@@ -95,7 +95,7 @@
95 95 {{define "groupside"}}
96 96 <aside class="sidenav">
97 97 <a class="sidecontext" href="/groups/{{.Group.Path}}">
98 {{if .Group.HasLogo}}<img class="tile" src="/groups/{{.Group.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Group.Name}}</span>{{end}}
98 {{template "namemark" .Group}}
99 99 <span class="sidename">{{.Group.Name}}</span>
100 100 {{template "visicon" .Group.Visibility}}
101 101 </a>
@@ -120,6 +120,14 @@
120 120 </aside>
121 121 {{end}}
122 122
123 {{define "namemark"}}
124 {{if .LogoURL}}<img class="tile" src="{{.LogoURL}}" alt="">{{else}}<span class="tile {{tileHue .Name}}">{{initial .Name}}</span>{{end}}
125 {{end}}
126
127 {{define "usermark"}}
128 {{if .AvatarURL}}<img class="avatar" src="{{.AvatarURL}}" alt="">{{else}}<span class="avatar {{tileHue .Username}}">{{initial .Username}}</span>{{end}}
129 {{end}}
130
123 131 {{define "dashside"}}
124 132 <aside class="sidenav">
125 133 <a class="sidecontext" href="/users/{{.User.Username}}">
@@ -55,8 +55,8 @@
55<p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Group.Name}}</span></p>
55<p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Group.Name}}</span></p>
56{{else if .Profile}}
56{{else if .Profile}}
57<p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Profile.Username}}</span></p>
57<p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Profile.Username}}</span></p>
58{{else if .User}}
58{{else if and .User (ne .Page "dashboard")}}
59<p class="crumbs"><span>{{t "nav.dashboard"}}</span></p>
59<p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a></p>
60{{end}}
60{{end}}
61{{end}}
61{{end}}
62
62
@@ -73,7 +73,7 @@
73{{define "reposide"}}
73{{define "reposide"}}
74<aside class="sidenav">
74<aside class="sidenav">
75 <a class="sidecontext" href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">
75 <a class="sidecontext" href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">
76 {{if .Repo.HasLogo}}<img class="tile" src="/{{.Repo.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Repo.Name}}</span>{{end}}
76 {{template "namemark" .Repo}}
77 <span class="sidename">{{.Repo.Name}}</span>
77 <span class="sidename">{{.Repo.Name}}</span>
78 {{template "visicon" .Repo.Visibility}}
78 {{template "visicon" .Repo.Visibility}}
79 </a>
79 </a>
@@ -95,7 +95,7 @@
95{{define "groupside"}}
95{{define "groupside"}}
96<aside class="sidenav">
96<aside class="sidenav">
97 <a class="sidecontext" href="/groups/{{.Group.Path}}">
97 <a class="sidecontext" href="/groups/{{.Group.Path}}">
98 {{if .Group.HasLogo}}<img class="tile" src="/groups/{{.Group.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Group.Name}}</span>{{end}}
98 {{template "namemark" .Group}}
99 <span class="sidename">{{.Group.Name}}</span>
99 <span class="sidename">{{.Group.Name}}</span>
100 {{template "visicon" .Group.Visibility}}
100 {{template "visicon" .Group.Visibility}}
101 </a>
101 </a>
@@ -120,6 +120,14 @@
120</aside>
120</aside>
121{{end}}
121{{end}}
122
122
123{{define "namemark"}}
124{{if .LogoURL}}<img class="tile" src="{{.LogoURL}}" alt="">{{else}}<span class="tile {{tileHue .Name}}">{{initial .Name}}</span>{{end}}
125{{end}}
126
127{{define "usermark"}}
128{{if .AvatarURL}}<img class="avatar" src="{{.AvatarURL}}" alt="">{{else}}<span class="avatar {{tileHue .Username}}">{{initial .Username}}</span>{{end}}
129{{end}}
130
123{{define "dashside"}}
131{{define "dashside"}}
124<aside class="sidenav">
132<aside class="sidenav">
125 <a class="sidecontext" href="/users/{{.User.Username}}">
133 <a class="sidecontext" href="/users/{{.User.Username}}">
internal/server/templates/pages.html +21 −14
@@ -33,8 +33,8 @@
33 33 {{if .Repos}}
34 34 <section class="panel">
35 35 <h2>{{t "home.public"}}</h2>
36 <ul class="clean">
37 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="muted">{{.Description}}</span></li>{{end}}
36 <ul class="repolist">
37 {{range .Repos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}">{{.FullPath}}</a>{{if .Description}} <span class="muted">{{.Description}}</span>{{end}}</div></li>{{end}}
38 38 </ul>
39 39 </section>
40 40 {{end}}
@@ -54,15 +54,15 @@
54 54 <section class="panel">
55 55 <h2>{{t "dash.repos"}}</h2>
56 56 {{if not .Repos}}<p class="muted">{{t "dash.noRepos"}}</p>{{end}}
57 <ul class="clean">
58 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span>{{if .Description}}<div class="muted">{{.Description}}</div>{{end}}</li>{{end}}
57 <ul class="repolist">
58 {{range .Repos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span>{{if .Description}}<div class="muted">{{.Description}}</div>{{end}}</div></li>{{end}}
59 59 </ul>
60 60 </section>
61 61 <section class="panel">
62 62 <h2>{{t "dash.groups"}}</h2>
63 63 {{if not .Groups}}<p class="muted">{{t "dash.noGroups"}}</p>{{end}}
64 <ul class="clean">
65 {{range .Groups}}<li><a href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></li>{{end}}
64 <ul class="repolist">
65 {{range .Groups}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></div></li>{{end}}
66 66 </ul>
67 67 </section>
68 68 </div>
@@ -79,7 +79,7 @@
79 79 <ul class="repolist">
80 80 {{range .Repos}}
81 81 <li>
82 {{if .HasLogo}}<img class="tile" src="/{{.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
82 {{template "namemark" .}}
83 83 <a class="reponame" href="/{{.FullPath}}">{{.Name}}</a>
84 84 {{template "visicon" .Visibility}}
85 85 <span class="muted grown">{{.Description}}</span>
@@ -92,7 +92,7 @@
92 92 <ul class="repolist">
93 93 {{range .Groups}}
94 94 <li>
95 {{if .HasLogo}}<img class="tile" src="/groups/{{.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
95 {{template "namemark" .}}
96 96 <a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a>
97 97 {{template "visicon" .Visibility}}
98 98 <span class="muted grown">{{.Path}}</span>
@@ -168,12 +168,19 @@
168 168 <label>{{t "new.name"}} <input name="name" required autocomplete="off"></label>
169 169 <p class="preview"><span data-slug-text></span> <span data-slug-flag></span></p>
170 170 <label>{{t "new.description"}} <input name="description"></label>
171 <label>{{t "new.owner"}}
172 <select name="group">
173 <option value="">{{t "new.me"}}</option>
174 {{range .Groups}}<option value="{{.Path}}">{{.Name}}</option>{{end}}
175 </select>
176 </label>
171 <fieldset class="picklist">
172 <legend>{{t "new.owner"}}</legend>
173 <label>
174 <input type="radio" name="group" value="" checked>
175 {{if .User.AvatarURL}}<img class="avatar" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar {{tileHue .User.Username}}">{{initial .User.Username}}</span>{{end}}
176 <span>{{t "new.me"}}</span>
177 </label>
178 {{range .Groups}}<label>
179 <input type="radio" name="group" value="{{.Path}}">
180 {{template "namemark" .}}
181 <span>{{.Name}}</span>
182 </label>{{end}}
183 </fieldset>
177 184 <label>{{t "new.visibility"}}
178 185 <select name="visibility"><option value="private">{{t "vis.private"}}</option><option value="public">{{t "vis.public"}}</option></select>
179 186 </label>
@@ -33,8 +33,8 @@
33{{if .Repos}}
33{{if .Repos}}
34<section class="panel">
34<section class="panel">
35 <h2>{{t "home.public"}}</h2>
35 <h2>{{t "home.public"}}</h2>
36 <ul class="clean">
36 <ul class="repolist">
37 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="muted">{{.Description}}</span></li>{{end}}
37 {{range .Repos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}">{{.FullPath}}</a>{{if .Description}} <span class="muted">{{.Description}}</span>{{end}}</div></li>{{end}}
38 </ul>
38 </ul>
39</section>
39</section>
40{{end}}
40{{end}}
@@ -54,15 +54,15 @@
54 <section class="panel">
54 <section class="panel">
55 <h2>{{t "dash.repos"}}</h2>
55 <h2>{{t "dash.repos"}}</h2>
56 {{if not .Repos}}<p class="muted">{{t "dash.noRepos"}}</p>{{end}}
56 {{if not .Repos}}<p class="muted">{{t "dash.noRepos"}}</p>{{end}}
57 <ul class="clean">
57 <ul class="repolist">
58 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span>{{if .Description}}<div class="muted">{{.Description}}</div>{{end}}</li>{{end}}
58 {{range .Repos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span>{{if .Description}}<div class="muted">{{.Description}}</div>{{end}}</div></li>{{end}}
59 </ul>
59 </ul>
60 </section>
60 </section>
61 <section class="panel">
61 <section class="panel">
62 <h2>{{t "dash.groups"}}</h2>
62 <h2>{{t "dash.groups"}}</h2>
63 {{if not .Groups}}<p class="muted">{{t "dash.noGroups"}}</p>{{end}}
63 {{if not .Groups}}<p class="muted">{{t "dash.noGroups"}}</p>{{end}}
64 <ul class="clean">
64 <ul class="repolist">
65 {{range .Groups}}<li><a href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></li>{{end}}
65 {{range .Groups}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></div></li>{{end}}
66 </ul>
66 </ul>
67 </section>
67 </section>
68</div>
68</div>
@@ -79,7 +79,7 @@
79 <ul class="repolist">
79 <ul class="repolist">
80 {{range .Repos}}
80 {{range .Repos}}
81 <li>
81 <li>
82 {{if .HasLogo}}<img class="tile" src="/{{.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
82 {{template "namemark" .}}
83 <a class="reponame" href="/{{.FullPath}}">{{.Name}}</a>
83 <a class="reponame" href="/{{.FullPath}}">{{.Name}}</a>
84 {{template "visicon" .Visibility}}
84 {{template "visicon" .Visibility}}
85 <span class="muted grown">{{.Description}}</span>
85 <span class="muted grown">{{.Description}}</span>
@@ -92,7 +92,7 @@
92 <ul class="repolist">
92 <ul class="repolist">
93 {{range .Groups}}
93 {{range .Groups}}
94 <li>
94 <li>
95 {{if .HasLogo}}<img class="tile" src="/groups/{{.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
95 {{template "namemark" .}}
96 <a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a>
96 <a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a>
97 {{template "visicon" .Visibility}}
97 {{template "visicon" .Visibility}}
98 <span class="muted grown">{{.Path}}</span>
98 <span class="muted grown">{{.Path}}</span>
@@ -168,12 +168,19 @@
168 <label>{{t "new.name"}} <input name="name" required autocomplete="off"></label>
168 <label>{{t "new.name"}} <input name="name" required autocomplete="off"></label>
169 <p class="preview"><span data-slug-text></span> <span data-slug-flag></span></p>
169 <p class="preview"><span data-slug-text></span> <span data-slug-flag></span></p>
170 <label>{{t "new.description"}} <input name="description"></label>
170 <label>{{t "new.description"}} <input name="description"></label>
171 <label>{{t "new.owner"}}
171 <fieldset class="picklist">
172 <select name="group">
172 <legend>{{t "new.owner"}}</legend>
173 <option value="">{{t "new.me"}}</option>
173 <label>
174 {{range .Groups}}<option value="{{.Path}}">{{.Name}}</option>{{end}}
174 <input type="radio" name="group" value="" checked>
175 </select>
175 {{if .User.AvatarURL}}<img class="avatar" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar {{tileHue .User.Username}}">{{initial .User.Username}}</span>{{end}}
176 </label>
176 <span>{{t "new.me"}}</span>
177 </label>
178 {{range .Groups}}<label>
179 <input type="radio" name="group" value="{{.Path}}">
180 {{template "namemark" .}}
181 <span>{{.Name}}</span>
182 </label>{{end}}
183 </fieldset>
177 <label>{{t "new.visibility"}}
184 <label>{{t "new.visibility"}}
178 <select name="visibility"><option value="private">{{t "vis.private"}}</option><option value="public">{{t "vis.public"}}</option></select>
185 <select name="visibility"><option value="private">{{t "vis.private"}}</option><option value="public">{{t "vis.public"}}</option></select>
179 </label>
186 </label>
internal/store/repos.go +24 −7
@@ -29,6 +29,14 @@ type Group struct {
29 29 // HasLogo meldt of er een geüpload logo is.
30 30 func (g Group) HasLogo() bool { return g.LogoMIME != "" }
31 31
32 // LogoURL is het pad van het groepslogo, of leeg.
33 func (g Group) LogoURL() string {
34 if !g.HasLogo() {
35 return ""
36 }
37 return "/groups/" + g.Path + "/logo"
38 }
39
32 40 // Repo is een git-repository van een gebruiker of een groep.
33 41 type Repo struct {
34 42 ID int64
@@ -46,6 +54,14 @@ type Repo struct {
46 54 // HasLogo meldt of er een geüpload logo is.
47 55 func (r Repo) HasLogo() bool { return r.LogoMIME != "" }
48 56
57 // LogoURL is het pad van het repologo, of leeg.
58 func (r Repo) LogoURL() string {
59 if !r.HasLogo() {
60 return ""
61 }
62 return "/" + r.FullPath() + "/-/logo"
63 }
64
49 65 // FullPath is owner/naam.
50 66 func (r Repo) FullPath() string { return r.OwnerPath + "/" + r.Name }
51 67
@@ -409,10 +425,11 @@ func (s *Store) EffectiveRole(ctx context.Context, userID, repoID int64) (access
409 425
410 426 // Member is een lid of een uitnodiging op gebruikersnaam.
411 427 type Member struct {
412 UserID int64
413 Username string
414 Role access.Role
415 Pending bool
428 UserID int64
429 Username string
430 AvatarURL string
431 Role access.Role
432 Pending bool
416 433 }
417 434
418 435 // SetMember zet een lidmaatschap. Een onbekende naam blijft wachten tot de eerste login.
@@ -488,9 +505,9 @@ func (s *Store) RemoveMember(ctx context.Context, scopeKind string, scopeID int6
488 505 func (s *Store) ListMembers(ctx context.Context, scopeKind string, scopeID int64) ([]Member, error) {
489 506 var q string
490 507 if scopeKind == "group" {
491 q = `SELECT u.id, u.username, m.role FROM group_members m JOIN users u ON u.id = m.user_id WHERE m.group_id = ? ORDER BY u.username`
508 q = `SELECT u.id, u.username, u.avatar_url, m.role FROM group_members m JOIN users u ON u.id = m.user_id WHERE m.group_id = ? ORDER BY u.username`
492 509 } else {
493 q = `SELECT u.id, u.username, m.role FROM repo_members m JOIN users u ON u.id = m.user_id WHERE m.repo_id = ? ORDER BY u.username`
510 q = `SELECT u.id, u.username, u.avatar_url, m.role FROM repo_members m JOIN users u ON u.id = m.user_id WHERE m.repo_id = ? ORDER BY u.username`
494 511 }
495 512 rows, err := s.db.QueryContext(ctx, q, scopeID)
496 513 if err != nil {
@@ -501,7 +518,7 @@ func (s *Store) ListMembers(ctx context.Context, scopeKind string, scopeID int64
501 518 for rows.Next() {
502 519 var m Member
503 520 var role string
504 if err := rows.Scan(&m.UserID, &m.Username, &role); err != nil {
521 if err := rows.Scan(&m.UserID, &m.Username, &m.AvatarURL, &role); err != nil {
505 522 return nil, err
506 523 }
507 524 m.Role = access.Role(role)
@@ -29,6 +29,14 @@ type Group struct {
29// HasLogo meldt of er een geüpload logo is.
29// HasLogo meldt of er een geüpload logo is.
30func (g Group) HasLogo() bool { return g.LogoMIME != "" }
30func (g Group) HasLogo() bool { return g.LogoMIME != "" }
31
31
32// LogoURL is het pad van het groepslogo, of leeg.
33func (g Group) LogoURL() string {
34 if !g.HasLogo() {
35 return ""
36 }
37 return "/groups/" + g.Path + "/logo"
38}
39
32// Repo is een git-repository van een gebruiker of een groep.
40// Repo is een git-repository van een gebruiker of een groep.
33type Repo struct {
41type Repo struct {
34 ID int64
42 ID int64
@@ -46,6 +54,14 @@ type Repo struct {
46// HasLogo meldt of er een geüpload logo is.
54// HasLogo meldt of er een geüpload logo is.
47func (r Repo) HasLogo() bool { return r.LogoMIME != "" }
55func (r Repo) HasLogo() bool { return r.LogoMIME != "" }
48
56
57// LogoURL is het pad van het repologo, of leeg.
58func (r Repo) LogoURL() string {
59 if !r.HasLogo() {
60 return ""
61 }
62 return "/" + r.FullPath() + "/-/logo"
63}
64
49// FullPath is owner/naam.
65// FullPath is owner/naam.
50func (r Repo) FullPath() string { return r.OwnerPath + "/" + r.Name }
66func (r Repo) FullPath() string { return r.OwnerPath + "/" + r.Name }
51
67
@@ -409,10 +425,11 @@ func (s *Store) EffectiveRole(ctx context.Context, userID, repoID int64) (access
409
425
410// Member is een lid of een uitnodiging op gebruikersnaam.
426// Member is een lid of een uitnodiging op gebruikersnaam.
411type Member struct {
427type Member struct {
412 UserID int64
428 UserID int64
413 Username string
429 Username string
414 Role access.Role
430 AvatarURL string
415 Pending bool
431 Role access.Role
432 Pending bool
416}
433}
417
434
418// SetMember zet een lidmaatschap. Een onbekende naam blijft wachten tot de eerste login.
435// SetMember zet een lidmaatschap. Een onbekende naam blijft wachten tot de eerste login.
@@ -488,9 +505,9 @@ func (s *Store) RemoveMember(ctx context.Context, scopeKind string, scopeID int6
488func (s *Store) ListMembers(ctx context.Context, scopeKind string, scopeID int64) ([]Member, error) {
505func (s *Store) ListMembers(ctx context.Context, scopeKind string, scopeID int64) ([]Member, error) {
489 var q string
506 var q string
490 if scopeKind == "group" {
507 if scopeKind == "group" {
491 q = `SELECT u.id, u.username, m.role FROM group_members m JOIN users u ON u.id = m.user_id WHERE m.group_id = ? ORDER BY u.username`
508 q = `SELECT u.id, u.username, u.avatar_url, m.role FROM group_members m JOIN users u ON u.id = m.user_id WHERE m.group_id = ? ORDER BY u.username`
492 } else {
509 } else {
493 q = `SELECT u.id, u.username, m.role FROM repo_members m JOIN users u ON u.id = m.user_id WHERE m.repo_id = ? ORDER BY u.username`
510 q = `SELECT u.id, u.username, u.avatar_url, m.role FROM repo_members m JOIN users u ON u.id = m.user_id WHERE m.repo_id = ? ORDER BY u.username`
494 }
511 }
495 rows, err := s.db.QueryContext(ctx, q, scopeID)
512 rows, err := s.db.QueryContext(ctx, q, scopeID)
496 if err != nil {
513 if err != nil {
@@ -501,7 +518,7 @@ func (s *Store) ListMembers(ctx context.Context, scopeKind string, scopeID int64
501 for rows.Next() {
518 for rows.Next() {
502 var m Member
519 var m Member
503 var role string
520 var role string
504 if err := rows.Scan(&m.UserID, &m.Username, &role); err != nil {
521 if err := rows.Scan(&m.UserID, &m.Username, &m.AvatarURL, &role); err != nil {
505 return nil, err
522 return nil, err
506 }
523 }
507 m.Role = access.Role(role)
524 m.Role = access.Role(role)