nasso.dev
Compare changes
Choose any two refs to compare.
+4
-4
appview/db/follow.go
+4
-4
appview/db/follow.go
···
56
}
57
58
type FollowStats struct {
59
-
Followers int
60
-
Following int
61
}
62
63
func GetFollowerFollowingCount(e Execer, did string) (FollowStats, error) {
64
-
followers, following := 0, 0
65
err := e.QueryRow(
66
`SELECT
67
COUNT(CASE WHEN subject_did = ? THEN 1 END) AS followers,
···
122
123
for rows.Next() {
124
var did string
125
-
var followers, following int
126
if err := rows.Scan(&did, &followers, &following); err != nil {
127
return nil, err
128
}
···
56
}
57
58
type FollowStats struct {
59
+
Followers int64
60
+
Following int64
61
}
62
63
func GetFollowerFollowingCount(e Execer, did string) (FollowStats, error) {
64
+
var followers, following int64
65
err := e.QueryRow(
66
`SELECT
67
COUNT(CASE WHEN subject_did = ? THEN 1 END) AS followers,
···
122
123
for rows.Next() {
124
var did string
125
+
var followers, following int64
126
if err := rows.Scan(&did, &followers, &following); err != nil {
127
return nil, err
128
}
+14
appview/db/profile.go
+14
appview/db/profile.go
···
22
ByMonth []ByMonth
23
}
24
25
+
func (p *ProfileTimeline) IsEmpty() bool {
26
+
if p == nil {
27
+
return true
28
+
}
29
+
30
+
for _, m := range p.ByMonth {
31
+
if !m.IsEmpty() {
32
+
return false
33
+
}
34
+
}
35
+
36
+
return true
37
+
}
38
+
39
type ByMonth struct {
40
RepoEvents []RepoEvent
41
IssueEvents IssueEvents
+4
-4
appview/db/punchcard.go
+4
-4
appview/db/punchcard.go
···
29
Punches []Punch
30
}
31
32
-
func MakePunchcard(e Execer, filters ...filter) (Punchcard, error) {
33
-
punchcard := Punchcard{}
34
now := time.Now()
35
startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)
36
endOfYear := time.Date(now.Year(), 12, 31, 0, 0, 0, 0, time.UTC)
···
63
64
rows, err := e.Query(query, args...)
65
if err != nil {
66
-
return punchcard, err
67
}
68
defer rows.Close()
69
···
72
var date string
73
var count sql.NullInt64
74
if err := rows.Scan(&date, &count); err != nil {
75
-
return punchcard, err
76
}
77
78
punch.Date, err = time.Parse(time.DateOnly, date)
···
29
Punches []Punch
30
}
31
32
+
func MakePunchcard(e Execer, filters ...filter) (*Punchcard, error) {
33
+
punchcard := &Punchcard{}
34
now := time.Now()
35
startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)
36
endOfYear := time.Date(now.Year(), 12, 31, 0, 0, 0, 0, time.UTC)
···
63
64
rows, err := e.Query(query, args...)
65
if err != nil {
66
+
return nil, err
67
}
68
defer rows.Close()
69
···
72
var date string
73
var count sql.NullInt64
74
if err := rows.Scan(&date, &count); err != nil {
75
+
return nil, err
76
}
77
78
punch.Date, err = time.Parse(time.DateOnly, date)
+27
-66
appview/db/repos.go
+27
-66
appview/db/repos.go
···
2
3
import (
4
"database/sql"
5
"fmt"
6
"log"
7
"slices"
···
36
func (r Repo) DidSlashRepo() string {
37
p, _ := securejoin.SecureJoin(r.Did, r.Name)
38
return p
39
-
}
40
-
41
-
func GetAllRepos(e Execer, limit int) ([]Repo, error) {
42
-
var repos []Repo
43
-
44
-
rows, err := e.Query(
45
-
`select did, name, knot, rkey, description, created, source
46
-
from repos
47
-
order by created desc
48
-
limit ?
49
-
`,
50
-
limit,
51
-
)
52
-
if err != nil {
53
-
return nil, err
54
-
}
55
-
defer rows.Close()
56
-
57
-
for rows.Next() {
58
-
var repo Repo
59
-
err := scanRepo(
60
-
rows, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &repo.Description, &repo.Created, &repo.Source,
61
-
)
62
-
if err != nil {
63
-
return nil, err
64
-
}
65
-
repos = append(repos, repo)
66
-
}
67
-
68
-
if err := rows.Err(); err != nil {
69
-
return nil, err
70
-
}
71
-
72
-
return repos, nil
73
}
74
75
func GetRepos(e Execer, limit int, filters ...filter) ([]Repo, error) {
···
310
311
slices.SortFunc(repos, func(a, b Repo) int {
312
if a.Created.After(b.Created) {
313
-
return 1
314
}
315
-
return -1
316
})
317
318
return repos, nil
319
}
320
321
func GetAllReposByDid(e Execer, did string) ([]Repo, error) {
322
var repos []Repo
323
···
570
IssueCount IssueCount
571
PullCount PullCount
572
}
573
-
574
-
func scanRepo(rows *sql.Rows, did, name, knot, rkey, description *string, created *time.Time, source *string) error {
575
-
var createdAt string
576
-
var nullableDescription sql.NullString
577
-
var nullableSource sql.NullString
578
-
if err := rows.Scan(did, name, knot, rkey, &nullableDescription, &createdAt, &nullableSource); err != nil {
579
-
return err
580
-
}
581
-
582
-
if nullableDescription.Valid {
583
-
*description = nullableDescription.String
584
-
} else {
585
-
*description = ""
586
-
}
587
-
588
-
createdAtTime, err := time.Parse(time.RFC3339, createdAt)
589
-
if err != nil {
590
-
*created = time.Now()
591
-
} else {
592
-
*created = createdAtTime
593
-
}
594
-
595
-
if nullableSource.Valid {
596
-
*source = nullableSource.String
597
-
} else {
598
-
*source = ""
599
-
}
600
-
601
-
return nil
602
-
}
···
2
3
import (
4
"database/sql"
5
+
"errors"
6
"fmt"
7
"log"
8
"slices"
···
37
func (r Repo) DidSlashRepo() string {
38
p, _ := securejoin.SecureJoin(r.Did, r.Name)
39
return p
40
}
41
42
func GetRepos(e Execer, limit int, filters ...filter) ([]Repo, error) {
···
277
278
slices.SortFunc(repos, func(a, b Repo) int {
279
if a.Created.After(b.Created) {
280
+
return -1
281
}
282
+
return 1
283
})
284
285
return repos, nil
286
}
287
288
+
func CountRepos(e Execer, filters ...filter) (int64, error) {
289
+
var conditions []string
290
+
var args []any
291
+
for _, filter := range filters {
292
+
conditions = append(conditions, filter.Condition())
293
+
args = append(args, filter.Arg()...)
294
+
}
295
+
296
+
whereClause := ""
297
+
if conditions != nil {
298
+
whereClause = " where " + strings.Join(conditions, " and ")
299
+
}
300
+
301
+
repoQuery := fmt.Sprintf(`select count(1) from repos %s`, whereClause)
302
+
var count int64
303
+
err := e.QueryRow(repoQuery, args...).Scan(&count)
304
+
305
+
if !errors.Is(err, sql.ErrNoRows) && err != nil {
306
+
return 0, err
307
+
}
308
+
309
+
return count, nil
310
+
}
311
+
312
func GetAllReposByDid(e Execer, did string) ([]Repo, error) {
313
var repos []Repo
314
···
561
IssueCount IssueCount
562
PullCount PullCount
563
}
+26
appview/db/star.go
+26
appview/db/star.go
···
1
package db
2
3
import (
4
+
"database/sql"
5
+
"errors"
6
"fmt"
7
"log"
8
"strings"
···
183
}
184
185
return stars, nil
186
+
}
187
+
188
+
func CountStars(e Execer, filters ...filter) (int64, error) {
189
+
var conditions []string
190
+
var args []any
191
+
for _, filter := range filters {
192
+
conditions = append(conditions, filter.Condition())
193
+
args = append(args, filter.Arg()...)
194
+
}
195
+
196
+
whereClause := ""
197
+
if conditions != nil {
198
+
whereClause = " where " + strings.Join(conditions, " and ")
199
+
}
200
+
201
+
repoQuery := fmt.Sprintf(`select count(1) from stars %s`, whereClause)
202
+
var count int64
203
+
err := e.QueryRow(repoQuery, args...).Scan(&count)
204
+
205
+
if !errors.Is(err, sql.ErrNoRows) && err != nil {
206
+
return 0, err
207
+
}
208
+
209
+
return count, nil
210
}
211
212
func GetAllStars(e Execer, limit int) ([]Star, error) {
+24
appview/db/strings.go
+24
appview/db/strings.go
···
206
return all, nil
207
}
208
209
+
func CountStrings(e Execer, filters ...filter) (int64, error) {
210
+
var conditions []string
211
+
var args []any
212
+
for _, filter := range filters {
213
+
conditions = append(conditions, filter.Condition())
214
+
args = append(args, filter.Arg()...)
215
+
}
216
+
217
+
whereClause := ""
218
+
if conditions != nil {
219
+
whereClause = " where " + strings.Join(conditions, " and ")
220
+
}
221
+
222
+
repoQuery := fmt.Sprintf(`select count(1) from strings %s`, whereClause)
223
+
var count int64
224
+
err := e.QueryRow(repoQuery, args...).Scan(&count)
225
+
226
+
if !errors.Is(err, sql.ErrNoRows) && err != nil {
227
+
return 0, err
228
+
}
229
+
230
+
return count, nil
231
+
}
232
+
233
func DeleteString(e Execer, filters ...filter) error {
234
var conditions []string
235
var args []any
+35
appview/pages/cache.go
+35
appview/pages/cache.go
···
···
1
+
package pages
2
+
3
+
import (
4
+
"sync"
5
+
)
6
+
7
+
type TmplCache[K comparable, V any] struct {
8
+
data map[K]V
9
+
mutex sync.RWMutex
10
+
}
11
+
12
+
func NewTmplCache[K comparable, V any]() *TmplCache[K, V] {
13
+
return &TmplCache[K, V]{
14
+
data: make(map[K]V),
15
+
}
16
+
}
17
+
18
+
func (c *TmplCache[K, V]) Get(key K) (V, bool) {
19
+
c.mutex.RLock()
20
+
defer c.mutex.RUnlock()
21
+
val, exists := c.data[key]
22
+
return val, exists
23
+
}
24
+
25
+
func (c *TmplCache[K, V]) Set(key K, value V) {
26
+
c.mutex.Lock()
27
+
defer c.mutex.Unlock()
28
+
c.data[key] = value
29
+
}
30
+
31
+
func (c *TmplCache[K, V]) Size() int {
32
+
c.mutex.RLock()
33
+
defer c.mutex.RUnlock()
34
+
return len(c.data)
35
+
}
+202
-164
appview/pages/pages.go
+202
-164
appview/pages/pages.go
···
9
"html/template"
10
"io"
11
"io/fs"
12
-
"log"
13
"net/http"
14
"os"
15
"path/filepath"
···
42
var Files embed.FS
43
44
type Pages struct {
45
-
mu sync.RWMutex
46
-
t map[string]*template.Template
47
48
avatar config.AvatarConfig
49
resolver *idresolver.Resolver
50
dev bool
51
-
embedFS embed.FS
52
templateDir string // Path to templates on disk for dev mode
53
rctx *markup.RenderContext
54
}
55
56
func NewPages(config *config.Config, res *idresolver.Resolver) *Pages {
···
64
65
p := &Pages{
66
mu: sync.RWMutex{},
67
-
t: make(map[string]*template.Template),
68
dev: config.Core.Dev,
69
avatar: config.Avatar,
70
-
embedFS: Files,
71
rctx: rctx,
72
resolver: res,
73
templateDir: "appview/pages",
74
}
75
76
-
// Initial load of all templates
77
-
p.loadAllTemplates()
78
79
return p
80
}
81
82
-
func (p *Pages) loadAllTemplates() {
83
-
templates := make(map[string]*template.Template)
84
-
var fragmentPaths []string
85
86
-
// Use embedded FS for initial loading
87
-
// First, collect all fragment paths
88
err := fs.WalkDir(p.embedFS, "templates", func(path string, d fs.DirEntry, err error) error {
89
if err != nil {
90
return err
···
98
if !strings.Contains(path, "fragments/") {
99
return nil
100
}
101
-
name := strings.TrimPrefix(path, "templates/")
102
-
name = strings.TrimSuffix(name, ".html")
103
-
tmpl, err := template.New(name).
104
-
Funcs(p.funcMap()).
105
-
ParseFS(p.embedFS, path)
106
-
if err != nil {
107
-
log.Fatalf("setting up fragment: %v", err)
108
-
}
109
-
templates[name] = tmpl
110
fragmentPaths = append(fragmentPaths, path)
111
-
log.Printf("loaded fragment: %s", name)
112
return nil
113
})
114
if err != nil {
115
-
log.Fatalf("walking template dir for fragments: %v", err)
116
}
117
118
-
// Then walk through and setup the rest of the templates
119
-
err = fs.WalkDir(p.embedFS, "templates", func(path string, d fs.DirEntry, err error) error {
120
if err != nil {
121
-
return err
122
-
}
123
-
if d.IsDir() {
124
-
return nil
125
-
}
126
-
if !strings.HasSuffix(path, "html") {
127
-
return nil
128
}
129
-
// Skip fragments as they've already been loaded
130
-
if strings.Contains(path, "fragments/") {
131
-
return nil
132
-
}
133
-
// Skip layouts
134
-
if strings.Contains(path, "layouts/") {
135
-
return nil
136
-
}
137
-
name := strings.TrimPrefix(path, "templates/")
138
-
name = strings.TrimSuffix(name, ".html")
139
-
// Add the page template on top of the base
140
-
allPaths := []string{}
141
-
allPaths = append(allPaths, "templates/layouts/*.html")
142
-
allPaths = append(allPaths, fragmentPaths...)
143
-
allPaths = append(allPaths, path)
144
-
tmpl, err := template.New(name).
145
-
Funcs(p.funcMap()).
146
-
ParseFS(p.embedFS, allPaths...)
147
if err != nil {
148
-
return fmt.Errorf("setting up template: %w", err)
149
}
150
-
templates[name] = tmpl
151
-
log.Printf("loaded template: %s", name)
152
-
return nil
153
-
})
154
-
if err != nil {
155
-
log.Fatalf("walking template dir: %v", err)
156
}
157
158
-
log.Printf("total templates loaded: %d", len(templates))
159
-
p.mu.Lock()
160
-
defer p.mu.Unlock()
161
-
p.t = templates
162
}
163
164
-
// loadTemplateFromDisk loads a template from the filesystem in dev mode
165
-
func (p *Pages) loadTemplateFromDisk(name string) error {
166
-
if !p.dev {
167
-
return nil
168
}
169
170
-
log.Printf("reloading template from disk: %s", name)
171
-
172
-
// Find all fragments first
173
-
var fragmentPaths []string
174
-
err := filepath.WalkDir(filepath.Join(p.templateDir, "templates"), func(path string, d fs.DirEntry, err error) error {
175
-
if err != nil {
176
-
return err
177
-
}
178
-
if d.IsDir() {
179
-
return nil
180
-
}
181
-
if !strings.HasSuffix(path, ".html") {
182
-
return nil
183
-
}
184
-
if !strings.Contains(path, "fragments/") {
185
-
return nil
186
-
}
187
-
fragmentPaths = append(fragmentPaths, path)
188
-
return nil
189
-
})
190
if err != nil {
191
-
return fmt.Errorf("walking disk template dir for fragments: %w", err)
192
}
193
194
-
// Find the template path on disk
195
-
templatePath := filepath.Join(p.templateDir, "templates", name+".html")
196
-
if _, err := os.Stat(templatePath); os.IsNotExist(err) {
197
-
return fmt.Errorf("template not found on disk: %s", name)
198
-
}
199
200
-
// Create a new template
201
-
tmpl := template.New(name).Funcs(p.funcMap())
202
203
-
// Parse layouts
204
-
layoutGlob := filepath.Join(p.templateDir, "templates", "layouts", "*.html")
205
-
layouts, err := filepath.Glob(layoutGlob)
206
-
if err != nil {
207
-
return fmt.Errorf("finding layout templates: %w", err)
208
}
209
210
-
// Create paths for parsing
211
-
allFiles := append(layouts, fragmentPaths...)
212
-
allFiles = append(allFiles, templatePath)
213
-
214
-
// Parse all templates
215
-
tmpl, err = tmpl.ParseFiles(allFiles...)
216
if err != nil {
217
-
return fmt.Errorf("parsing template files: %w", err)
218
}
219
220
-
// Update the template in the map
221
-
p.mu.Lock()
222
-
defer p.mu.Unlock()
223
-
p.t[name] = tmpl
224
-
log.Printf("template reloaded from disk: %s", name)
225
-
return nil
226
}
227
228
-
func (p *Pages) executeOrReload(templateName string, w io.Writer, base string, params any) error {
229
-
// In dev mode, reload the template from disk before executing
230
-
if p.dev {
231
-
if err := p.loadTemplateFromDisk(templateName); err != nil {
232
-
log.Printf("warning: failed to reload template %s from disk: %v", templateName, err)
233
-
// Continue with the existing template
234
-
}
235
}
236
237
-
p.mu.RLock()
238
-
defer p.mu.RUnlock()
239
-
tmpl, exists := p.t[templateName]
240
-
if !exists {
241
-
return fmt.Errorf("template not found: %s", templateName)
242
}
243
244
-
if base == "" {
245
-
return tmpl.Execute(w, params)
246
-
} else {
247
-
return tmpl.ExecuteTemplate(w, base, params)
248
}
249
}
250
251
func (p *Pages) execute(name string, w io.Writer, params any) error {
252
-
return p.executeOrReload(name, w, "layouts/base", params)
253
}
254
255
-
func (p *Pages) executePlain(name string, w io.Writer, params any) error {
256
-
return p.executeOrReload(name, w, "", params)
257
}
258
259
-
func (p *Pages) executeRepo(name string, w io.Writer, params any) error {
260
-
return p.executeOrReload(name, w, "layouts/repobase", params)
261
}
262
263
func (p *Pages) Favicon(w io.Writer) error {
···
422
return p.execute("repo/fork", w, params)
423
}
424
425
-
type ProfileHomePageParams struct {
426
LoggedInUser *oauth.User
427
Repos []db.Repo
428
CollaboratingRepos []db.Repo
429
ProfileTimeline *db.ProfileTimeline
430
-
Card ProfileCard
431
-
Punchcard db.Punchcard
432
}
433
434
-
type ProfileCard struct {
435
-
UserDid string
436
-
UserHandle string
437
-
FollowStatus db.FollowStatus
438
-
FollowersCount int
439
-
FollowingCount int
440
441
-
Profile *db.Profile
442
}
443
444
-
func (p *Pages) ProfileHomePage(w io.Writer, params ProfileHomePageParams) error {
445
-
return p.execute("user/profile", w, params)
446
}
447
448
-
type ReposPageParams struct {
449
LoggedInUser *oauth.User
450
Repos []db.Repo
451
-
Card ProfileCard
452
}
453
454
-
func (p *Pages) ReposPage(w io.Writer, params ReposPageParams) error {
455
-
return p.execute("user/repos", w, params)
456
}
457
458
type FollowCard struct {
459
UserDid string
460
FollowStatus db.FollowStatus
461
-
FollowersCount int
462
-
FollowingCount int
463
Profile *db.Profile
464
}
465
466
-
type FollowersPageParams struct {
467
LoggedInUser *oauth.User
468
Followers []FollowCard
469
-
Card ProfileCard
470
}
471
472
-
func (p *Pages) FollowersPage(w io.Writer, params FollowersPageParams) error {
473
-
return p.execute("user/followers", w, params)
474
}
475
476
-
type FollowingPageParams struct {
477
LoggedInUser *oauth.User
478
Following []FollowCard
479
-
Card ProfileCard
480
}
481
482
-
func (p *Pages) FollowingPage(w io.Writer, params FollowingPageParams) error {
483
-
return p.execute("user/following", w, params)
484
}
485
486
type FollowFragmentParams struct {
···
649
650
func (p *Pages) RepoTree(w io.Writer, params RepoTreeParams) error {
651
params.Active = "overview"
652
-
return p.execute("repo/tree", w, params)
653
}
654
655
type RepoBranchesParams struct {
···
863
} else {
864
params.State = "closed"
865
}
866
-
return p.execute("repo/issues/issue", w, params)
867
}
868
869
type RepoNewIssueParams struct {
···
1269
1270
sub, err := fs.Sub(Files, "static")
1271
if err != nil {
1272
-
log.Fatalf("no static dir found? that's crazy: %v", err)
1273
}
1274
// Custom handler to apply Cache-Control headers for font files
1275
return Cache(http.StripPrefix("/static/", http.FileServer(http.FS(sub))))
···
1292
func CssContentHash() string {
1293
cssFile, err := Files.Open("static/tw.css")
1294
if err != nil {
1295
-
log.Printf("Error opening CSS file: %v", err)
1296
return ""
1297
}
1298
defer cssFile.Close()
1299
1300
hasher := sha256.New()
1301
if _, err := io.Copy(hasher, cssFile); err != nil {
1302
-
log.Printf("Error hashing CSS file: %v", err)
1303
return ""
1304
}
1305
···
9
"html/template"
10
"io"
11
"io/fs"
12
+
"log/slog"
13
"net/http"
14
"os"
15
"path/filepath"
···
42
var Files embed.FS
43
44
type Pages struct {
45
+
mu sync.RWMutex
46
+
cache *TmplCache[string, *template.Template]
47
48
avatar config.AvatarConfig
49
resolver *idresolver.Resolver
50
dev bool
51
+
embedFS fs.FS
52
templateDir string // Path to templates on disk for dev mode
53
rctx *markup.RenderContext
54
+
logger *slog.Logger
55
}
56
57
func NewPages(config *config.Config, res *idresolver.Resolver) *Pages {
···
65
66
p := &Pages{
67
mu: sync.RWMutex{},
68
+
cache: NewTmplCache[string, *template.Template](),
69
dev: config.Core.Dev,
70
avatar: config.Avatar,
71
rctx: rctx,
72
resolver: res,
73
templateDir: "appview/pages",
74
+
logger: slog.Default().With("component", "pages"),
75
}
76
77
+
if p.dev {
78
+
p.embedFS = os.DirFS(p.templateDir)
79
+
} else {
80
+
p.embedFS = Files
81
+
}
82
83
return p
84
}
85
86
+
func (p *Pages) pathToName(s string) string {
87
+
return strings.TrimSuffix(strings.TrimPrefix(s, "templates/"), ".html")
88
+
}
89
90
+
// reverse of pathToName
91
+
func (p *Pages) nameToPath(s string) string {
92
+
return "templates/" + s + ".html"
93
+
}
94
+
95
+
func (p *Pages) fragmentPaths() ([]string, error) {
96
+
var fragmentPaths []string
97
err := fs.WalkDir(p.embedFS, "templates", func(path string, d fs.DirEntry, err error) error {
98
if err != nil {
99
return err
···
107
if !strings.Contains(path, "fragments/") {
108
return nil
109
}
110
fragmentPaths = append(fragmentPaths, path)
111
return nil
112
})
113
if err != nil {
114
+
return nil, err
115
}
116
117
+
return fragmentPaths, nil
118
+
}
119
+
120
+
func (p *Pages) fragments() (*template.Template, error) {
121
+
fragmentPaths, err := p.fragmentPaths()
122
+
if err != nil {
123
+
return nil, err
124
+
}
125
+
126
+
funcs := p.funcMap()
127
+
128
+
// parse all fragments together
129
+
allFragments := template.New("").Funcs(funcs)
130
+
for _, f := range fragmentPaths {
131
+
name := p.pathToName(f)
132
+
133
+
pf, err := template.New(name).
134
+
Funcs(funcs).
135
+
ParseFS(p.embedFS, f)
136
if err != nil {
137
+
return nil, err
138
}
139
+
140
+
allFragments, err = allFragments.AddParseTree(name, pf.Tree)
141
if err != nil {
142
+
return nil, err
143
}
144
}
145
146
+
return allFragments, nil
147
}
148
149
+
// parse without memoization
150
+
func (p *Pages) rawParse(stack ...string) (*template.Template, error) {
151
+
paths, err := p.fragmentPaths()
152
+
if err != nil {
153
+
return nil, err
154
+
}
155
+
for _, s := range stack {
156
+
paths = append(paths, p.nameToPath(s))
157
}
158
159
+
funcs := p.funcMap()
160
+
top := stack[len(stack)-1]
161
+
parsed, err := template.New(top).
162
+
Funcs(funcs).
163
+
ParseFS(p.embedFS, paths...)
164
if err != nil {
165
+
return nil, err
166
}
167
168
+
return parsed, nil
169
+
}
170
171
+
func (p *Pages) parse(stack ...string) (*template.Template, error) {
172
+
key := strings.Join(stack, "|")
173
174
+
// never cache in dev mode
175
+
if cached, exists := p.cache.Get(key); !p.dev && exists {
176
+
return cached, nil
177
}
178
179
+
result, err := p.rawParse(stack...)
180
if err != nil {
181
+
return nil, err
182
}
183
184
+
p.cache.Set(key, result)
185
+
return result, nil
186
}
187
188
+
func (p *Pages) parseBase(top string) (*template.Template, error) {
189
+
stack := []string{
190
+
"layouts/base",
191
+
top,
192
}
193
+
return p.parse(stack...)
194
+
}
195
196
+
func (p *Pages) parseRepoBase(top string) (*template.Template, error) {
197
+
stack := []string{
198
+
"layouts/base",
199
+
"layouts/repobase",
200
+
top,
201
}
202
+
return p.parse(stack...)
203
+
}
204
205
+
func (p *Pages) parseProfileBase(top string) (*template.Template, error) {
206
+
stack := []string{
207
+
"layouts/base",
208
+
"layouts/profilebase",
209
+
top,
210
}
211
+
return p.parse(stack...)
212
+
}
213
+
214
+
func (p *Pages) executePlain(name string, w io.Writer, params any) error {
215
+
tpl, err := p.parse(name)
216
+
if err != nil {
217
+
return err
218
+
}
219
+
220
+
return tpl.Execute(w, params)
221
}
222
223
func (p *Pages) execute(name string, w io.Writer, params any) error {
224
+
tpl, err := p.parseBase(name)
225
+
if err != nil {
226
+
return err
227
+
}
228
+
229
+
return tpl.ExecuteTemplate(w, "layouts/base", params)
230
}
231
232
+
func (p *Pages) executeRepo(name string, w io.Writer, params any) error {
233
+
tpl, err := p.parseRepoBase(name)
234
+
if err != nil {
235
+
return err
236
+
}
237
+
238
+
return tpl.ExecuteTemplate(w, "layouts/base", params)
239
}
240
241
+
func (p *Pages) executeProfile(name string, w io.Writer, params any) error {
242
+
tpl, err := p.parseProfileBase(name)
243
+
if err != nil {
244
+
return err
245
+
}
246
+
247
+
return tpl.ExecuteTemplate(w, "layouts/base", params)
248
}
249
250
func (p *Pages) Favicon(w io.Writer) error {
···
409
return p.execute("repo/fork", w, params)
410
}
411
412
+
type ProfileCard struct {
413
+
UserDid string
414
+
UserHandle string
415
+
FollowStatus db.FollowStatus
416
+
Punchcard *db.Punchcard
417
+
Profile *db.Profile
418
+
Stats ProfileStats
419
+
Active string
420
+
}
421
+
422
+
type ProfileStats struct {
423
+
RepoCount int64
424
+
StarredCount int64
425
+
StringCount int64
426
+
FollowersCount int64
427
+
FollowingCount int64
428
+
}
429
+
430
+
func (p *ProfileCard) GetTabs() [][]any {
431
+
tabs := [][]any{
432
+
{"overview", "overview", "square-chart-gantt", nil},
433
+
{"repos", "repos", "book-marked", p.Stats.RepoCount},
434
+
{"starred", "starred", "star", p.Stats.StarredCount},
435
+
{"strings", "strings", "line-squiggle", p.Stats.StringCount},
436
+
}
437
+
438
+
return tabs
439
+
}
440
+
441
+
type ProfileOverviewParams struct {
442
LoggedInUser *oauth.User
443
Repos []db.Repo
444
CollaboratingRepos []db.Repo
445
ProfileTimeline *db.ProfileTimeline
446
+
Card *ProfileCard
447
+
Active string
448
}
449
450
+
func (p *Pages) ProfileOverview(w io.Writer, params ProfileOverviewParams) error {
451
+
params.Active = "overview"
452
+
return p.executeProfile("user/overview", w, params)
453
+
}
454
455
+
type ProfileReposParams struct {
456
+
LoggedInUser *oauth.User
457
+
Repos []db.Repo
458
+
Card *ProfileCard
459
+
Active string
460
}
461
462
+
func (p *Pages) ProfileRepos(w io.Writer, params ProfileReposParams) error {
463
+
params.Active = "repos"
464
+
return p.executeProfile("user/repos", w, params)
465
}
466
467
+
type ProfileStarredParams struct {
468
LoggedInUser *oauth.User
469
Repos []db.Repo
470
+
Card *ProfileCard
471
+
Active string
472
+
}
473
+
474
+
func (p *Pages) ProfileStarred(w io.Writer, params ProfileStarredParams) error {
475
+
params.Active = "starred"
476
+
return p.executeProfile("user/starred", w, params)
477
+
}
478
+
479
+
type ProfileStringsParams struct {
480
+
LoggedInUser *oauth.User
481
+
Strings []db.String
482
+
Card *ProfileCard
483
+
Active string
484
}
485
486
+
func (p *Pages) ProfileStrings(w io.Writer, params ProfileStringsParams) error {
487
+
params.Active = "strings"
488
+
return p.executeProfile("user/strings", w, params)
489
}
490
491
type FollowCard struct {
492
UserDid string
493
FollowStatus db.FollowStatus
494
+
FollowersCount int64
495
+
FollowingCount int64
496
Profile *db.Profile
497
}
498
499
+
type ProfileFollowersParams struct {
500
LoggedInUser *oauth.User
501
Followers []FollowCard
502
+
Card *ProfileCard
503
+
Active string
504
}
505
506
+
func (p *Pages) ProfileFollowers(w io.Writer, params ProfileFollowersParams) error {
507
+
params.Active = "overview"
508
+
return p.executeProfile("user/followers", w, params)
509
}
510
511
+
type ProfileFollowingParams struct {
512
LoggedInUser *oauth.User
513
Following []FollowCard
514
+
Card *ProfileCard
515
+
Active string
516
}
517
518
+
func (p *Pages) ProfileFollowing(w io.Writer, params ProfileFollowingParams) error {
519
+
params.Active = "overview"
520
+
return p.executeProfile("user/following", w, params)
521
}
522
523
type FollowFragmentParams struct {
···
686
687
func (p *Pages) RepoTree(w io.Writer, params RepoTreeParams) error {
688
params.Active = "overview"
689
+
return p.executeRepo("repo/tree", w, params)
690
}
691
692
type RepoBranchesParams struct {
···
900
} else {
901
params.State = "closed"
902
}
903
+
return p.executeRepo("repo/issues/issue", w, params)
904
}
905
906
type RepoNewIssueParams struct {
···
1306
1307
sub, err := fs.Sub(Files, "static")
1308
if err != nil {
1309
+
p.logger.Error("no static dir found? that's crazy", "err", err)
1310
+
panic(err)
1311
}
1312
// Custom handler to apply Cache-Control headers for font files
1313
return Cache(http.StripPrefix("/static/", http.FileServer(http.FS(sub))))
···
1330
func CssContentHash() string {
1331
cssFile, err := Files.Open("static/tw.css")
1332
if err != nil {
1333
+
slog.Debug("Error opening CSS file", "err", err)
1334
return ""
1335
}
1336
defer cssFile.Close()
1337
1338
hasher := sha256.New()
1339
if _, err := io.Copy(hasher, cssFile); err != nil {
1340
+
slog.Debug("Error hashing CSS file", "err", err)
1341
return ""
1342
}
1343
+2
-7
appview/pages/repoinfo/repoinfo.go
+2
-7
appview/pages/repoinfo/repoinfo.go
+2
-2
appview/pages/templates/layouts/base.html
+2
-2
appview/pages/templates/layouts/base.html
···
17
<body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">
18
{{ block "topbarLayout" . }}
19
<header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">
20
-
{{ template "layouts/topbar" . }}
21
</header>
22
{{ end }}
23
···
39
40
{{ block "footerLayout" . }}
41
<footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">
42
-
{{ template "layouts/footer" . }}
43
</footer>
44
{{ end }}
45
</body>
···
17
<body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">
18
{{ block "topbarLayout" . }}
19
<header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">
20
+
{{ template "layouts/fragments/topbar" . }}
21
</header>
22
{{ end }}
23
···
39
40
{{ block "footerLayout" . }}
41
<footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">
42
+
{{ template "layouts/fragments/footer" . }}
43
</footer>
44
{{ end }}
45
</body>
+87
appview/pages/templates/layouts/fragments/topbar.html
+87
appview/pages/templates/layouts/fragments/topbar.html
···
···
1
+
{{ define "layouts/fragments/topbar" }}
2
+
<nav class="space-x-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">
3
+
<div class="flex justify-between p-0 items-center">
4
+
<div id="left-items">
5
+
<a href="/" hx-boost="true" class="flex gap-2 font-bold italic">
6
+
tangled<sub>alpha</sub>
7
+
</a>
8
+
</div>
9
+
10
+
<div id="right-items" class="flex items-center gap-2">
11
+
{{ with .LoggedInUser }}
12
+
{{ block "newButton" . }} {{ end }}
13
+
{{ block "dropDown" . }} {{ end }}
14
+
{{ else }}
15
+
<a href="/login">login</a>
16
+
<span class="text-gray-500 dark:text-gray-400">or</span>
17
+
<a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2">
18
+
join now {{ i "arrow-right" "size-4" }}
19
+
</a>
20
+
{{ end }}
21
+
</div>
22
+
</div>
23
+
</nav>
24
+
{{ if .LoggedInUser }}
25
+
<div id="upgrade-banner"
26
+
hx-get="/knots/upgradeBanner"
27
+
hx-trigger="load"
28
+
hx-swap="innerHTML">
29
+
</div>
30
+
{{ end }}
31
+
{{ end }}
32
+
33
+
{{ define "newButton" }}
34
+
<details class="relative inline-block text-left nav-dropdown">
35
+
<summary class="btn-create py-0 cursor-pointer list-none flex items-center gap-2">
36
+
{{ i "plus" "w-4 h-4" }} new
37
+
</summary>
38
+
<div class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700">
39
+
<a href="/repo/new" class="flex items-center gap-2">
40
+
{{ i "book-plus" "w-4 h-4" }}
41
+
new repository
42
+
</a>
43
+
<a href="/strings/new" class="flex items-center gap-2">
44
+
{{ i "line-squiggle" "w-4 h-4" }}
45
+
new string
46
+
</a>
47
+
</div>
48
+
</details>
49
+
{{ end }}
50
+
51
+
{{ define "dropDown" }}
52
+
<details class="relative inline-block text-left nav-dropdown">
53
+
<summary
54
+
class="cursor-pointer list-none flex items-center"
55
+
>
56
+
{{ $user := didOrHandle .Did .Handle }}
57
+
{{ template "user/fragments/picHandle" $user }}
58
+
</summary>
59
+
<div
60
+
class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700"
61
+
>
62
+
<a href="/{{ $user }}">profile</a>
63
+
<a href="/{{ $user }}?tab=repos">repositories</a>
64
+
<a href="/{{ $user }}?tab=strings">strings</a>
65
+
<a href="/knots">knots</a>
66
+
<a href="/spindles">spindles</a>
67
+
<a href="/settings">settings</a>
68
+
<a href="#"
69
+
hx-post="/logout"
70
+
hx-swap="none"
71
+
class="text-red-400 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300">
72
+
logout
73
+
</a>
74
+
</div>
75
+
</details>
76
+
77
+
<script>
78
+
document.addEventListener('click', function(event) {
79
+
const dropdowns = document.querySelectorAll('.nav-dropdown');
80
+
dropdowns.forEach(function(dropdown) {
81
+
if (!dropdown.contains(event.target)) {
82
+
dropdown.removeAttribute('open');
83
+
}
84
+
});
85
+
});
86
+
</script>
87
+
{{ end }}
+104
appview/pages/templates/layouts/profilebase.html
+104
appview/pages/templates/layouts/profilebase.html
···
···
1
+
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }}{{ end }}
2
+
3
+
{{ define "extrameta" }}
4
+
<meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}" />
5
+
<meta property="og:type" content="profile" />
6
+
<meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid }}?tab={{ .Active }}" />
7
+
<meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
8
+
{{ end }}
9
+
10
+
{{ define "content" }}
11
+
{{ template "profileTabs" . }}
12
+
<section class="bg-white dark:bg-gray-800 p-6 rounded w-full dark:text-white drop-shadow-sm">
13
+
<div class="grid grid-cols-1 md:grid-cols-11 gap-4">
14
+
<div class="md:col-span-3 order-1 md:order-1">
15
+
<div class="flex flex-col gap-4">
16
+
{{ template "user/fragments/profileCard" .Card }}
17
+
{{ block "punchcard" .Card.Punchcard }} {{ end }}
18
+
</div>
19
+
</div>
20
+
{{ block "profileContent" . }} {{ end }}
21
+
</div>
22
+
</section>
23
+
{{ end }}
24
+
25
+
{{ define "profileTabs" }}
26
+
<nav class="w-full pl-4 overflow-x-auto overflow-y-hidden">
27
+
<div class="flex z-60">
28
+
{{ $activeTabStyles := "-mb-px bg-white dark:bg-gray-800" }}
29
+
{{ $tabs := .Card.GetTabs }}
30
+
{{ $tabmeta := dict "x" "y" }}
31
+
{{ range $item := $tabs }}
32
+
{{ $key := index $item 0 }}
33
+
{{ $value := index $item 1 }}
34
+
{{ $icon := index $item 2 }}
35
+
{{ $meta := index $item 3 }}
36
+
<a
37
+
href="?tab={{ $value }}"
38
+
class="relative -mr-px group no-underline hover:no-underline"
39
+
hx-boost="true">
40
+
<div
41
+
class="px-4 py-1 mr-1 text-black dark:text-white min-w-[80px] text-center relative rounded-t whitespace-nowrap
42
+
{{ if eq $.Active $key }}
43
+
{{ $activeTabStyles }}
44
+
{{ else }}
45
+
group-hover:bg-gray-100/25 group-hover:dark:bg-gray-700/25
46
+
{{ end }}
47
+
">
48
+
<span class="flex items-center justify-center">
49
+
{{ i $icon "w-4 h-4 mr-2" }}
50
+
{{ $key }}
51
+
{{ if $meta }}
52
+
<span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm ml-1">{{ $meta }}</span>
53
+
{{ end }}
54
+
</span>
55
+
</div>
56
+
</a>
57
+
{{ end }}
58
+
</div>
59
+
</nav>
60
+
{{ end }}
61
+
62
+
{{ define "punchcard" }}
63
+
{{ $now := now }}
64
+
<div>
65
+
<p class="px-2 pb-4 flex gap-2 text-sm font-bold dark:text-white">
66
+
PUNCHCARD
67
+
<span class="font-mono font-normal text-sm text-gray-500 dark:text-gray-400 ">
68
+
{{ .Total | int64 | commaFmt }} commits
69
+
</span>
70
+
</p>
71
+
<div class="grid grid-cols-28 md:grid-cols-14 gap-y-3 w-full h-full">
72
+
{{ range .Punches }}
73
+
{{ $count := .Count }}
74
+
{{ $theme := "bg-gray-200 dark:bg-gray-700 size-[4px]" }}
75
+
{{ if lt $count 1 }}
76
+
{{ $theme = "bg-gray-200 dark:bg-gray-700 size-[4px]" }}
77
+
{{ else if lt $count 2 }}
78
+
{{ $theme = "bg-green-200 dark:bg-green-900 size-[5px]" }}
79
+
{{ else if lt $count 4 }}
80
+
{{ $theme = "bg-green-300 dark:bg-green-800 size-[5px]" }}
81
+
{{ else if lt $count 8 }}
82
+
{{ $theme = "bg-green-400 dark:bg-green-700 size-[6px]" }}
83
+
{{ else }}
84
+
{{ $theme = "bg-green-500 dark:bg-green-600 size-[7px]" }}
85
+
{{ end }}
86
+
87
+
{{ if .Date.After $now }}
88
+
{{ $theme = "border border-gray-200 dark:border-gray-700 size-[4px]" }}
89
+
{{ end }}
90
+
<div class="w-full h-full flex justify-center items-center">
91
+
<div
92
+
class="aspect-square rounded-full transition-all duration-300 {{ $theme }} max-w-full max-h-full"
93
+
title="{{ .Date.Format "2006-01-02" }}: {{ .Count }} commits">
94
+
</div>
95
+
</div>
96
+
{{ end }}
97
+
</div>
98
+
</div>
99
+
{{ end }}
100
+
101
+
{{ define "layouts/profilebase" }}
102
+
{{ template "layouts/base" . }}
103
+
{{ end }}
104
+
+2
-6
appview/pages/templates/layouts/repobase.html
+2
-6
appview/pages/templates/layouts/repobase.html
···
71
<span class="flex items-center justify-center">
72
{{ i $icon "w-4 h-4 mr-2" }}
73
{{ $key }}
74
-
{{ if not (isNil $meta) }}
75
-
<span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm ml-1">{{ $meta }}</span>
76
{{ end }}
77
</span>
78
</div>
···
88
{{ block "repoAfter" . }}{{ end }}
89
</section>
90
{{ end }}
91
-
92
-
{{ define "layouts/repobase" }}
93
-
{{ template "layouts/base" . }}
94
-
{{ end }}
···
71
<span class="flex items-center justify-center">
72
{{ i $icon "w-4 h-4 mr-2" }}
73
{{ $key }}
74
+
{{ if $meta }}
75
+
<span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm ml-1">{{ $meta }}</span>
76
{{ end }}
77
</span>
78
</div>
···
88
{{ block "repoAfter" . }}{{ end }}
89
</section>
90
{{ end }}
-87
appview/pages/templates/layouts/topbar.html
-87
appview/pages/templates/layouts/topbar.html
···
1
-
{{ define "layouts/topbar" }}
2
-
<nav class="space-x-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">
3
-
<div class="flex justify-between p-0 items-center">
4
-
<div id="left-items">
5
-
<a href="/" hx-boost="true" class="flex gap-2 font-bold italic">
6
-
tangled<sub>alpha</sub>
7
-
</a>
8
-
</div>
9
-
10
-
<div id="right-items" class="flex items-center gap-2">
11
-
{{ with .LoggedInUser }}
12
-
{{ block "newButton" . }} {{ end }}
13
-
{{ block "dropDown" . }} {{ end }}
14
-
{{ else }}
15
-
<a href="/login">login</a>
16
-
<span class="text-gray-500 dark:text-gray-400">or</span>
17
-
<a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2">
18
-
join now {{ i "arrow-right" "size-4" }}
19
-
</a>
20
-
{{ end }}
21
-
</div>
22
-
</div>
23
-
</nav>
24
-
{{ if .LoggedInUser }}
25
-
<div id="upgrade-banner"
26
-
hx-get="/knots/upgradeBanner"
27
-
hx-trigger="load"
28
-
hx-swap="innerHTML">
29
-
</div>
30
-
{{ end }}
31
-
{{ end }}
32
-
33
-
{{ define "newButton" }}
34
-
<details class="relative inline-block text-left nav-dropdown">
35
-
<summary class="btn-create py-0 cursor-pointer list-none flex items-center gap-2">
36
-
{{ i "plus" "w-4 h-4" }} new
37
-
</summary>
38
-
<div class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700">
39
-
<a href="/repo/new" class="flex items-center gap-2">
40
-
{{ i "book-plus" "w-4 h-4" }}
41
-
new repository
42
-
</a>
43
-
<a href="/strings/new" class="flex items-center gap-2">
44
-
{{ i "line-squiggle" "w-4 h-4" }}
45
-
new string
46
-
</a>
47
-
</div>
48
-
</details>
49
-
{{ end }}
50
-
51
-
{{ define "dropDown" }}
52
-
<details class="relative inline-block text-left nav-dropdown">
53
-
<summary
54
-
class="cursor-pointer list-none flex items-center"
55
-
>
56
-
{{ $user := didOrHandle .Did .Handle }}
57
-
{{ template "user/fragments/picHandle" $user }}
58
-
</summary>
59
-
<div
60
-
class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700"
61
-
>
62
-
<a href="/{{ $user }}">profile</a>
63
-
<a href="/{{ $user }}?tab=repos">repositories</a>
64
-
<a href="/strings/{{ $user }}">strings</a>
65
-
<a href="/knots">knots</a>
66
-
<a href="/spindles">spindles</a>
67
-
<a href="/settings">settings</a>
68
-
<a href="#"
69
-
hx-post="/logout"
70
-
hx-swap="none"
71
-
class="text-red-400 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300">
72
-
logout
73
-
</a>
74
-
</div>
75
-
</details>
76
-
77
-
<script>
78
-
document.addEventListener('click', function(event) {
79
-
const dropdowns = document.querySelectorAll('.nav-dropdown');
80
-
dropdowns.forEach(function(dropdown) {
81
-
if (!dropdown.contains(event.target)) {
82
-
dropdown.removeAttribute('open');
83
-
}
84
-
});
85
-
});
86
-
</script>
87
-
{{ end }}
···
+2
-2
appview/pages/templates/repo/commit.html
+2
-2
appview/pages/templates/repo/commit.html
···
81
82
{{ define "topbarLayout" }}
83
<header class="px-1 col-span-full" style="z-index: 20;">
84
-
{{ template "layouts/topbar" . }}
85
</header>
86
{{ end }}
87
···
106
107
{{ define "footerLayout" }}
108
<footer class="px-1 col-span-full mt-12">
109
-
{{ template "layouts/footer" . }}
110
</footer>
111
{{ end }}
112
···
81
82
{{ define "topbarLayout" }}
83
<header class="px-1 col-span-full" style="z-index: 20;">
84
+
{{ template "layouts/fragments/topbar" . }}
85
</header>
86
{{ end }}
87
···
106
107
{{ define "footerLayout" }}
108
<footer class="px-1 col-span-full mt-12">
109
+
{{ template "layouts/fragments/footer" . }}
110
</footer>
111
{{ end }}
112
+2
-2
appview/pages/templates/repo/compare/compare.html
+2
-2
appview/pages/templates/repo/compare/compare.html
···
12
13
{{ define "topbarLayout" }}
14
<header class="px-1 col-span-full" style="z-index: 20;">
15
-
{{ template "layouts/topbar" . }}
16
</header>
17
{{ end }}
18
···
37
38
{{ define "footerLayout" }}
39
<footer class="px-1 col-span-full mt-12">
40
-
{{ template "layouts/footer" . }}
41
</footer>
42
{{ end }}
43
···
12
13
{{ define "topbarLayout" }}
14
<header class="px-1 col-span-full" style="z-index: 20;">
15
+
{{ template "layouts/fragments/topbar" . }}
16
</header>
17
{{ end }}
18
···
37
38
{{ define "footerLayout" }}
39
<footer class="px-1 col-span-full mt-12">
40
+
{{ template "layouts/fragments/footer" . }}
41
</footer>
42
{{ end }}
43
+4
appview/pages/templates/repo/fragments/duration.html
+4
appview/pages/templates/repo/fragments/duration.html
+4
appview/pages/templates/repo/fragments/shortTime.html
+4
appview/pages/templates/repo/fragments/shortTime.html
+4
appview/pages/templates/repo/fragments/shortTimeAgo.html
+4
appview/pages/templates/repo/fragments/shortTimeAgo.html
-16
appview/pages/templates/repo/fragments/time.html
-16
appview/pages/templates/repo/fragments/time.html
···
1
-
{{ define "repo/fragments/timeWrapper" }}
2
-
<time datetime="{{ .Time | iso8601DateTimeFmt }}" title="{{ .Time | longTimeFmt }}">{{ .Content }}</time>
3
-
{{ end }}
4
-
5
{{ define "repo/fragments/time" }}
6
{{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | relTimeFmt)) }}
7
{{ end }}
8
-
9
-
{{ define "repo/fragments/shortTime" }}
10
-
{{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | shortRelTimeFmt)) }}
11
-
{{ end }}
12
-
13
-
{{ define "repo/fragments/shortTimeAgo" }}
14
-
{{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (print (. | shortRelTimeFmt) " ago")) }}
15
-
{{ end }}
16
-
17
-
{{ define "repo/fragments/duration" }}
18
-
<time datetime="{{ . | iso8601DurationFmt }}" title="{{ . | longDurationFmt }}">{{ . | durationFmt }}</time>
19
-
{{ end }}
+5
appview/pages/templates/repo/fragments/timeWrapper.html
+5
appview/pages/templates/repo/fragments/timeWrapper.html
+1
-1
appview/pages/templates/repo/pulls/fragments/pullStack.html
+1
-1
appview/pages/templates/repo/pulls/fragments/pullStack.html
+1
-1
appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html
+1
-1
appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html
+2
-2
appview/pages/templates/repo/pulls/interdiff.html
+2
-2
appview/pages/templates/repo/pulls/interdiff.html
···
30
31
{{ define "topbarLayout" }}
32
<header class="px-1 col-span-full" style="z-index: 20;">
33
-
{{ template "layouts/topbar" . }}
34
</header>
35
{{ end }}
36
···
55
56
{{ define "footerLayout" }}
57
<footer class="px-1 col-span-full mt-12">
58
-
{{ template "layouts/footer" . }}
59
</footer>
60
{{ end }}
61
···
30
31
{{ define "topbarLayout" }}
32
<header class="px-1 col-span-full" style="z-index: 20;">
33
+
{{ template "layouts/fragments/topbar" . }}
34
</header>
35
{{ end }}
36
···
55
56
{{ define "footerLayout" }}
57
<footer class="px-1 col-span-full mt-12">
58
+
{{ template "layouts/fragments/footer" . }}
59
</footer>
60
{{ end }}
61
+2
-2
appview/pages/templates/repo/pulls/patch.html
+2
-2
appview/pages/templates/repo/pulls/patch.html
···
36
37
{{ define "topbarLayout" }}
38
<header class="px-1 col-span-full" style="z-index: 20;">
39
-
{{ template "layouts/topbar" . }}
40
</header>
41
{{ end }}
42
···
61
62
{{ define "footerLayout" }}
63
<footer class="px-1 col-span-full mt-12">
64
-
{{ template "layouts/footer" . }}
65
</footer>
66
{{ end }}
67
···
36
37
{{ define "topbarLayout" }}
38
<header class="px-1 col-span-full" style="z-index: 20;">
39
+
{{ template "layouts/fragments/topbar" . }}
40
</header>
41
{{ end }}
42
···
61
62
{{ define "footerLayout" }}
63
<footer class="px-1 col-span-full mt-12">
64
+
{{ template "layouts/fragments/footer" . }}
65
</footer>
66
{{ end }}
67
+1
-1
appview/pages/templates/repo/pulls/pulls.html
+1
-1
appview/pages/templates/repo/pulls/pulls.html
···
144
<a href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $pull.PullId }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25">
145
<div class="flex gap-2 items-center px-6">
146
<div class="flex-grow min-w-0 w-full py-2">
147
-
{{ template "repo/pulls/fragments/summarizedHeader" (list $pull $pipeline) }}
148
</div>
149
</div>
150
</a>
···
144
<a href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $pull.PullId }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25">
145
<div class="flex gap-2 items-center px-6">
146
<div class="flex-grow min-w-0 w-full py-2">
147
+
{{ template "repo/pulls/fragments/summarizedPullHeader" (list $pull $pipeline) }}
148
</div>
149
</div>
150
</a>
-4
appview/pages/templates/strings/put.html
-4
appview/pages/templates/strings/put.html
-4
appview/pages/templates/strings/string.html
-4
appview/pages/templates/strings/string.html
···
8
<meta property="og:description" content="{{ .String.Description }}" />
9
{{ end }}
10
11
-
{{ define "topbar" }}
12
-
{{ template "layouts/topbar" $ }}
13
-
{{ end }}
14
-
15
{{ define "content" }}
16
{{ $ownerId := didOrHandle .Owner.DID.String .Owner.Handle.String }}
17
<section id="string-header" class="mb-4 py-2 px-6 dark:text-white">
-4
appview/pages/templates/strings/timeline.html
-4
appview/pages/templates/strings/timeline.html
+4
-16
appview/pages/templates/user/followers.html
+4
-16
appview/pages/templates/user/followers.html
···
1
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} ยท followers {{ end }}
2
3
-
{{ define "extrameta" }}
4
-
<meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}'s followers" />
5
-
<meta property="og:type" content="object" />
6
-
<meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid }}?tab=followers" />
7
-
<meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
8
-
{{ end }}
9
-
10
-
{{ define "content" }}
11
-
<div class="grid grid-cols-1 md:grid-cols-11 gap-4">
12
-
<div class="md:col-span-3 order-1 md:order-1">
13
-
{{ template "user/fragments/profileCard" .Card }}
14
-
</div>
15
-
<div id="all-followers" class="md:col-span-8 order-2 md:order-2">
16
-
{{ block "followers" . }}{{ end }}
17
-
</div>
18
-
</div>
19
{{ end }}
20
21
{{ define "followers" }}
+4
-16
appview/pages/templates/user/following.html
+4
-16
appview/pages/templates/user/following.html
···
1
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} ยท following {{ end }}
2
3
-
{{ define "extrameta" }}
4
-
<meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}'s following" />
5
-
<meta property="og:type" content="object" />
6
-
<meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid }}?tab=following" />
7
-
<meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
8
-
{{ end }}
9
-
10
-
{{ define "content" }}
11
-
<div class="grid grid-cols-1 md:grid-cols-11 gap-4">
12
-
<div class="md:col-span-3 order-1 md:order-1">
13
-
{{ template "user/fragments/profileCard" .Card }}
14
-
</div>
15
-
<div id="all-following" class="md:col-span-8 order-2 md:order-2">
16
-
{{ block "following" . }}{{ end }}
17
-
</div>
18
-
</div>
19
{{ end }}
20
21
{{ define "following" }}
+1
-1
appview/pages/templates/user/fragments/editBio.html
+1
-1
appview/pages/templates/user/fragments/editBio.html
+2
-4
appview/pages/templates/user/fragments/profileCard.html
+2
-4
appview/pages/templates/user/fragments/profileCard.html
···
1
{{ define "user/fragments/profileCard" }}
2
{{ $userIdent := didOrHandle .UserDid .UserHandle }}
3
-
<div class="bg-white dark:bg-gray-800 px-6 py-4 rounded drop-shadow-sm max-h-fit">
4
<div class="grid grid-cols-3 md:grid-cols-1 gap-1 items-center">
5
<div id="avatar" class="col-span-1 flex justify-center items-center">
6
<div class="w-3/4 aspect-square relative">
···
85
<div id="update-profile" class="text-red-400 dark:text-red-500"></div>
86
</div>
87
</div>
88
-
</div>
89
{{ end }}
90
91
{{ define "followerFollowing" }}
···
94
{{ with $root }}
95
<div class="flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full text-sm">
96
<span class="flex-shrink-0">{{ i "users" "size-4" }}</span>
97
-
<span id="followers"><a href="/{{ $userIdent }}?tab=followers">{{ .FollowersCount }} followers</a></span>
98
<span class="select-none after:content-['ยท']"></span>
99
-
<span id="following"><a href="/{{ $userIdent }}?tab=following">{{ .FollowingCount }} following</a></span>
100
</div>
101
{{ end }}
102
{{ end }}
···
1
{{ define "user/fragments/profileCard" }}
2
{{ $userIdent := didOrHandle .UserDid .UserHandle }}
3
<div class="grid grid-cols-3 md:grid-cols-1 gap-1 items-center">
4
<div id="avatar" class="col-span-1 flex justify-center items-center">
5
<div class="w-3/4 aspect-square relative">
···
84
<div id="update-profile" class="text-red-400 dark:text-red-500"></div>
85
</div>
86
</div>
87
{{ end }}
88
89
{{ define "followerFollowing" }}
···
92
{{ with $root }}
93
<div class="flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full text-sm">
94
<span class="flex-shrink-0">{{ i "users" "size-4" }}</span>
95
+
<span id="followers"><a href="/{{ $userIdent }}?tab=followers">{{ .Stats.FollowersCount }} followers</a></span>
96
<span class="select-none after:content-['ยท']"></span>
97
+
<span id="following"><a href="/{{ $userIdent }}?tab=following">{{ .Stats.FollowingCount }} following</a></span>
98
</div>
99
{{ end }}
100
{{ end }}
+258
appview/pages/templates/user/overview.html
+258
appview/pages/templates/user/overview.html
···
···
1
+
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }}{{ end }}
2
+
3
+
{{ define "profileContent" }}
4
+
<div id="all-repos" class="md:col-span-4 order-2 md:order-2">
5
+
<div class="grid grid-cols-1 gap-4">
6
+
{{ block "ownRepos" . }}{{ end }}
7
+
{{ block "collaboratingRepos" . }}{{ end }}
8
+
</div>
9
+
</div>
10
+
<div class="md:col-span-4 order-3 md:order-3">
11
+
{{ block "profileTimeline" . }}{{ end }}
12
+
</div>
13
+
{{ end }}
14
+
15
+
{{ define "profileTimeline" }}
16
+
<p class="text-sm font-bold px-2 pb-4 dark:text-white">ACTIVITY</p>
17
+
<div class="flex flex-col gap-4 relative">
18
+
{{ if .ProfileTimeline.IsEmpty }}
19
+
<p class="dark:text-white">This user does not have any activity yet.</p>
20
+
{{ end }}
21
+
22
+
{{ with .ProfileTimeline }}
23
+
{{ range $idx, $byMonth := .ByMonth }}
24
+
{{ with $byMonth }}
25
+
{{ if not .IsEmpty }}
26
+
<div class="border border-gray-200 dark:border-gray-700 rounded-sm py-4 px-6">
27
+
<p class="text-sm font-mono mb-2 text-gray-500 dark:text-gray-400">
28
+
{{ if eq $idx 0 }}
29
+
this month
30
+
{{ else }}
31
+
{{$idx}} month{{if ne $idx 1}}s{{end}} ago
32
+
{{ end }}
33
+
</p>
34
+
35
+
<div class="flex flex-col gap-1">
36
+
{{ block "repoEvents" .RepoEvents }} {{ end }}
37
+
{{ block "issueEvents" .IssueEvents }} {{ end }}
38
+
{{ block "pullEvents" .PullEvents }} {{ end }}
39
+
</div>
40
+
</div>
41
+
{{ end }}
42
+
{{ end }}
43
+
{{ end }}
44
+
{{ end }}
45
+
</div>
46
+
{{ end }}
47
+
48
+
{{ define "repoEvents" }}
49
+
{{ if gt (len .) 0 }}
50
+
<details>
51
+
<summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">
52
+
<div class="flex flex-wrap items-center gap-2">
53
+
{{ i "book-plus" "w-4 h-4" }}
54
+
created {{ len . }} {{if eq (len .) 1 }}repository{{else}}repositories{{end}}
55
+
</div>
56
+
</summary>
57
+
<div class="py-2 text-sm flex flex-col gap-3 mb-2">
58
+
{{ range . }}
59
+
<div class="flex flex-wrap items-center gap-2">
60
+
<span class="text-gray-500 dark:text-gray-400">
61
+
{{ if .Source }}
62
+
{{ i "git-fork" "w-4 h-4" }}
63
+
{{ else }}
64
+
{{ i "book-plus" "w-4 h-4" }}
65
+
{{ end }}
66
+
</span>
67
+
<a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">
68
+
{{- .Repo.Name -}}
69
+
</a>
70
+
</div>
71
+
{{ end }}
72
+
</div>
73
+
</details>
74
+
{{ end }}
75
+
{{ end }}
76
+
77
+
{{ define "issueEvents" }}
78
+
{{ $items := .Items }}
79
+
{{ $stats := .Stats }}
80
+
81
+
{{ if gt (len $items) 0 }}
82
+
<details>
83
+
<summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">
84
+
<div class="flex flex-wrap items-center gap-2">
85
+
{{ i "circle-dot" "w-4 h-4" }}
86
+
87
+
<div>
88
+
created {{ len $items }} {{if eq (len $items) 1 }}issue{{else}}issues{{end}}
89
+
</div>
90
+
91
+
{{ if gt $stats.Open 0 }}
92
+
<span class="px-2 py-1/2 text-sm rounded text-white bg-green-600 dark:bg-green-700">
93
+
{{$stats.Open}} open
94
+
</span>
95
+
{{ end }}
96
+
97
+
{{ if gt $stats.Closed 0 }}
98
+
<span class="px-2 py-1/2 text-sm rounded text-white bg-gray-800 dark:bg-gray-700">
99
+
{{$stats.Closed}} closed
100
+
</span>
101
+
{{ end }}
102
+
103
+
</div>
104
+
</summary>
105
+
<div class="py-2 text-sm flex flex-col gap-3 mb-2">
106
+
{{ range $items }}
107
+
{{ $repoOwner := resolve .Metadata.Repo.Did }}
108
+
{{ $repoName := .Metadata.Repo.Name }}
109
+
{{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}
110
+
111
+
<div class="flex gap-2 text-gray-600 dark:text-gray-300">
112
+
{{ if .Open }}
113
+
<span class="text-green-600 dark:text-green-500">
114
+
{{ i "circle-dot" "w-4 h-4" }}
115
+
</span>
116
+
{{ else }}
117
+
<span class="text-gray-500 dark:text-gray-400">
118
+
{{ i "ban" "w-4 h-4" }}
119
+
</span>
120
+
{{ end }}
121
+
<div class="flex-none min-w-8 text-right">
122
+
<span class="text-gray-500 dark:text-gray-400">#{{ .IssueId }}</span>
123
+
</div>
124
+
<div class="break-words max-w-full">
125
+
<a href="/{{$repoUrl}}/issues/{{ .IssueId }}" class="no-underline hover:underline">
126
+
{{ .Title -}}
127
+
</a>
128
+
on
129
+
<a href="/{{$repoUrl}}" class="no-underline hover:underline whitespace-nowrap">
130
+
{{$repoUrl}}
131
+
</a>
132
+
</div>
133
+
</div>
134
+
{{ end }}
135
+
</div>
136
+
</details>
137
+
{{ end }}
138
+
{{ end }}
139
+
140
+
{{ define "pullEvents" }}
141
+
{{ $items := .Items }}
142
+
{{ $stats := .Stats }}
143
+
{{ if gt (len $items) 0 }}
144
+
<details>
145
+
<summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">
146
+
<div class="flex flex-wrap items-center gap-2">
147
+
{{ i "git-pull-request" "w-4 h-4" }}
148
+
149
+
<div>
150
+
created {{ len $items }} {{if eq (len $items) 1 }}pull request{{else}}pull requests{{end}}
151
+
</div>
152
+
153
+
{{ if gt $stats.Open 0 }}
154
+
<span class="px-2 py-1/2 text-sm rounded text-white bg-green-600 dark:bg-green-700">
155
+
{{$stats.Open}} open
156
+
</span>
157
+
{{ end }}
158
+
159
+
{{ if gt $stats.Merged 0 }}
160
+
<span class="px-2 py-1/2 text-sm rounded text-white bg-purple-600 dark:bg-purple-700">
161
+
{{$stats.Merged}} merged
162
+
</span>
163
+
{{ end }}
164
+
165
+
166
+
{{ if gt $stats.Closed 0 }}
167
+
<span class="px-2 py-1/2 text-sm rounded text-white bg-gray-800 dark:bg-gray-700">
168
+
{{$stats.Closed}} closed
169
+
</span>
170
+
{{ end }}
171
+
172
+
</div>
173
+
</summary>
174
+
<div class="py-2 text-sm flex flex-col gap-3 mb-2">
175
+
{{ range $items }}
176
+
{{ $repoOwner := resolve .Repo.Did }}
177
+
{{ $repoName := .Repo.Name }}
178
+
{{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}
179
+
180
+
<div class="flex gap-2 text-gray-600 dark:text-gray-300">
181
+
{{ if .State.IsOpen }}
182
+
<span class="text-green-600 dark:text-green-500">
183
+
{{ i "git-pull-request" "w-4 h-4" }}
184
+
</span>
185
+
{{ else if .State.IsMerged }}
186
+
<span class="text-purple-600 dark:text-purple-500">
187
+
{{ i "git-merge" "w-4 h-4" }}
188
+
</span>
189
+
{{ else }}
190
+
<span class="text-gray-600 dark:text-gray-300">
191
+
{{ i "git-pull-request-closed" "w-4 h-4" }}
192
+
</span>
193
+
{{ end }}
194
+
<div class="flex-none min-w-8 text-right">
195
+
<span class="text-gray-500 dark:text-gray-400">#{{ .PullId }}</span>
196
+
</div>
197
+
<div class="break-words max-w-full">
198
+
<a href="/{{$repoUrl}}/pulls/{{ .PullId }}" class="no-underline hover:underline">
199
+
{{ .Title -}}
200
+
</a>
201
+
on
202
+
<a href="/{{$repoUrl}}" class="no-underline hover:underline whitespace-nowrap">
203
+
{{$repoUrl}}
204
+
</a>
205
+
</div>
206
+
</div>
207
+
{{ end }}
208
+
</div>
209
+
</details>
210
+
{{ end }}
211
+
{{ end }}
212
+
213
+
{{ define "ownRepos" }}
214
+
<div>
215
+
<div class="text-sm font-bold px-2 pb-4 dark:text-white flex items-center gap-2">
216
+
<a href="/@{{ or $.Card.UserHandle $.Card.UserDid }}?tab=repos"
217
+
class="flex text-black dark:text-white items-center gap-2 no-underline hover:no-underline group">
218
+
<span>PINNED REPOS</span>
219
+
</a>
220
+
{{ if and .LoggedInUser (eq .LoggedInUser.Did .Card.UserDid) }}
221
+
<button
222
+
hx-get="profile/edit-pins"
223
+
hx-target="#all-repos"
224
+
class="py-0 font-normal text-sm flex gap-2 items-center group">
225
+
{{ i "pencil" "w-3 h-3" }}
226
+
{{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
227
+
</button>
228
+
{{ end }}
229
+
</div>
230
+
<div id="repos" class="grid grid-cols-1 gap-4 items-stretch">
231
+
{{ range .Repos }}
232
+
<div class="border border-gray-200 dark:border-gray-700 rounded-sm">
233
+
{{ template "user/fragments/repoCard" (list $ . false) }}
234
+
</div>
235
+
{{ else }}
236
+
<p class="dark:text-white">This user does not have any pinned repos.</p>
237
+
{{ end }}
238
+
</div>
239
+
</div>
240
+
{{ end }}
241
+
242
+
{{ define "collaboratingRepos" }}
243
+
{{ if gt (len .CollaboratingRepos) 0 }}
244
+
<div>
245
+
<p class="text-sm font-bold px-2 pb-4 dark:text-white">COLLABORATING ON</p>
246
+
<div id="collaborating" class="grid grid-cols-1 gap-4">
247
+
{{ range .CollaboratingRepos }}
248
+
<div class="border border-gray-200 dark:border-gray-700 rounded-sm">
249
+
{{ template "user/fragments/repoCard" (list $ . true) }}
250
+
</div>
251
+
{{ else }}
252
+
<p class="px-6 dark:text-white">This user is not collaborating.</p>
253
+
{{ end }}
254
+
</div>
255
+
</div>
256
+
{{ end }}
257
+
{{ end }}
258
+
-318
appview/pages/templates/user/profile.html
-318
appview/pages/templates/user/profile.html
···
1
-
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }}{{ end }}
2
-
3
-
{{ define "extrameta" }}
4
-
<meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}" />
5
-
<meta property="og:type" content="profile" />
6
-
<meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid }}" />
7
-
<meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
8
-
{{ end }}
9
-
10
-
{{ define "content" }}
11
-
<div class="grid grid-cols-1 md:grid-cols-11 gap-4">
12
-
<div class="md:col-span-3 order-1 md:order-1">
13
-
<div class="grid grid-cols-1 gap-4">
14
-
{{ template "user/fragments/profileCard" .Card }}
15
-
{{ block "punchcard" .Punchcard }} {{ end }}
16
-
</div>
17
-
</div>
18
-
<div id="all-repos" class="md:col-span-4 order-2 md:order-2">
19
-
<div class="grid grid-cols-1 gap-4">
20
-
{{ block "ownRepos" . }}{{ end }}
21
-
{{ block "collaboratingRepos" . }}{{ end }}
22
-
</div>
23
-
</div>
24
-
<div class="md:col-span-4 order-3 md:order-3">
25
-
{{ block "profileTimeline" . }}{{ end }}
26
-
</div>
27
-
</div>
28
-
{{ end }}
29
-
30
-
{{ define "profileTimeline" }}
31
-
<p class="text-sm font-bold p-2 dark:text-white">ACTIVITY</p>
32
-
<div class="flex flex-col gap-4 relative">
33
-
{{ with .ProfileTimeline }}
34
-
{{ range $idx, $byMonth := .ByMonth }}
35
-
{{ with $byMonth }}
36
-
<div class="bg-white dark:bg-gray-800 px-6 py-4 rounded drop-shadow-sm">
37
-
{{ if eq $idx 0 }}
38
-
39
-
{{ else }}
40
-
{{ $s := "s" }}
41
-
{{ if eq $idx 1 }}
42
-
{{ $s = "" }}
43
-
{{ end }}
44
-
<p class="text-sm font-bold dark:text-white mb-2">{{$idx}} month{{$s}} ago</p>
45
-
{{ end }}
46
-
47
-
{{ if .IsEmpty }}
48
-
<div class="text-gray-500 dark:text-gray-400">
49
-
No activity for this month
50
-
</div>
51
-
{{ else }}
52
-
<div class="flex flex-col gap-1">
53
-
{{ block "repoEvents" .RepoEvents }} {{ end }}
54
-
{{ block "issueEvents" .IssueEvents }} {{ end }}
55
-
{{ block "pullEvents" .PullEvents }} {{ end }}
56
-
</div>
57
-
{{ end }}
58
-
</div>
59
-
60
-
{{ end }}
61
-
{{ else }}
62
-
<p class="dark:text-white">This user does not have any activity yet.</p>
63
-
{{ end }}
64
-
{{ end }}
65
-
</div>
66
-
{{ end }}
67
-
68
-
{{ define "repoEvents" }}
69
-
{{ if gt (len .) 0 }}
70
-
<details>
71
-
<summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">
72
-
<div class="flex flex-wrap items-center gap-2">
73
-
{{ i "book-plus" "w-4 h-4" }}
74
-
created {{ len . }} {{if eq (len .) 1 }}repository{{else}}repositories{{end}}
75
-
</div>
76
-
</summary>
77
-
<div class="py-2 text-sm flex flex-col gap-3 mb-2">
78
-
{{ range . }}
79
-
<div class="flex flex-wrap items-center gap-2">
80
-
<span class="text-gray-500 dark:text-gray-400">
81
-
{{ if .Source }}
82
-
{{ i "git-fork" "w-4 h-4" }}
83
-
{{ else }}
84
-
{{ i "book-plus" "w-4 h-4" }}
85
-
{{ end }}
86
-
</span>
87
-
<a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">
88
-
{{- .Repo.Name -}}
89
-
</a>
90
-
</div>
91
-
{{ end }}
92
-
</div>
93
-
</details>
94
-
{{ end }}
95
-
{{ end }}
96
-
97
-
{{ define "issueEvents" }}
98
-
{{ $items := .Items }}
99
-
{{ $stats := .Stats }}
100
-
101
-
{{ if gt (len $items) 0 }}
102
-
<details>
103
-
<summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">
104
-
<div class="flex flex-wrap items-center gap-2">
105
-
{{ i "circle-dot" "w-4 h-4" }}
106
-
107
-
<div>
108
-
created {{ len $items }} {{if eq (len $items) 1 }}issue{{else}}issues{{end}}
109
-
</div>
110
-
111
-
{{ if gt $stats.Open 0 }}
112
-
<span class="px-2 py-1/2 text-sm rounded text-white bg-green-600 dark:bg-green-700">
113
-
{{$stats.Open}} open
114
-
</span>
115
-
{{ end }}
116
-
117
-
{{ if gt $stats.Closed 0 }}
118
-
<span class="px-2 py-1/2 text-sm rounded text-white bg-gray-800 dark:bg-gray-700">
119
-
{{$stats.Closed}} closed
120
-
</span>
121
-
{{ end }}
122
-
123
-
</div>
124
-
</summary>
125
-
<div class="py-2 text-sm flex flex-col gap-3 mb-2">
126
-
{{ range $items }}
127
-
{{ $repoOwner := resolve .Metadata.Repo.Did }}
128
-
{{ $repoName := .Metadata.Repo.Name }}
129
-
{{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}
130
-
131
-
<div class="flex gap-2 text-gray-600 dark:text-gray-300">
132
-
{{ if .Open }}
133
-
<span class="text-green-600 dark:text-green-500">
134
-
{{ i "circle-dot" "w-4 h-4" }}
135
-
</span>
136
-
{{ else }}
137
-
<span class="text-gray-500 dark:text-gray-400">
138
-
{{ i "ban" "w-4 h-4" }}
139
-
</span>
140
-
{{ end }}
141
-
<div class="flex-none min-w-8 text-right">
142
-
<span class="text-gray-500 dark:text-gray-400">#{{ .IssueId }}</span>
143
-
</div>
144
-
<div class="break-words max-w-full">
145
-
<a href="/{{$repoUrl}}/issues/{{ .IssueId }}" class="no-underline hover:underline">
146
-
{{ .Title -}}
147
-
</a>
148
-
on
149
-
<a href="/{{$repoUrl}}" class="no-underline hover:underline whitespace-nowrap">
150
-
{{$repoUrl}}
151
-
</a>
152
-
</div>
153
-
</div>
154
-
{{ end }}
155
-
</div>
156
-
</details>
157
-
{{ end }}
158
-
{{ end }}
159
-
160
-
{{ define "pullEvents" }}
161
-
{{ $items := .Items }}
162
-
{{ $stats := .Stats }}
163
-
{{ if gt (len $items) 0 }}
164
-
<details>
165
-
<summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">
166
-
<div class="flex flex-wrap items-center gap-2">
167
-
{{ i "git-pull-request" "w-4 h-4" }}
168
-
169
-
<div>
170
-
created {{ len $items }} {{if eq (len $items) 1 }}pull request{{else}}pull requests{{end}}
171
-
</div>
172
-
173
-
{{ if gt $stats.Open 0 }}
174
-
<span class="px-2 py-1/2 text-sm rounded text-white bg-green-600 dark:bg-green-700">
175
-
{{$stats.Open}} open
176
-
</span>
177
-
{{ end }}
178
-
179
-
{{ if gt $stats.Merged 0 }}
180
-
<span class="px-2 py-1/2 text-sm rounded text-white bg-purple-600 dark:bg-purple-700">
181
-
{{$stats.Merged}} merged
182
-
</span>
183
-
{{ end }}
184
-
185
-
186
-
{{ if gt $stats.Closed 0 }}
187
-
<span class="px-2 py-1/2 text-sm rounded text-white bg-gray-800 dark:bg-gray-700">
188
-
{{$stats.Closed}} closed
189
-
</span>
190
-
{{ end }}
191
-
192
-
</div>
193
-
</summary>
194
-
<div class="py-2 text-sm flex flex-col gap-3 mb-2">
195
-
{{ range $items }}
196
-
{{ $repoOwner := resolve .Repo.Did }}
197
-
{{ $repoName := .Repo.Name }}
198
-
{{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}
199
-
200
-
<div class="flex gap-2 text-gray-600 dark:text-gray-300">
201
-
{{ if .State.IsOpen }}
202
-
<span class="text-green-600 dark:text-green-500">
203
-
{{ i "git-pull-request" "w-4 h-4" }}
204
-
</span>
205
-
{{ else if .State.IsMerged }}
206
-
<span class="text-purple-600 dark:text-purple-500">
207
-
{{ i "git-merge" "w-4 h-4" }}
208
-
</span>
209
-
{{ else }}
210
-
<span class="text-gray-600 dark:text-gray-300">
211
-
{{ i "git-pull-request-closed" "w-4 h-4" }}
212
-
</span>
213
-
{{ end }}
214
-
<div class="flex-none min-w-8 text-right">
215
-
<span class="text-gray-500 dark:text-gray-400">#{{ .PullId }}</span>
216
-
</div>
217
-
<div class="break-words max-w-full">
218
-
<a href="/{{$repoUrl}}/pulls/{{ .PullId }}" class="no-underline hover:underline">
219
-
{{ .Title -}}
220
-
</a>
221
-
on
222
-
<a href="/{{$repoUrl}}" class="no-underline hover:underline whitespace-nowrap">
223
-
{{$repoUrl}}
224
-
</a>
225
-
</div>
226
-
</div>
227
-
{{ end }}
228
-
</div>
229
-
</details>
230
-
{{ end }}
231
-
{{ end }}
232
-
233
-
{{ define "ownRepos" }}
234
-
<div>
235
-
<div class="text-sm font-bold p-2 pr-0 dark:text-white flex items-center justify-between gap-2">
236
-
<a href="/@{{ or $.Card.UserHandle $.Card.UserDid }}?tab=repos"
237
-
class="flex text-black dark:text-white items-center gap-2 no-underline hover:no-underline group">
238
-
<span>PINNED REPOS</span>
239
-
<span class="flex gap-1 items-center font-normal text-sm text-gray-500 dark:text-gray-400 ">
240
-
view all {{ i "chevron-right" "w-4 h-4" }}
241
-
</span>
242
-
</a>
243
-
{{ if and .LoggedInUser (eq .LoggedInUser.Did .Card.UserDid) }}
244
-
<button
245
-
hx-get="profile/edit-pins"
246
-
hx-target="#all-repos"
247
-
class="btn py-0 font-normal text-sm flex gap-2 items-center group">
248
-
{{ i "pencil" "w-3 h-3" }}
249
-
edit
250
-
{{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
251
-
</button>
252
-
{{ end }}
253
-
</div>
254
-
<div id="repos" class="grid grid-cols-1 gap-4 items-stretch">
255
-
{{ range .Repos }}
256
-
{{ template "user/fragments/repoCard" (list $ . false) }}
257
-
{{ else }}
258
-
<p class="px-6 dark:text-white">This user does not have any repos yet.</p>
259
-
{{ end }}
260
-
</div>
261
-
</div>
262
-
{{ end }}
263
-
264
-
{{ define "collaboratingRepos" }}
265
-
{{ if gt (len .CollaboratingRepos) 0 }}
266
-
<div>
267
-
<p class="text-sm font-bold p-2 dark:text-white">COLLABORATING ON</p>
268
-
<div id="collaborating" class="grid grid-cols-1 gap-4">
269
-
{{ range .CollaboratingRepos }}
270
-
{{ template "user/fragments/repoCard" (list $ . true) }}
271
-
{{ else }}
272
-
<p class="px-6 dark:text-white">This user is not collaborating.</p>
273
-
{{ end }}
274
-
</div>
275
-
</div>
276
-
{{ end }}
277
-
{{ end }}
278
-
279
-
{{ define "punchcard" }}
280
-
{{ $now := now }}
281
-
<div>
282
-
<p class="p-2 flex gap-2 text-sm font-bold dark:text-white">
283
-
PUNCHCARD
284
-
<span class="font-normal text-sm text-gray-500 dark:text-gray-400 ">
285
-
{{ .Total | int64 | commaFmt }} commits
286
-
</span>
287
-
</p>
288
-
<div class="bg-white dark:bg-gray-800 px-6 py-4 rounded drop-shadow-sm">
289
-
<div class="grid grid-cols-28 md:grid-cols-14 gap-y-2 w-full h-full">
290
-
{{ range .Punches }}
291
-
{{ $count := .Count }}
292
-
{{ $theme := "bg-gray-200 dark:bg-gray-700 size-[4px]" }}
293
-
{{ if lt $count 1 }}
294
-
{{ $theme = "bg-gray-200 dark:bg-gray-700 size-[4px]" }}
295
-
{{ else if lt $count 2 }}
296
-
{{ $theme = "bg-green-200 dark:bg-green-900 size-[5px]" }}
297
-
{{ else if lt $count 4 }}
298
-
{{ $theme = "bg-green-300 dark:bg-green-800 size-[5px]" }}
299
-
{{ else if lt $count 8 }}
300
-
{{ $theme = "bg-green-400 dark:bg-green-700 size-[6px]" }}
301
-
{{ else }}
302
-
{{ $theme = "bg-green-500 dark:bg-green-600 size-[7px]" }}
303
-
{{ end }}
304
-
305
-
{{ if .Date.After $now }}
306
-
{{ $theme = "border border-gray-200 dark:border-gray-700 size-[4px]" }}
307
-
{{ end }}
308
-
<div class="w-full h-full flex justify-center items-center">
309
-
<div
310
-
class="aspect-square rounded-full transition-all duration-300 {{ $theme }} max-w-full max-h-full"
311
-
title="{{ .Date.Format "2006-01-02" }}: {{ .Count }} commits">
312
-
</div>
313
-
</div>
314
-
{{ end }}
315
-
</div>
316
-
</div>
317
-
</div>
318
-
{{ end }}
···
+7
-18
appview/pages/templates/user/repos.html
+7
-18
appview/pages/templates/user/repos.html
···
1
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} ยท repos {{ end }}
2
3
-
{{ define "extrameta" }}
4
-
<meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}'s repos" />
5
-
<meta property="og:type" content="object" />
6
-
<meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid }}?tab=repos" />
7
-
<meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
8
-
{{ end }}
9
-
10
-
{{ define "content" }}
11
-
<div class="grid grid-cols-1 md:grid-cols-11 gap-4">
12
-
<div class="md:col-span-3 order-1 md:order-1">
13
-
{{ template "user/fragments/profileCard" .Card }}
14
-
</div>
15
-
<div id="all-repos" class="md:col-span-8 order-2 md:order-2">
16
-
{{ block "ownRepos" . }}{{ end }}
17
-
</div>
18
-
</div>
19
{{ end }}
20
21
{{ define "ownRepos" }}
22
-
<p class="text-sm font-bold p-2 dark:text-white">ALL REPOSITORIES</p>
23
<div id="repos" class="grid grid-cols-1 gap-4 mb-6">
24
{{ range .Repos }}
25
-
{{ template "user/fragments/repoCard" (list $ . false) }}
26
{{ else }}
27
<p class="px-6 dark:text-white">This user does not have any repos yet.</p>
28
{{ end }}
···
1
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} ยท repos {{ end }}
2
3
+
{{ define "profileContent" }}
4
+
<div id="all-repos" class="md:col-span-8 order-2 md:order-2">
5
+
{{ block "ownRepos" . }}{{ end }}
6
+
</div>
7
{{ end }}
8
9
{{ define "ownRepos" }}
10
<div id="repos" class="grid grid-cols-1 gap-4 mb-6">
11
{{ range .Repos }}
12
+
<div class="border border-gray-200 dark:border-gray-700 rounded-sm">
13
+
{{ template "user/fragments/repoCard" (list $ . false) }}
14
+
</div>
15
{{ else }}
16
<p class="px-6 dark:text-white">This user does not have any repos yet.</p>
17
{{ end }}
+19
appview/pages/templates/user/starred.html
+19
appview/pages/templates/user/starred.html
···
···
1
+
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} ยท repos {{ end }}
2
+
3
+
{{ define "profileContent" }}
4
+
<div id="all-repos" class="md:col-span-8 order-2 md:order-2">
5
+
{{ block "starredRepos" . }}{{ end }}
6
+
</div>
7
+
{{ end }}
8
+
9
+
{{ define "starredRepos" }}
10
+
<div id="repos" class="grid grid-cols-1 gap-4 mb-6">
11
+
{{ range .Repos }}
12
+
<div class="border border-gray-200 dark:border-gray-700 rounded-sm">
13
+
{{ template "user/fragments/repoCard" (list $ . true) }}
14
+
</div>
15
+
{{ else }}
16
+
<p class="px-6 dark:text-white">This user does not have any starred repos yet.</p>
17
+
{{ end }}
18
+
</div>
19
+
{{ end }}
+45
appview/pages/templates/user/strings.html
+45
appview/pages/templates/user/strings.html
···
···
1
+
{{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} ยท strings {{ end }}
2
+
3
+
{{ define "profileContent" }}
4
+
<div id="all-strings" class="md:col-span-8 order-2 md:order-2">
5
+
{{ block "allStrings" . }}{{ end }}
6
+
</div>
7
+
{{ end }}
8
+
9
+
{{ define "allStrings" }}
10
+
<div id="strings" class="grid grid-cols-1 gap-4 mb-6">
11
+
{{ range .Strings }}
12
+
<div class="border border-gray-200 dark:border-gray-700 rounded-sm">
13
+
{{ template "singleString" (list $ .) }}
14
+
</div>
15
+
{{ else }}
16
+
<p class="px-6 dark:text-white">This user does not have any strings yet.</p>
17
+
{{ end }}
18
+
</div>
19
+
{{ end }}
20
+
21
+
{{ define "singleString" }}
22
+
{{ $root := index . 0 }}
23
+
{{ $s := index . 1 }}
24
+
<div class="py-4 px-6 rounded bg-white dark:bg-gray-800">
25
+
<div class="font-medium dark:text-white flex gap-2 items-center">
26
+
<a href="/strings/{{ or $root.Card.UserHandle $root.Card.UserDid }}/{{ $s.Rkey }}">{{ $s.Filename }}</a>
27
+
</div>
28
+
{{ with $s.Description }}
29
+
<div class="text-gray-600 dark:text-gray-300 text-sm">
30
+
{{ . }}
31
+
</div>
32
+
{{ end }}
33
+
34
+
{{ $stat := $s.Stats }}
35
+
<div class="text-gray-400 pt-4 text-sm font-mono inline-flex gap-2 mt-auto">
36
+
<span>{{ $stat.LineCount }} line{{if ne $stat.LineCount 1}}s{{end}}</span>
37
+
<span class="select-none [&:before]:content-['ยท']"></span>
38
+
{{ with $s.Edited }}
39
+
<span>edited {{ template "repo/fragments/shortTimeAgo" . }}</span>
40
+
{{ else }}
41
+
{{ template "repo/fragments/shortTimeAgo" $s.Created }}
42
+
{{ end }}
43
+
</div>
44
+
</div>
45
+
{{ end }}
+191
-132
appview/state/profile.go
+191
-132
appview/state/profile.go
···
17
"github.com/gorilla/feeds"
18
"tangled.sh/tangled.sh/core/api/tangled"
19
"tangled.sh/tangled.sh/core/appview/db"
20
-
"tangled.sh/tangled.sh/core/appview/oauth"
21
"tangled.sh/tangled.sh/core/appview/pages"
22
)
23
24
func (s *State) Profile(w http.ResponseWriter, r *http.Request) {
25
tabVal := r.URL.Query().Get("tab")
26
switch tabVal {
27
-
case "":
28
-
s.profileHomePage(w, r)
29
case "repos":
30
s.reposPage(w, r)
31
case "followers":
32
s.followersPage(w, r)
33
case "following":
34
s.followingPage(w, r)
35
}
36
}
37
38
-
type ProfilePageParams struct {
39
-
Id identity.Identity
40
-
LoggedInUser *oauth.User
41
-
Card pages.ProfileCard
42
-
}
43
-
44
-
func (s *State) profilePage(w http.ResponseWriter, r *http.Request) *ProfilePageParams {
45
didOrHandle := chi.URLParam(r, "user")
46
if didOrHandle == "" {
47
-
http.Error(w, "bad request", http.StatusBadRequest)
48
-
return nil
49
}
50
51
ident, ok := r.Context().Value("resolvedId").(identity.Identity)
52
if !ok {
53
-
log.Printf("malformed middleware")
54
-
w.WriteHeader(http.StatusInternalServerError)
55
-
return nil
56
}
57
did := ident.DID.String()
58
59
profile, err := db.GetProfile(s.db, did)
60
if err != nil {
61
-
log.Printf("getting profile data for %s: %s", did, err)
62
-
s.pages.Error500(w)
63
-
return nil
64
}
65
66
followStats, err := db.GetFollowerFollowingCount(s.db, did)
67
if err != nil {
68
-
log.Printf("getting follow stats for %s: %s", did, err)
69
}
70
71
loggedInUser := s.oauth.GetUser(r)
···
74
followStatus = db.GetFollowStatus(s.db, loggedInUser.Did, did)
75
}
76
77
-
return &ProfilePageParams{
78
-
Id: ident,
79
-
LoggedInUser: loggedInUser,
80
-
Card: pages.ProfileCard{
81
-
UserDid: did,
82
-
UserHandle: ident.Handle.String(),
83
-
Profile: profile,
84
-
FollowStatus: followStatus,
85
FollowersCount: followStats.Followers,
86
FollowingCount: followStats.Following,
87
},
88
-
}
89
}
90
91
-
func (s *State) profileHomePage(w http.ResponseWriter, r *http.Request) {
92
-
pageWithProfile := s.profilePage(w, r)
93
-
if pageWithProfile == nil {
94
return
95
}
96
97
-
id := pageWithProfile.Id
98
repos, err := db.GetRepos(
99
s.db,
100
0,
101
-
db.FilterEq("did", id.DID),
102
)
103
if err != nil {
104
-
log.Printf("getting repos for %s: %s", id.DID, err)
105
}
106
107
-
profile := pageWithProfile.Card.Profile
108
// filter out ones that are pinned
109
pinnedRepos := []db.Repo{}
110
for i, r := range repos {
111
// if this is a pinned repo, add it
112
-
if slices.Contains(profile.PinnedRepos[:], r.RepoAt()) {
113
pinnedRepos = append(pinnedRepos, r)
114
}
115
116
// if there are no saved pins, add the first 4 repos
117
-
if profile.IsPinnedReposEmpty() && i < 4 {
118
pinnedRepos = append(pinnedRepos, r)
119
}
120
}
121
122
-
collaboratingRepos, err := db.CollaboratingIn(s.db, id.DID.String())
123
if err != nil {
124
-
log.Printf("getting collaborating repos for %s: %s", id.DID, err)
125
}
126
127
pinnedCollaboratingRepos := []db.Repo{}
128
for _, r := range collaboratingRepos {
129
// if this is a pinned repo, add it
130
-
if slices.Contains(profile.PinnedRepos[:], r.RepoAt()) {
131
pinnedCollaboratingRepos = append(pinnedCollaboratingRepos, r)
132
}
133
}
134
135
-
timeline, err := db.MakeProfileTimeline(s.db, id.DID.String())
136
if err != nil {
137
-
log.Printf("failed to create profile timeline for %s: %s", id.DID, err)
138
}
139
140
-
var didsToResolve []string
141
-
for _, r := range collaboratingRepos {
142
-
didsToResolve = append(didsToResolve, r.Did)
143
-
}
144
-
for _, byMonth := range timeline.ByMonth {
145
-
for _, pe := range byMonth.PullEvents.Items {
146
-
didsToResolve = append(didsToResolve, pe.Repo.Did)
147
-
}
148
-
for _, ie := range byMonth.IssueEvents.Items {
149
-
didsToResolve = append(didsToResolve, ie.Metadata.Repo.Did)
150
-
}
151
-
for _, re := range byMonth.RepoEvents {
152
-
didsToResolve = append(didsToResolve, re.Repo.Did)
153
-
if re.Source != nil {
154
-
didsToResolve = append(didsToResolve, re.Source.Did)
155
-
}
156
-
}
157
}
158
159
-
now := time.Now()
160
-
startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)
161
-
punchcard, err := db.MakePunchcard(
162
s.db,
163
-
db.FilterEq("did", id.DID),
164
-
db.FilterGte("date", startOfYear.Format(time.DateOnly)),
165
-
db.FilterLte("date", now.Format(time.DateOnly)),
166
)
167
if err != nil {
168
-
log.Println("failed to get punchcard for did", "did", id.DID, "err", err)
169
}
170
171
-
s.pages.ProfileHomePage(w, pages.ProfileHomePageParams{
172
-
LoggedInUser: pageWithProfile.LoggedInUser,
173
-
Repos: pinnedRepos,
174
-
CollaboratingRepos: pinnedCollaboratingRepos,
175
-
Card: pageWithProfile.Card,
176
-
Punchcard: punchcard,
177
-
ProfileTimeline: timeline,
178
})
179
}
180
181
-
func (s *State) reposPage(w http.ResponseWriter, r *http.Request) {
182
-
pageWithProfile := s.profilePage(w, r)
183
-
if pageWithProfile == nil {
184
return
185
}
186
187
-
id := pageWithProfile.Id
188
repos, err := db.GetRepos(
189
s.db,
190
0,
191
-
db.FilterEq("did", id.DID),
192
)
193
if err != nil {
194
-
log.Printf("getting repos for %s: %s", id.DID, err)
195
}
196
197
-
s.pages.ReposPage(w, pages.ReposPageParams{
198
-
LoggedInUser: pageWithProfile.LoggedInUser,
199
Repos: repos,
200
-
Card: pageWithProfile.Card,
201
})
202
}
203
204
type FollowsPageParams struct {
205
-
LoggedInUser *oauth.User
206
-
Follows []pages.FollowCard
207
-
Card pages.ProfileCard
208
}
209
210
-
func (s *State) followPage(w http.ResponseWriter, r *http.Request, fetchFollows func(db.Execer, string) ([]db.Follow, error), extractDid func(db.Follow) string) (FollowsPageParams, error) {
211
-
pageWithProfile := s.profilePage(w, r)
212
-
if pageWithProfile == nil {
213
-
return FollowsPageParams{}, nil
214
}
215
216
-
id := pageWithProfile.Id
217
-
loggedInUser := pageWithProfile.LoggedInUser
218
219
-
follows, err := fetchFollows(s.db, id.DID.String())
220
if err != nil {
221
-
log.Printf("getting followers for %s: %s", id.DID, err)
222
-
return FollowsPageParams{}, err
223
}
224
225
if len(follows) == 0 {
226
-
return FollowsPageParams{
227
-
LoggedInUser: loggedInUser,
228
-
Follows: []pages.FollowCard{},
229
-
Card: pageWithProfile.Card,
230
-
}, nil
231
}
232
233
followDids := make([]string, 0, len(follows))
···
237
238
profiles, err := db.GetProfiles(s.db, db.FilterIn("did", followDids))
239
if err != nil {
240
-
log.Printf("getting profile for %s: %s", followDids, err)
241
-
return FollowsPageParams{}, err
242
}
243
244
followStatsMap, err := db.GetFollowerFollowingCounts(s.db, followDids)
···
246
log.Printf("getting follow counts for %s: %s", followDids, err)
247
}
248
249
-
var loggedInUserFollowing map[string]struct{}
250
if loggedInUser != nil {
251
following, err := db.GetFollowing(s.db, loggedInUser.Did)
252
if err != nil {
253
-
return FollowsPageParams{}, err
254
}
255
-
if len(following) > 0 {
256
-
loggedInUserFollowing = make(map[string]struct{}, len(following))
257
-
for _, follow := range following {
258
-
loggedInUserFollowing[follow.SubjectDid] = struct{}{}
259
-
}
260
}
261
}
262
263
-
followCards := make([]pages.FollowCard, 0, len(follows))
264
-
for _, did := range followDids {
265
-
followStats, exists := followStatsMap[did]
266
-
if !exists {
267
-
followStats = db.FollowStats{}
268
-
}
269
followStatus := db.IsNotFollowing
270
-
if loggedInUserFollowing != nil {
271
-
if _, exists := loggedInUserFollowing[did]; exists {
272
-
followStatus = db.IsFollowing
273
-
} else if loggedInUser.Did == did {
274
-
followStatus = db.IsSelf
275
-
}
276
}
277
var profile *db.Profile
278
if p, exists := profiles[did]; exists {
279
profile = p
···
281
profile = &db.Profile{}
282
profile.Did = did
283
}
284
-
followCards = append(followCards, pages.FollowCard{
285
UserDid: did,
286
FollowStatus: followStatus,
287
FollowersCount: followStats.Followers,
288
FollowingCount: followStats.Following,
289
Profile: profile,
290
-
})
291
}
292
293
-
return FollowsPageParams{
294
-
LoggedInUser: loggedInUser,
295
-
Follows: followCards,
296
-
Card: pageWithProfile.Card,
297
}, nil
298
}
299
300
func (s *State) followersPage(w http.ResponseWriter, r *http.Request) {
301
-
followPage, err := s.followPage(w, r, db.GetFollowers, func(f db.Follow) string { return f.UserDid })
302
if err != nil {
303
s.pages.Notice(w, "all-followers", "Failed to load followers")
304
return
305
}
306
307
-
s.pages.FollowersPage(w, pages.FollowersPageParams{
308
-
LoggedInUser: followPage.LoggedInUser,
309
Followers: followPage.Follows,
310
Card: followPage.Card,
311
})
312
}
313
314
func (s *State) followingPage(w http.ResponseWriter, r *http.Request) {
315
-
followPage, err := s.followPage(w, r, db.GetFollowing, func(f db.Follow) string { return f.SubjectDid })
316
if err != nil {
317
s.pages.Notice(w, "all-following", "Failed to load following")
318
return
319
}
320
321
-
s.pages.FollowingPage(w, pages.FollowingPageParams{
322
-
LoggedInUser: followPage.LoggedInUser,
323
Following: followPage.Follows,
324
Card: followPage.Card,
325
})
···
17
"github.com/gorilla/feeds"
18
"tangled.sh/tangled.sh/core/api/tangled"
19
"tangled.sh/tangled.sh/core/appview/db"
20
+
// "tangled.sh/tangled.sh/core/appview/oauth"
21
"tangled.sh/tangled.sh/core/appview/pages"
22
)
23
24
func (s *State) Profile(w http.ResponseWriter, r *http.Request) {
25
tabVal := r.URL.Query().Get("tab")
26
switch tabVal {
27
case "repos":
28
s.reposPage(w, r)
29
case "followers":
30
s.followersPage(w, r)
31
case "following":
32
s.followingPage(w, r)
33
+
case "starred":
34
+
s.starredPage(w, r)
35
+
case "strings":
36
+
s.stringsPage(w, r)
37
+
default:
38
+
s.profileOverview(w, r)
39
}
40
}
41
42
+
func (s *State) profile(r *http.Request) (*pages.ProfileCard, error) {
43
didOrHandle := chi.URLParam(r, "user")
44
if didOrHandle == "" {
45
+
return nil, fmt.Errorf("empty DID or handle")
46
}
47
48
ident, ok := r.Context().Value("resolvedId").(identity.Identity)
49
if !ok {
50
+
return nil, fmt.Errorf("failed to resolve ID")
51
}
52
did := ident.DID.String()
53
54
profile, err := db.GetProfile(s.db, did)
55
if err != nil {
56
+
return nil, fmt.Errorf("failed to get profile: %w", err)
57
+
}
58
+
59
+
repoCount, err := db.CountRepos(s.db, db.FilterEq("did", did))
60
+
if err != nil {
61
+
return nil, fmt.Errorf("failed to get repo count: %w", err)
62
+
}
63
+
64
+
stringCount, err := db.CountStrings(s.db, db.FilterEq("did", did))
65
+
if err != nil {
66
+
return nil, fmt.Errorf("failed to get string count: %w", err)
67
+
}
68
+
69
+
starredCount, err := db.CountStars(s.db, db.FilterEq("starred_by_did", did))
70
+
if err != nil {
71
+
return nil, fmt.Errorf("failed to get starred repo count: %w", err)
72
}
73
74
followStats, err := db.GetFollowerFollowingCount(s.db, did)
75
if err != nil {
76
+
return nil, fmt.Errorf("failed to get follower stats: %w", err)
77
}
78
79
loggedInUser := s.oauth.GetUser(r)
···
82
followStatus = db.GetFollowStatus(s.db, loggedInUser.Did, did)
83
}
84
85
+
now := time.Now()
86
+
startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)
87
+
punchcard, err := db.MakePunchcard(
88
+
s.db,
89
+
db.FilterEq("did", did),
90
+
db.FilterGte("date", startOfYear.Format(time.DateOnly)),
91
+
db.FilterLte("date", now.Format(time.DateOnly)),
92
+
)
93
+
if err != nil {
94
+
return nil, fmt.Errorf("failed to get punchcard for %s: %w", did, err)
95
+
}
96
+
97
+
return &pages.ProfileCard{
98
+
UserDid: did,
99
+
UserHandle: ident.Handle.String(),
100
+
Profile: profile,
101
+
FollowStatus: followStatus,
102
+
Stats: pages.ProfileStats{
103
+
RepoCount: repoCount,
104
+
StringCount: stringCount,
105
+
StarredCount: starredCount,
106
FollowersCount: followStats.Followers,
107
FollowingCount: followStats.Following,
108
},
109
+
Punchcard: punchcard,
110
+
}, nil
111
}
112
113
+
func (s *State) profileOverview(w http.ResponseWriter, r *http.Request) {
114
+
l := s.logger.With("handler", "profileHomePage")
115
+
116
+
profile, err := s.profile(r)
117
+
if err != nil {
118
+
l.Error("failed to build profile card", "err", err)
119
+
s.pages.Error500(w)
120
return
121
}
122
+
l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
123
124
repos, err := db.GetRepos(
125
s.db,
126
0,
127
+
db.FilterEq("did", profile.UserDid),
128
)
129
if err != nil {
130
+
l.Error("failed to fetch repos", "err", err)
131
}
132
133
// filter out ones that are pinned
134
pinnedRepos := []db.Repo{}
135
for i, r := range repos {
136
// if this is a pinned repo, add it
137
+
if slices.Contains(profile.Profile.PinnedRepos[:], r.RepoAt()) {
138
pinnedRepos = append(pinnedRepos, r)
139
}
140
141
// if there are no saved pins, add the first 4 repos
142
+
if profile.Profile.IsPinnedReposEmpty() && i < 4 {
143
pinnedRepos = append(pinnedRepos, r)
144
}
145
}
146
147
+
collaboratingRepos, err := db.CollaboratingIn(s.db, profile.UserDid)
148
if err != nil {
149
+
l.Error("failed to fetch collaborating repos", "err", err)
150
}
151
152
pinnedCollaboratingRepos := []db.Repo{}
153
for _, r := range collaboratingRepos {
154
// if this is a pinned repo, add it
155
+
if slices.Contains(profile.Profile.PinnedRepos[:], r.RepoAt()) {
156
pinnedCollaboratingRepos = append(pinnedCollaboratingRepos, r)
157
}
158
}
159
160
+
timeline, err := db.MakeProfileTimeline(s.db, profile.UserDid)
161
if err != nil {
162
+
l.Error("failed to create timeline", "err", err)
163
}
164
165
+
s.pages.ProfileOverview(w, pages.ProfileOverviewParams{
166
+
LoggedInUser: s.oauth.GetUser(r),
167
+
Card: profile,
168
+
Repos: pinnedRepos,
169
+
CollaboratingRepos: pinnedCollaboratingRepos,
170
+
ProfileTimeline: timeline,
171
+
})
172
+
}
173
+
174
+
func (s *State) reposPage(w http.ResponseWriter, r *http.Request) {
175
+
l := s.logger.With("handler", "reposPage")
176
+
177
+
profile, err := s.profile(r)
178
+
if err != nil {
179
+
l.Error("failed to build profile card", "err", err)
180
+
s.pages.Error500(w)
181
+
return
182
}
183
+
l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
184
185
+
repos, err := db.GetRepos(
186
s.db,
187
+
0,
188
+
db.FilterEq("did", profile.UserDid),
189
)
190
if err != nil {
191
+
l.Error("failed to get repos", "err", err)
192
+
s.pages.Error500(w)
193
+
return
194
}
195
196
+
err = s.pages.ProfileRepos(w, pages.ProfileReposParams{
197
+
LoggedInUser: s.oauth.GetUser(r),
198
+
Repos: repos,
199
+
Card: profile,
200
})
201
}
202
203
+
func (s *State) starredPage(w http.ResponseWriter, r *http.Request) {
204
+
l := s.logger.With("handler", "starredPage")
205
+
206
+
profile, err := s.profile(r)
207
+
if err != nil {
208
+
l.Error("failed to build profile card", "err", err)
209
+
s.pages.Error500(w)
210
+
return
211
+
}
212
+
l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
213
+
214
+
stars, err := db.GetStars(s.db, 0, db.FilterEq("starred_by_did", profile.UserDid))
215
+
if err != nil {
216
+
l.Error("failed to get stars", "err", err)
217
+
s.pages.Error500(w)
218
return
219
}
220
+
var repoAts []string
221
+
for _, s := range stars {
222
+
repoAts = append(repoAts, string(s.RepoAt))
223
+
}
224
225
repos, err := db.GetRepos(
226
s.db,
227
0,
228
+
db.FilterIn("at_uri", repoAts),
229
)
230
if err != nil {
231
+
l.Error("failed to get repos", "err", err)
232
+
s.pages.Error500(w)
233
+
return
234
}
235
236
+
err = s.pages.ProfileStarred(w, pages.ProfileStarredParams{
237
+
LoggedInUser: s.oauth.GetUser(r),
238
Repos: repos,
239
+
Card: profile,
240
+
})
241
+
}
242
+
243
+
func (s *State) stringsPage(w http.ResponseWriter, r *http.Request) {
244
+
l := s.logger.With("handler", "stringsPage")
245
+
246
+
profile, err := s.profile(r)
247
+
if err != nil {
248
+
l.Error("failed to build profile card", "err", err)
249
+
s.pages.Error500(w)
250
+
return
251
+
}
252
+
l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
253
+
254
+
strings, err := db.GetStrings(s.db, 0, db.FilterEq("did", profile.UserDid))
255
+
if err != nil {
256
+
l.Error("failed to get strings", "err", err)
257
+
s.pages.Error500(w)
258
+
return
259
+
}
260
+
261
+
err = s.pages.ProfileStrings(w, pages.ProfileStringsParams{
262
+
LoggedInUser: s.oauth.GetUser(r),
263
+
Strings: strings,
264
+
Card: profile,
265
})
266
}
267
268
type FollowsPageParams struct {
269
+
Follows []pages.FollowCard
270
+
Card *pages.ProfileCard
271
}
272
273
+
func (s *State) followPage(
274
+
r *http.Request,
275
+
fetchFollows func(db.Execer, string) ([]db.Follow, error),
276
+
extractDid func(db.Follow) string,
277
+
) (*FollowsPageParams, error) {
278
+
l := s.logger.With("handler", "reposPage")
279
+
280
+
profile, err := s.profile(r)
281
+
if err != nil {
282
+
return nil, err
283
}
284
+
l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)
285
286
+
loggedInUser := s.oauth.GetUser(r)
287
288
+
follows, err := fetchFollows(s.db, profile.UserDid)
289
if err != nil {
290
+
l.Error("failed to fetch follows", "err", err)
291
+
return nil, err
292
}
293
294
if len(follows) == 0 {
295
+
return nil, nil
296
}
297
298
followDids := make([]string, 0, len(follows))
···
302
303
profiles, err := db.GetProfiles(s.db, db.FilterIn("did", followDids))
304
if err != nil {
305
+
l.Error("failed to get profiles", "followDids", followDids, "err", err)
306
+
return nil, err
307
}
308
309
followStatsMap, err := db.GetFollowerFollowingCounts(s.db, followDids)
···
311
log.Printf("getting follow counts for %s: %s", followDids, err)
312
}
313
314
+
loggedInUserFollowing := make(map[string]struct{})
315
if loggedInUser != nil {
316
following, err := db.GetFollowing(s.db, loggedInUser.Did)
317
if err != nil {
318
+
l.Error("failed to get follow list", "err", err, "loggedInUser", loggedInUser.Did)
319
+
return nil, err
320
}
321
+
loggedInUserFollowing = make(map[string]struct{}, len(following))
322
+
for _, follow := range following {
323
+
loggedInUserFollowing[follow.SubjectDid] = struct{}{}
324
}
325
}
326
327
+
followCards := make([]pages.FollowCard, len(follows))
328
+
for i, did := range followDids {
329
+
followStats := followStatsMap[did]
330
followStatus := db.IsNotFollowing
331
+
if _, exists := loggedInUserFollowing[did]; exists {
332
+
followStatus = db.IsFollowing
333
+
} else if loggedInUser != nil && loggedInUser.Did == did {
334
+
followStatus = db.IsSelf
335
}
336
+
337
var profile *db.Profile
338
if p, exists := profiles[did]; exists {
339
profile = p
···
341
profile = &db.Profile{}
342
profile.Did = did
343
}
344
+
followCards[i] = pages.FollowCard{
345
UserDid: did,
346
FollowStatus: followStatus,
347
FollowersCount: followStats.Followers,
348
FollowingCount: followStats.Following,
349
Profile: profile,
350
+
}
351
}
352
353
+
return &FollowsPageParams{
354
+
Follows: followCards,
355
+
Card: profile,
356
}, nil
357
}
358
359
func (s *State) followersPage(w http.ResponseWriter, r *http.Request) {
360
+
followPage, err := s.followPage(r, db.GetFollowers, func(f db.Follow) string { return f.UserDid })
361
if err != nil {
362
s.pages.Notice(w, "all-followers", "Failed to load followers")
363
return
364
}
365
366
+
s.pages.ProfileFollowers(w, pages.ProfileFollowersParams{
367
+
LoggedInUser: s.oauth.GetUser(r),
368
Followers: followPage.Follows,
369
Card: followPage.Card,
370
})
371
}
372
373
func (s *State) followingPage(w http.ResponseWriter, r *http.Request) {
374
+
followPage, err := s.followPage(r, db.GetFollowing, func(f db.Follow) string { return f.SubjectDid })
375
if err != nil {
376
s.pages.Notice(w, "all-following", "Failed to load following")
377
return
378
}
379
380
+
s.pages.ProfileFollowing(w, pages.ProfileFollowingParams{
381
+
LoggedInUser: s.oauth.GetUser(r),
382
Following: followPage.Follows,
383
Card: followPage.Card,
384
})
+1
-59
appview/strings/strings.go
+1
-59
appview/strings/strings.go
···
5
"log/slog"
6
"net/http"
7
"path"
8
-
"slices"
9
"strconv"
10
"time"
11
···
161
}
162
163
func (s *Strings) dashboard(w http.ResponseWriter, r *http.Request) {
164
-
l := s.Logger.With("handler", "dashboard")
165
-
166
-
id, ok := r.Context().Value("resolvedId").(identity.Identity)
167
-
if !ok {
168
-
l.Error("malformed middleware")
169
-
w.WriteHeader(http.StatusInternalServerError)
170
-
return
171
-
}
172
-
l = l.With("did", id.DID, "handle", id.Handle)
173
-
174
-
all, err := db.GetStrings(
175
-
s.Db,
176
-
0,
177
-
db.FilterEq("did", id.DID),
178
-
)
179
-
if err != nil {
180
-
l.Error("failed to fetch strings", "err", err)
181
-
w.WriteHeader(http.StatusInternalServerError)
182
-
return
183
-
}
184
-
185
-
slices.SortFunc(all, func(a, b db.String) int {
186
-
if a.Created.After(b.Created) {
187
-
return -1
188
-
} else {
189
-
return 1
190
-
}
191
-
})
192
-
193
-
profile, err := db.GetProfile(s.Db, id.DID.String())
194
-
if err != nil {
195
-
l.Error("failed to fetch user profile", "err", err)
196
-
w.WriteHeader(http.StatusInternalServerError)
197
-
return
198
-
}
199
-
loggedInUser := s.OAuth.GetUser(r)
200
-
followStatus := db.IsNotFollowing
201
-
if loggedInUser != nil {
202
-
followStatus = db.GetFollowStatus(s.Db, loggedInUser.Did, id.DID.String())
203
-
}
204
-
205
-
followStats, err := db.GetFollowerFollowingCount(s.Db, id.DID.String())
206
-
if err != nil {
207
-
l.Error("failed to get follow stats", "err", err)
208
-
}
209
-
210
-
s.Pages.StringsDashboard(w, pages.StringsDashboardParams{
211
-
LoggedInUser: s.OAuth.GetUser(r),
212
-
Card: pages.ProfileCard{
213
-
UserDid: id.DID.String(),
214
-
UserHandle: id.Handle.String(),
215
-
Profile: profile,
216
-
FollowStatus: followStatus,
217
-
FollowersCount: followStats.Followers,
218
-
FollowingCount: followStats.Following,
219
-
},
220
-
Strings: all,
221
-
})
222
}
223
224
func (s *Strings) edit(w http.ResponseWriter, r *http.Request) {
···
5
"log/slog"
6
"net/http"
7
"path"
8
"strconv"
9
"time"
10
···
160
}
161
162
func (s *Strings) dashboard(w http.ResponseWriter, r *http.Request) {
163
+
http.Redirect(w, r, fmt.Sprintf("/%s?tab=strings", chi.URLParam(r, "user")), http.StatusFound)
164
}
165
166
func (s *Strings) edit(w http.ResponseWriter, r *http.Request) {
+53
-12
docs/hacking.md
+53
-12
docs/hacking.md
···
48
redis-server
49
```
50
51
-
## running a knot
52
53
An end-to-end knot setup requires setting up a machine with
54
`sshd`, `AuthorizedKeysCommand`, and git user, which is
55
quite cumbersome. So the nix flake provides a
56
`nixosConfiguration` to do so.
57
58
-
To begin, grab your DID from http://localhost:3000/settings.
59
-
Then, set `TANGLED_VM_KNOT_OWNER` and
60
-
`TANGLED_VM_SPINDLE_OWNER` to your DID.
61
62
-
If you don't want to [set up a spindle](#running-a-spindle),
63
-
you can use any placeholder value.
64
65
-
You can now start a lightweight NixOS VM like so:
66
67
```bash
68
nix run --impure .#vm
···
74
with `ssh` exposed on port 2222.
75
76
Once the services are running, head to
77
-
http://localhost:3000/knots and hit verify (and similarly,
78
-
http://localhost:3000/spindles to verify your spindle). It
79
-
should verify the ownership of the services instantly if
80
-
everything went smoothly.
81
82
You can push repositories to this VM with this ssh config
83
block on your main machine:
···
97
git push local-dev main
98
```
99
100
-
## running a spindle
101
102
The above VM should already be running a spindle on
103
`localhost:6555`. Head to http://localhost:3000/spindles and
···
119
# litecli has a nicer REPL interface:
120
litecli /var/lib/spindle/spindle.db
121
```
···
48
redis-server
49
```
50
51
+
## running knots and spindles
52
53
An end-to-end knot setup requires setting up a machine with
54
`sshd`, `AuthorizedKeysCommand`, and git user, which is
55
quite cumbersome. So the nix flake provides a
56
`nixosConfiguration` to do so.
57
58
+
<details>
59
+
<summary><strong>MacOS users will have to setup a Nix Builder first</strong></summary>
60
+
61
+
In order to build Tangled's dev VM on macOS, you will
62
+
first need to set up a Linux Nix builder. The recommended
63
+
way to do so is to run a [`darwin.linux-builder`
64
+
VM](https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder)
65
+
and to register it in `nix.conf` as a builder for Linux
66
+
with the same architecture as your Mac (`linux-aarch64` if
67
+
you are using Apple Silicon).
68
+
69
+
> IMPORTANT: You must build `darwin.linux-builder` somewhere other than inside
70
+
> the tangled repo so that it doesn't conflict with the other VM. For example,
71
+
> you can do
72
+
>
73
+
> ```shell
74
+
> cd $(mktemp -d buildervm.XXXXX) && nix run nixpkgs#darwin.linux-builder
75
+
> ```
76
+
>
77
+
> to store the builder VM in a temporary dir.
78
+
>
79
+
> You should read and follow [all the other intructions][darwin builder vm] to
80
+
> avoid subtle problems.
81
+
82
+
Alternatively, you can use any other method to set up a
83
+
Linux machine with `nix` installed that you can `sudo ssh`
84
+
into (in other words, root user on your Mac has to be able
85
+
to ssh into the Linux machine without entering a password)
86
+
and that has the same architecture as your Mac. See
87
+
[remote builder
88
+
instructions](https://nix.dev/manual/nix/2.28/advanced-topics/distributed-builds.html#requirements)
89
+
for how to register such a builder in `nix.conf`.
90
91
+
> WARNING: If you'd like to use
92
+
> [`nixos-lima`](https://github.com/nixos-lima/nixos-lima) or
93
+
> [Orbstack](https://orbstack.dev/), note that setting them up so that `sudo
94
+
> ssh` works can be tricky. It seems to be [possible with
95
+
> Orbstack](https://github.com/orgs/orbstack/discussions/1669).
96
97
+
</details>
98
+
99
+
To begin, grab your DID from http://localhost:3000/settings.
100
+
Then, set `TANGLED_VM_KNOT_OWNER` and
101
+
`TANGLED_VM_SPINDLE_OWNER` to your DID. You can now start a
102
+
lightweight NixOS VM like so:
103
104
```bash
105
nix run --impure .#vm
···
111
with `ssh` exposed on port 2222.
112
113
Once the services are running, head to
114
+
http://localhost:3000/knots and hit verify. It should
115
+
verify the ownership of the services instantly if everything
116
+
went smoothly.
117
118
You can push repositories to this VM with this ssh config
119
block on your main machine:
···
133
git push local-dev main
134
```
135
136
+
### running a spindle
137
138
The above VM should already be running a spindle on
139
`localhost:6555`. Head to http://localhost:3000/spindles and
···
155
# litecli has a nicer REPL interface:
156
litecli /var/lib/spindle/spindle.db
157
```
158
+
159
+
If for any reason you wish to disable either one of the
160
+
services in the VM, modify [nix/vm.nix](/nix/vm.nix) and set
161
+
`services.tangled-spindle.enable` (or
162
+
`services.tangled-knot.enable`) to `false`.