comparing be877bba3547b178fa7fbb0ffbf0950e47bae2da and master on dunkirk.sh/core

+48 -18

appview/db/issues.go

···

       12
        
       	OwnerDid string

     

       13
        
       	IssueId  int

     

       14
        
       	IssueAt  string

     

       15
       -
       	Created  *time.Time

     

       16
        
       	Title    string

     

       17
        
       	Body     string

     

       18
        
       	Open     bool

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       	Metadata *IssueMetadata

     

       20
        
       }

     

       21
        
       

     

       22
        
       type IssueMetadata struct {

     

       23
        
       	CommentCount int

     

       0
        
       
     

       24
        
       	// labels, assignee etc.

     

       25
        
       }

     

       26
        
       

     
···

       143
        
       		if err != nil {

     

       144
        
       			return nil, err

     

       145
        
       		}

     

       146
       -
       		issue.Created = &createdTime

     

       147
        
       		issue.Metadata = &metadata

     

       148
        
       

     

       149
        
       		issues = append(issues, issue)

     
···

       156
        
       	return issues, nil

     

       157
        
       }

     

       158
        
       

     

       159
       -
       func GetIssuesByOwnerDid(e Execer, ownerDid string) ([]Issue, error) {

     

       0
        
       
     

       0
        
       
     

       160
        
       	var issues []Issue

     

       161
        
       

     

       162
        
       	rows, err := e.Query(

     
···

       168
        
       			i.title,

     

       169
        
       			i.body,

     

       170
        
       			i.open,

     

       171
       -
       			count(c.id)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       172
        
       		from

     

       173
        
       		    issues i

     

       174
       -
       		left join

     

       175
       -
       			comments c on i.repo_at = c.repo_at and i.issue_id = c.issue_id

     

       176
        
       		where

     

       177
       -
       		    i.owner_did = ?

     

       178
       -
       		group by

     

       179
       -
       			i.id, i.owner_did, i.repo_at, i.issue_id, i.created, i.title, i.body, i.open

     

       180
        
       		order by

     

       181
        
       			i.created desc`,

     

       182
       -
       		ownerDid)

     

       183
        
       	if err != nil {

     

       184
        
       		return nil, err

     

       185
        
       	}

     
···

       187
        
       

     

       188
        
       	for rows.Next() {

     

       189
        
       		var issue Issue

     

       190
       -
       		var createdAt string

     

       191
       -
       		var metadata IssueMetadata

     

       192
       -
       		err := rows.Scan(&issue.OwnerDid, &issue.RepoAt, &issue.IssueId, &createdAt, &issue.Title, &issue.Body, &issue.Open, &metadata.CommentCount)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       193
        
       		if err != nil {

     

       194
        
       			return nil, err

     

       195
        
       		}

     

       196
        
       

     

       197
       -
       		createdTime, err := time.Parse(time.RFC3339, createdAt)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       198
        
       		if err != nil {

     

       199
        
       			return nil, err

     

       200
        
       		}

     

       201
       -
       		issue.Created = &createdTime

     

       202
       -
       		issue.Metadata = &metadata

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       203
        
       

     

       204
        
       		issues = append(issues, issue)

     

       205
        
       	}

     
···

       226
        
       	if err != nil {

     

       227
        
       		return nil, err

     

       228
        
       	}

     

       229
       -
       	issue.Created = &createdTime

     

       230
        
       

     

       231
        
       	return &issue, nil

     

       232
        
       }

     
···

       246
        
       	if err != nil {

     

       247
        
       		return nil, nil, err

     

       248
        
       	}

     

       249
       -
       	issue.Created = &createdTime

     

       250
        
       

     

       251
        
       	comments, err := GetComments(e, repoAt, issueId)

     

       252
        
       	if err != nil {

···

       12
        
       	OwnerDid string

     

       13
        
       	IssueId  int

     

       14
        
       	IssueAt  string

     

       15
       +
       	Created  time.Time

     

       16
        
       	Title    string

     

       17
        
       	Body     string

     

       18
        
       	Open     bool

     

       19
       +
       

     

       20
       +
       	// optionally, populate this when querying for reverse mappings

     

       21
       +
       	// like comment counts, parent repo etc.

     

       22
        
       	Metadata *IssueMetadata

     

       23
        
       }

     

       24
        
       

     

       25
        
       type IssueMetadata struct {

     

       26
        
       	CommentCount int

     

       27
       +
       	Repo         *Repo

     

       28
        
       	// labels, assignee etc.

     

       29
        
       }

     

       30
        
       

     
···

       147
        
       		if err != nil {

     

       148
        
       			return nil, err

     

       149
        
       		}

     

       150
       +
       		issue.Created = createdTime

     

       151
        
       		issue.Metadata = &metadata

     

       152
        
       

     

       153
        
       		issues = append(issues, issue)

     
···

       160
        
       	return issues, nil

     

       161
        
       }

     

       162
        
       

     

       163
       +
       // timeframe here is directly passed into the sql query filter, and any

     

       164
       +
       // timeframe in the past should be negative; e.g.: "-3 months"

     

       165
       +
       func GetIssuesByOwnerDid(e Execer, ownerDid string, timeframe string) ([]Issue, error) {

     

       166
        
       	var issues []Issue

     

       167
        
       

     

       168
        
       	rows, err := e.Query(

     
···

       174
        
       			i.title,

     

       175
        
       			i.body,

     

       176
        
       			i.open,

     

       177
       +
       			r.did,

     

       178
       +
       			r.name,

     

       179
       +
       			r.knot,

     

       180
       +
       			r.rkey,

     

       181
       +
       			r.created

     

       182
        
       		from

     

       183
        
       		    issues i

     

       184
       +
       		join

     

       185
       +
       			repos r on i.repo_at = r.at_uri

     

       186
        
       		where

     

       187
       +
       			i.owner_did = ? and i.created >= date ('now', ?)

     

       0
        
       
     

       0
        
       
     

       188
        
       		order by

     

       189
        
       			i.created desc`,

     

       190
       +
       		ownerDid, timeframe)

     

       191
        
       	if err != nil {

     

       192
        
       		return nil, err

     

       193
        
       	}

     
···

       195
        
       

     

       196
        
       	for rows.Next() {

     

       197
        
       		var issue Issue

     

       198
       +
       		var issueCreatedAt, repoCreatedAt string

     

       199
       +
       		var repo Repo

     

       200
       +
       		err := rows.Scan(

     

       201
       +
       			&issue.OwnerDid,

     

       202
       +
       			&issue.RepoAt,

     

       203
       +
       			&issue.IssueId,

     

       204
       +
       			&issueCreatedAt,

     

       205
       +
       			&issue.Title,

     

       206
       +
       			&issue.Body,

     

       207
       +
       			&issue.Open,

     

       208
       +
       			&repo.Did,

     

       209
       +
       			&repo.Name,

     

       210
       +
       			&repo.Knot,

     

       211
       +
       			&repo.Rkey,

     

       212
       +
       			&repoCreatedAt,

     

       213
       +
       		)

     

       214
        
       		if err != nil {

     

       215
        
       			return nil, err

     

       216
        
       		}

     

       217
        
       

     

       218
       +
       		issueCreatedTime, err := time.Parse(time.RFC3339, issueCreatedAt)

     

       219
       +
       		if err != nil {

     

       220
       +
       			return nil, err

     

       221
       +
       		}

     

       222
       +
       		issue.Created = issueCreatedTime

     

       223
       +
       

     

       224
       +
       		repoCreatedTime, err := time.Parse(time.RFC3339, repoCreatedAt)

     

       225
        
       		if err != nil {

     

       226
        
       			return nil, err

     

       227
        
       		}

     

       228
       +
       		repo.Created = repoCreatedTime

     

       229
       +
       

     

       230
       +
       		issue.Metadata = &IssueMetadata{

     

       231
       +
       			Repo: &repo,

     

       232
       +
       		}

     

       233
        
       

     

       234
        
       		issues = append(issues, issue)

     

       235
        
       	}

     
···

       256
        
       	if err != nil {

     

       257
        
       		return nil, err

     

       258
        
       	}

     

       259
       +
       	issue.Created = createdTime

     

       260
        
       

     

       261
        
       	return &issue, nil

     

       262
        
       }

     
···

       276
        
       	if err != nil {

     

       277
        
       		return nil, nil, err

     

       278
        
       	}

     

       279
       +
       	issue.Created = createdTime

     

       280
        
       

     

       281
        
       	comments, err := GetComments(e, repoAt, issueId)

     

       282
        
       	if err != nil {

+119 -53

appview/db/profile.go

···

       2
        
       

     

       3
        
       import (

     

       4
        
       	"fmt"

     

       5
       -
       	"log"

     

       6
       -
       	"sort"

     

       7
        
       	"time"

     

       8
        
       )

     

       9
        
       

     

       10
       -
       type ProfileTimelineEvent struct {

     

       11
       -
       	EventAt time.Time

     

       12
       -
       	Type    string

     

       13
       -
       	*Issue

     

       14
       -
       	*Pull

     

       15
       -
       	*Repo

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
       

     

       17
       -
       	// optional: populate only if Repo is a fork

     

       18
       -
       	Source *Repo

     

       19
        
       }

     

       20
        
       

     

       21
       -
       func MakeProfileTimeline(e Execer, forDid string) ([]ProfileTimelineEvent, error) {

     

       22
       -
       	timeline := []ProfileTimelineEvent{}

     

       23
       -
       	limit := 30

     

       0
        
       
     

       24
        
       

     

       25
       -
       	pulls, err := GetPullsByOwnerDid(e, forDid)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
       	if err != nil {

     

       27
       -
       		return timeline, fmt.Errorf("error getting pulls by owner did: %w", err)

     

       28
        
       	}

     

       29
        
       

     

       0
        
       
     

       30
        
       	for _, pull := range pulls {

     

       31
       -
       		repo, err := GetRepoByAtUri(e, string(pull.RepoAt))

     

       32
       -
       		if err != nil {

     

       33
       -
       			return timeline, fmt.Errorf("error getting repo by at uri: %w", err)

     

       0
        
       
     

       0
        
       
     

       34
        
       		}

     

       35
        
       

     

       36
       -
       		timeline = append(timeline, ProfileTimelineEvent{

     

       37
       -
       			EventAt: pull.Created,

     

       38
       -
       			Type:    "pull",

     

       39
       -
       			Pull:    &pull,

     

       40
       -
       			Repo:    repo,

     

       41
       -
       		})

     

       42
        
       	}

     

       43
        
       

     

       44
       -
       	issues, err := GetIssuesByOwnerDid(e, forDid)

     

       45
        
       	if err != nil {

     

       46
       -
       		return timeline, fmt.Errorf("error getting issues by owner did: %w", err)

     

       47
        
       	}

     

       48
        
       

     

       49
        
       	for _, issue := range issues {

     

       50
       -
       		repo, err := GetRepoByAtUri(e, string(issue.RepoAt))

     

       51
       -
       		if err != nil {

     

       52
       -
       			return timeline, fmt.Errorf("error getting repo by at uri: %w", err)

     

       0
        
       
     

       0
        
       
     

       53
        
       		}

     

       54
        
       

     

       55
       -
       		timeline = append(timeline, ProfileTimelineEvent{

     

       56
       -
       			EventAt: *issue.Created,

     

       57
       -
       			Type:    "issue",

     

       58
       -
       			Issue:   &issue,

     

       59
       -
       			Repo:    repo,

     

       60
       -
       		})

     

       61
        
       	}

     

       62
        
       

     

       63
        
       	repos, err := GetAllReposByDid(e, forDid)

     

       64
        
       	if err != nil {

     

       65
       -
       		return timeline, fmt.Errorf("error getting all repos by did: %w", err)

     

       66
        
       	}

     

       67
       -
       

     

       68
       -
       	log.Println(repos)

     

       69
        
       

     

       70
        
       	for _, repo := range repos {

     

       0
        
       
     

       71
        
       		var sourceRepo *Repo

     

       72
       -
       		log.Println("name", repo.Name)

     

       73
        
       		if repo.Source != "" {

     

       74
       -
       			log.Println("source", repo.Source)

     

       75
        
       			sourceRepo, err = GetRepoByAtUri(e, repo.Source)

     

       76
        
       			if err != nil {

     

       77
        
       				return nil, err

     

       78
        
       			}

     

       79
        
       		}

     

       80
        
       

     

       81
       -
       		timeline = append(timeline, ProfileTimelineEvent{

     

       82
       -
       			EventAt: repo.Created,

     

       83
       -
       			Type:    "repo",

     

       84
       -
       			Repo:    &repo,

     

       85
       -
       			Source:  sourceRepo,

     

       86
       -
       		})

     

       87
       -
       	}

     

       88
        
       

     

       89
       -
       	sort.Slice(timeline, func(i, j int) bool {

     

       90
       -
       		return timeline[i].EventAt.After(timeline[j].EventAt)

     

       91
       -
       	})

     

       92
        
       

     

       93
       -
       	if len(timeline) > limit {

     

       94
       -
       		timeline = timeline[:limit]

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       95
        
       	}

     

       96
        
       

     

       97
       -
       	return timeline, nil

     

       98
        
       }

···

       2
        
       

     

       3
        
       import (

     

       4
        
       	"fmt"

     

       0
        
       
     

       0
        
       
     

       5
        
       	"time"

     

       6
        
       )

     

       7
        
       

     

       8
       +
       type RepoEvent struct {

     

       9
       +
       	Repo   *Repo

     

       10
       +
       	Source *Repo

     

       11
       +
       }

     

       12
       +
       

     

       13
       +
       type ProfileTimeline struct {

     

       14
       +
       	ByMonth []ByMonth

     

       15
       +
       }

     

       16
       +
       

     

       17
       +
       type ByMonth struct {

     

       18
       +
       	RepoEvents  []RepoEvent

     

       19
       +
       	IssueEvents IssueEvents

     

       20
       +
       	PullEvents  PullEvents

     

       21
       +
       }

     

       22
       +
       

     

       23
       +
       func (b ByMonth) IsEmpty() bool {

     

       24
       +
       	return len(b.RepoEvents) == 0 &&

     

       25
       +
       		len(b.IssueEvents.Items) == 0 &&

     

       26
       +
       		len(b.PullEvents.Items) == 0

     

       27
       +
       }

     

       28
        
       

     

       29
       +
       type IssueEvents struct {

     

       30
       +
       	Items []*Issue

     

       31
        
       }

     

       32
        
       

     

       33
       +
       type IssueEventStats struct {

     

       34
       +
       	Open   int

     

       35
       +
       	Closed int

     

       36
       +
       }

     

       37
        
       

     

       38
       +
       func (i IssueEvents) Stats() IssueEventStats {

     

       39
       +
       	var open, closed int

     

       40
       +
       	for _, issue := range i.Items {

     

       41
       +
       		if issue.Open {

     

       42
       +
       			open += 1

     

       43
       +
       		} else {

     

       44
       +
       			closed += 1

     

       45
       +
       		}

     

       46
       +
       	}

     

       47
       +
       

     

       48
       +
       	return IssueEventStats{

     

       49
       +
       		Open:   open,

     

       50
       +
       		Closed: closed,

     

       51
       +
       	}

     

       52
       +
       }

     

       53
       +
       

     

       54
       +
       type PullEvents struct {

     

       55
       +
       	Items []*Pull

     

       56
       +
       }

     

       57
       +
       

     

       58
       +
       func (p PullEvents) Stats() PullEventStats {

     

       59
       +
       	var open, merged, closed int

     

       60
       +
       	for _, pull := range p.Items {

     

       61
       +
       		switch pull.State {

     

       62
       +
       		case PullOpen:

     

       63
       +
       			open += 1

     

       64
       +
       		case PullMerged:

     

       65
       +
       			merged += 1

     

       66
       +
       		case PullClosed:

     

       67
       +
       			closed += 1

     

       68
       +
       		}

     

       69
       +
       	}

     

       70
       +
       

     

       71
       +
       	return PullEventStats{

     

       72
       +
       		Open:   open,

     

       73
       +
       		Merged: merged,

     

       74
       +
       		Closed: closed,

     

       75
       +
       	}

     

       76
       +
       }

     

       77
       +
       

     

       78
       +
       type PullEventStats struct {

     

       79
       +
       	Closed int

     

       80
       +
       	Open   int

     

       81
       +
       	Merged int

     

       82
       +
       }

     

       83
       +
       

     

       84
       +
       const TimeframeMonths = 3

     

       85
       +
       

     

       86
       +
       func MakeProfileTimeline(e Execer, forDid string) (*ProfileTimeline, error) {

     

       87
       +
       	timeline := ProfileTimeline{

     

       88
       +
       		ByMonth: make([]ByMonth, TimeframeMonths),

     

       89
       +
       	}

     

       90
       +
       	currentMonth := time.Now().Month()

     

       91
       +
       	timeframe := fmt.Sprintf("-%d months", TimeframeMonths)

     

       92
       +
       

     

       93
       +
       	pulls, err := GetPullsByOwnerDid(e, forDid, timeframe)

     

       94
        
       	if err != nil {

     

       95
       +
       		return nil, fmt.Errorf("error getting pulls by owner did: %w", err)

     

       96
        
       	}

     

       97
        
       

     

       98
       +
       	// group pulls by month

     

       99
        
       	for _, pull := range pulls {

     

       100
       +
       		pullMonth := pull.Created.Month()

     

       101
       +
       

     

       102
       +
       		if currentMonth-pullMonth > TimeframeMonths {

     

       103
       +
       			// shouldn't happen; but times are weird

     

       104
       +
       			continue

     

       105
        
       		}

     

       106
        
       

     

       107
       +
       		idx := currentMonth - pullMonth

     

       108
       +
       		items := &timeline.ByMonth[idx].PullEvents.Items

     

       109
       +
       

     

       110
       +
       		*items = append(*items, &pull)

     

       0
        
       
     

       0
        
       
     

       111
        
       	}

     

       112
        
       

     

       113
       +
       	issues, err := GetIssuesByOwnerDid(e, forDid, timeframe)

     

       114
        
       	if err != nil {

     

       115
       +
       		return nil, fmt.Errorf("error getting issues by owner did: %w", err)

     

       116
        
       	}

     

       117
        
       

     

       118
        
       	for _, issue := range issues {

     

       119
       +
       		issueMonth := issue.Created.Month()

     

       120
       +
       

     

       121
       +
       		if currentMonth-issueMonth > TimeframeMonths {

     

       122
       +
       			// shouldn't happen; but times are weird

     

       123
       +
       			continue

     

       124
        
       		}

     

       125
        
       

     

       126
       +
       		idx := currentMonth - issueMonth

     

       127
       +
       		items := &timeline.ByMonth[idx].IssueEvents.Items

     

       128
       +
       

     

       129
       +
       		*items = append(*items, &issue)

     

       0
        
       
     

       0
        
       
     

       130
        
       	}

     

       131
        
       

     

       132
        
       	repos, err := GetAllReposByDid(e, forDid)

     

       133
        
       	if err != nil {

     

       134
       +
       		return nil, fmt.Errorf("error getting all repos by did: %w", err)

     

       135
        
       	}

     

       0
        
       
     

       0
        
       
     

       136
        
       

     

       137
        
       	for _, repo := range repos {

     

       138
       +
       		// TODO: get this in the original query; requires COALESCE because nullable

     

       139
        
       		var sourceRepo *Repo

     

       0
        
       
     

       140
        
       		if repo.Source != "" {

     

       0
        
       
     

       141
        
       			sourceRepo, err = GetRepoByAtUri(e, repo.Source)

     

       142
        
       			if err != nil {

     

       143
        
       				return nil, err

     

       144
        
       			}

     

       145
        
       		}

     

       146
        
       

     

       147
       +
       		repoMonth := repo.Created.Month()

     

       148
       +
       

     

       149
       +
       		if currentMonth-repoMonth > TimeframeMonths {

     

       150
       +
       			// shouldn't happen; but times are weird

     

       151
       +
       			continue

     

       152
       +
       		}

     

       0
        
       
     

       153
        
       

     

       154
       +
       		idx := currentMonth - repoMonth

     

       0
        
       
     

       0
        
       
     

       155
        
       

     

       156
       +
       		items := &timeline.ByMonth[idx].RepoEvents

     

       157
       +
       		*items = append(*items, RepoEvent{

     

       158
       +
       			Repo:   &repo,

     

       159
       +
       			Source: sourceRepo,

     

       160
       +
       		})

     

       161
        
       	}

     

       162
        
       

     

       163
       +
       	return &timeline, nil

     

       164
        
       }

+53 -17

appview/db/pulls.go

···

       64
        
       	// meta

     

       65
        
       	Created    time.Time

     

       66
        
       	PullSource *PullSource

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       67
        
       }

     

       68
        
       

     

       69
        
       type PullSource struct {

     
···

       119
        
       	return len(p.Submissions) - 1

     

       120
        
       }

     

       121
        
       

     

       122
       -
       func (p *Pull) IsSameRepoBranch() bool {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       123
        
       	if p.PullSource != nil {

     

       124
        
       		if p.PullSource.RepoAt != nil {

     

       125
        
       			return p.PullSource.RepoAt == &p.RepoAt

     
···

       131
        
       	return false

     

       132
        
       }

     

       133
        
       

     

       134
       -
       func (p *Pull) IsPatch() bool {

     

       135
       -
       	return p.PullSource == nil

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       136
        
       }

     

       137
        
       

     

       138
        
       func (s PullSubmission) AsNiceDiff(targetBranch string) types.NiceDiff {

     
···

       522
        
       	return &pull, nil

     

       523
        
       }

     

       524
        
       

     

       525
       -
       func GetPullsByOwnerDid(e Execer, did string) ([]Pull, error) {

     

       0
        
       
     

       0
        
       
     

       526
        
       	var pulls []Pull

     

       527
        
       

     

       528
        
       	rows, err := e.Query(`

     

       529
        
       			select

     

       530
       -
       				owner_did,

     

       531
       -
       				repo_at,

     

       532
       -
       				pull_id,

     

       533
       -
       				created,

     

       534
       -
       				title,

     

       535
       -
       				state

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       536
        
       			from

     

       537
       -
       				pulls

     

       0
        
       
     

       0
        
       
     

       538
        
       			where

     

       539
       -
       				owner_did = ?

     

       540
        
       			order by

     

       541
       -
       				created desc`, did)

     

       542
        
       	if err != nil {

     

       543
        
       		return nil, err

     

       544
        
       	}

     
···

       546
        
       

     

       547
        
       	for rows.Next() {

     

       548
        
       		var pull Pull

     

       549
       -
       		var createdAt string

     

       0
        
       
     

       550
        
       		err := rows.Scan(

     

       551
        
       			&pull.OwnerDid,

     

       552
        
       			&pull.RepoAt,

     

       553
        
       			&pull.PullId,

     

       554
       -
       			&createdAt,

     

       555
        
       			&pull.Title,

     

       556
        
       			&pull.State,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       557
        
       		)

     

       558
        
       		if err != nil {

     

       559
        
       			return nil, err

     

       560
        
       		}

     

       561
        
       

     

       562
       -
       		createdTime, err := time.Parse(time.RFC3339, createdAt)

     

       563
        
       		if err != nil {

     

       564
        
       			return nil, err

     

       565
        
       		}

     

       566
       -
       		pull.Created = createdTime

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       567
        
       

     

       568
        
       		pulls = append(pulls, pull)

     

       569
        
       	}

···

       64
        
       	// meta

     

       65
        
       	Created    time.Time

     

       66
        
       	PullSource *PullSource

     

       67
       +
       

     

       68
       +
       	// optionally, populate this when querying for reverse mappings

     

       69
       +
       	Repo *Repo

     

       70
        
       }

     

       71
        
       

     

       72
        
       type PullSource struct {

     
···

       122
        
       	return len(p.Submissions) - 1

     

       123
        
       }

     

       124
        
       

     

       125
       +
       func (p *Pull) IsPatchBased() bool {

     

       126
       +
       	return p.PullSource == nil

     

       127
       +
       }

     

       128
       +
       

     

       129
       +
       func (p *Pull) IsBranchBased() bool {

     

       130
        
       	if p.PullSource != nil {

     

       131
        
       		if p.PullSource.RepoAt != nil {

     

       132
        
       			return p.PullSource.RepoAt == &p.RepoAt

     
···

       138
        
       	return false

     

       139
        
       }

     

       140
        
       

     

       141
       +
       func (p *Pull) IsForkBased() bool {

     

       142
       +
       	if p.PullSource != nil {

     

       143
       +
       		if p.PullSource.RepoAt != nil {

     

       144
       +
       			// make sure repos are different

     

       145
       +
       			return p.PullSource.RepoAt != &p.RepoAt

     

       146
       +
       		}

     

       147
       +
       	}

     

       148
       +
       	return false

     

       149
        
       }

     

       150
        
       

     

       151
        
       func (s PullSubmission) AsNiceDiff(targetBranch string) types.NiceDiff {

     
···

       535
        
       	return &pull, nil

     

       536
        
       }

     

       537
        
       

     

       538
       +
       // timeframe here is directly passed into the sql query filter, and any

     

       539
       +
       // timeframe in the past should be negative; e.g.: "-3 months"

     

       540
       +
       func GetPullsByOwnerDid(e Execer, did, timeframe string) ([]Pull, error) {

     

       541
        
       	var pulls []Pull

     

       542
        
       

     

       543
        
       	rows, err := e.Query(`

     

       544
        
       			select

     

       545
       +
       				p.owner_did,

     

       546
       +
       				p.repo_at,

     

       547
       +
       				p.pull_id,

     

       548
       +
       				p.created,

     

       549
       +
       				p.title,

     

       550
       +
       				p.state,

     

       551
       +
       				r.did,

     

       552
       +
       				r.name,

     

       553
       +
       				r.knot,

     

       554
       +
       				r.rkey,

     

       555
       +
       				r.created

     

       556
        
       			from

     

       557
       +
       				pulls p

     

       558
       +
       			join

     

       559
       +
       				repos r on p.repo_at = r.at_uri

     

       560
        
       			where

     

       561
       +
       				p.owner_did = ? and p.created >= date ('now', ?)

     

       562
        
       			order by

     

       563
       +
       				p.created desc`, did, timeframe)

     

       564
        
       	if err != nil {

     

       565
        
       		return nil, err

     

       566
        
       	}

     
···

       568
        
       

     

       569
        
       	for rows.Next() {

     

       570
        
       		var pull Pull

     

       571
       +
       		var repo Repo

     

       572
       +
       		var pullCreatedAt, repoCreatedAt string

     

       573
        
       		err := rows.Scan(

     

       574
        
       			&pull.OwnerDid,

     

       575
        
       			&pull.RepoAt,

     

       576
        
       			&pull.PullId,

     

       577
       +
       			&pullCreatedAt,

     

       578
        
       			&pull.Title,

     

       579
        
       			&pull.State,

     

       580
       +
       			&repo.Did,

     

       581
       +
       			&repo.Name,

     

       582
       +
       			&repo.Knot,

     

       583
       +
       			&repo.Rkey,

     

       584
       +
       			&repoCreatedAt,

     

       585
        
       		)

     

       586
        
       		if err != nil {

     

       587
        
       			return nil, err

     

       588
        
       		}

     

       589
        
       

     

       590
       +
       		pullCreatedTime, err := time.Parse(time.RFC3339, pullCreatedAt)

     

       591
        
       		if err != nil {

     

       592
        
       			return nil, err

     

       593
        
       		}

     

       594
       +
       		pull.Created = pullCreatedTime

     

       595
       +
       

     

       596
       +
       		repoCreatedTime, err := time.Parse(time.RFC3339, repoCreatedAt)

     

       597
       +
       		if err != nil {

     

       598
       +
       			return nil, err

     

       599
       +
       		}

     

       600
       +
       		repo.Created = repoCreatedTime

     

       601
       +
       

     

       602
       +
       		pull.Repo = &repo

     

       603
        
       

     

       604
        
       		pulls = append(pulls, pull)

     

       605
        
       	}

+5 -3

appview/db/repos.go

···

       77
        
       		where

     

       78
        
       			r.did = ?

     

       79
        
       		group by

     

       80
       -
       			r.at_uri`, did)

     

       0
        
       
     

       0
        
       
     

       81
        
       	if err != nil {

     

       82
        
       		return nil, err

     

       83
        
       	}

     
···

       176
        
       	return err

     

       177
        
       }

     

       178
        
       

     

       179
       -
       func RemoveRepo(e Execer, did, name, rkey string) error {

     

       180
       -
       	_, err := e.Exec(`delete from repos where did = ? and name = ? and rkey = ?`, did, name, rkey)

     

       181
        
       	return err

     

       182
        
       }

     

       183

···

       77
        
       		where

     

       78
        
       			r.did = ?

     

       79
        
       		group by

     

       80
       +
       			r.at_uri

     

       81
       +
       		order by r.created desc`,

     

       82
       +
       		did)

     

       83
        
       	if err != nil {

     

       84
        
       		return nil, err

     

       85
        
       	}

     
···

       178
        
       	return err

     

       179
        
       }

     

       180
        
       

     

       181
       +
       func RemoveRepo(e Execer, did, name string) error {

     

       182
       +
       	_, err := e.Exec(`delete from repos where did = ? and name = ?`, did, name)

     

       183
        
       	return err

     

       184
        
       }

     

       185

+6 -1

appview/pages/funcmap.go

···

       13
        
       	"time"

     

       14
        
       

     

       15
        
       	"github.com/dustin/go-humanize"

     

       0
        
       
     

       16
        
       )

     

       17
        
       

     

       18
        
       func funcMap() template.FuncMap {

     
···

       30
        
       			return strings.Split(s, sep)

     

       31
        
       		},

     

       32
        
       		"add": func(a, b int) int {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       33
        
       			return a + b

     

       34
        
       		},

     

       35
        
       		"sub": func(a, b int) int {

     
···

       137
        
       			return v.Slice(start, end).Interface()

     

       138
        
       		},

     

       139
        
       		"markdown": func(text string) template.HTML {

     

       140
       -
       			return template.HTML(renderMarkdown(text))

     

       141
        
       		},

     

       142
        
       		"isNil": func(t any) bool {

     

       143
        
       			// returns false for other "zero" values

···

       13
        
       	"time"

     

       14
        
       

     

       15
        
       	"github.com/dustin/go-humanize"

     

       16
       +
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       17
        
       )

     

       18
        
       

     

       19
        
       func funcMap() template.FuncMap {

     
···

       31
        
       			return strings.Split(s, sep)

     

       32
        
       		},

     

       33
        
       		"add": func(a, b int) int {

     

       34
       +
       			return a + b

     

       35
       +
       		},

     

       36
       +
       		// the absolute state of go templates

     

       37
       +
       		"add64": func(a, b int64) int64 {

     

       38
        
       			return a + b

     

       39
        
       		},

     

       40
        
       		"sub": func(a, b int) int {

     
···

       142
        
       			return v.Slice(start, end).Interface()

     

       143
        
       		},

     

       144
        
       		"markdown": func(text string) template.HTML {

     

       145
       +
       			return template.HTML(markup.RenderMarkdown(text))

     

       146
        
       		},

     

       147
        
       		"isNil": func(t any) bool {

     

       148
        
       			// returns false for other "zero" values

-23

appview/pages/markdown.go

···

       1
       -
       package pages

     

       2
       -
       

     

       3
       -
       import (

     

       4
       -
       	"bytes"

     

       5
       -
       

     

       6
       -
       	"github.com/yuin/goldmark"

     

       7
       -
       	"github.com/yuin/goldmark/extension"

     

       8
       -
       	"github.com/yuin/goldmark/parser"

     

       9
       -
       )

     

       10
       -
       

     

       11
       -
       func renderMarkdown(source string) string {

     

       12
       -
       	md := goldmark.New(

     

       13
       -
       		goldmark.WithExtensions(extension.GFM),

     

       14
       -
       		goldmark.WithParserOptions(

     

       15
       -
       			parser.WithAutoHeadingID(),

     

       16
       -
       		),

     

       17
       -
       	)

     

       18
       -
       	var buf bytes.Buffer

     

       19
       -
       	if err := md.Convert([]byte(source), &buf); err != nil {

     

       20
       -
       		return source

     

       21
       -
       	}

     

       22
       -
       	return buf.String()

     

       23
       -
       }

+24

appview/pages/markup/markdown.go

···

       1
       +
       // Package markup is an umbrella package for all markups and their renderers.

     

       2
       +
       package markup

     

       3
       +
       

     

       4
       +
       import (

     

       5
       +
       	"bytes"

     

       6
       +
       

     

       7
       +
       	"github.com/yuin/goldmark"

     

       8
       +
       	"github.com/yuin/goldmark/extension"

     

       9
       +
       	"github.com/yuin/goldmark/parser"

     

       10
       +
       )

     

       11
       +
       

     

       12
       +
       func RenderMarkdown(source string) string {

     

       13
       +
       	md := goldmark.New(

     

       14
       +
       		goldmark.WithExtensions(extension.GFM),

     

       15
       +
       		goldmark.WithParserOptions(

     

       16
       +
       			parser.WithAutoHeadingID(),

     

       17
       +
       		),

     

       18
       +
       	)

     

       19
       +
       	var buf bytes.Buffer

     

       20
       +
       	if err := md.Convert([]byte(source), &buf); err != nil {

     

       21
       +
       		return source

     

       22
       +
       	}

     

       23
       +
       	return buf.String()

     

       24
       +
       }

+26

appview/pages/markup/readme.go

···

       1
       +
       package markup

     

       2
       +
       

     

       3
       +
       import "strings"

     

       4
       +
       

     

       5
       +
       type Format string

     

       6
       +
       

     

       7
       +
       const (

     

       8
       +
       	FormatMarkdown Format = "markdown"

     

       9
       +
       	FormatText     Format = "text"

     

       10
       +
       )

     

       11
       +
       

     

       12
       +
       var FileTypes map[Format][]string = map[Format][]string{

     

       13
       +
       	FormatMarkdown: []string{".md", ".markdown", ".mdown", ".mkdn", ".mkd"},

     

       14
       +
       }

     

       15
       +
       

     

       16
       +
       func GetFormat(filename string) Format {

     

       17
       +
       	for format, extensions := range FileTypes {

     

       18
       +
       		for _, extension := range extensions {

     

       19
       +
       			if strings.HasSuffix(filename, extension) {

     

       20
       +
       				return format

     

       21
       +
       			}

     

       22
       +
       		}

     

       23
       +
       	}

     

       24
       +
       	// default format

     

       25
       +
       	return FormatText

     

       26
       +
       }

+111 -52

appview/pages/pages.go

···

       24
        
       	"github.com/microcosm-cc/bluemonday"

     

       25
        
       	"tangled.sh/tangled.sh/core/appview/auth"

     

       26
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       0
        
       
     

       27
        
       	"tangled.sh/tangled.sh/core/appview/state/userutil"

     

       28
        
       	"tangled.sh/tangled.sh/core/types"

     

       29
        
       )

     
···

       38
        
       func NewPages() *Pages {

     

       39
        
       	templates := make(map[string]*template.Template)

     

       40
        
       

     

       41
       -
       	// Walk through embedded templates directory and parse all .html files

     

       0
        
       
     

       42
        
       	err := fs.WalkDir(Files, "templates", func(path string, d fs.DirEntry, err error) error {

     

       43
        
       		if err != nil {

     

       44
        
       			return err

     

       45
        
       		}

     

       46
        
       

     

       47
       -
       		if !d.IsDir() && strings.HasSuffix(path, ".html") {

     

       48
       -
       			name := strings.TrimPrefix(path, "templates/")

     

       49
       -
       			name = strings.TrimSuffix(name, ".html")

     

       50
        
       

     

       51
       -
       			// add fragments as templates

     

       52
       -
       			if strings.HasPrefix(path, "templates/fragments/") {

     

       53
       -
       				tmpl, err := template.New(name).

     

       54
       -
       					Funcs(funcMap()).

     

       55
       -
       					ParseFS(Files, path)

     

       56
       -
       				if err != nil {

     

       57
       -
       					return fmt.Errorf("setting up fragment: %w", err)

     

       58
       -
       				}

     

       59
        
       

     

       60
       -
       				templates[name] = tmpl

     

       61
       -
       				log.Printf("loaded fragment: %s", name)

     

       62
       -
       			}

     

       63
        
       

     

       64
       -
       			// layouts and fragments are applied first

     

       65
       -
       			if !strings.HasPrefix(path, "templates/layouts/") &&

     

       66
       -
       				!strings.HasPrefix(path, "templates/fragments/") {

     

       67
       -
       				// Add the page template on top of the base

     

       68
       -
       				tmpl, err := template.New(name).

     

       69
       -
       					Funcs(funcMap()).

     

       70
       -
       					ParseFS(Files, "templates/layouts/*.html", "templates/fragments/*.html", path)

     

       71
       -
       				if err != nil {

     

       72
       -
       					return fmt.Errorf("setting up template: %w", err)

     

       73
       -
       				}

     

       74
        
       

     

       75
       -
       				templates[name] = tmpl

     

       76
       -
       				log.Printf("loaded template: %s", name)

     

       77
       -
       			}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       78
        
       

     

       0
        
       
     

       79
        
       			return nil

     

       80
        
       		}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       81
        
       		return nil

     

       82
        
       	})

     

       83
        
       	if err != nil {

     
···

       178
        
       	CollaboratingRepos []db.Repo

     

       179
        
       	ProfileStats       ProfileStats

     

       180
        
       	FollowStatus       db.FollowStatus

     

       181
       -
       	DidHandleMap       map[string]string

     

       182
        
       	AvatarUri          string

     

       183
       -
       	ProfileTimeline    []db.ProfileTimelineEvent

     

       0
        
       
     

       0
        
       
     

       184
        
       }

     

       185
        
       

     

       186
        
       type ProfileStats struct {

     
···

       198
        
       }

     

       199
        
       

     

       200
        
       func (p *Pages) FollowFragment(w io.Writer, params FollowFragmentParams) error {

     

       201
       -
       	return p.executePlain("fragments/follow", w, params)

     

       202
        
       }

     

       203
        
       

     

       204
        
       type RepoActionsFragmentParams struct {

     
···

       208
        
       }

     

       209
        
       

     

       210
        
       func (p *Pages) RepoActionsFragment(w io.Writer, params RepoActionsFragmentParams) error {

     

       211
       -
       	return p.executePlain("fragments/repoActions", w, params)

     

       212
        
       }

     

       213
        
       

     

       214
        
       type RepoDescriptionParams struct {

     
···

       216
        
       }

     

       217
        
       

     

       218
        
       func (p *Pages) EditRepoDescriptionFragment(w io.Writer, params RepoDescriptionParams) error {

     

       219
       -
       	return p.executePlain("fragments/editRepoDescription", w, params)

     

       220
        
       }

     

       221
        
       

     

       222
        
       func (p *Pages) RepoDescriptionFragment(w io.Writer, params RepoDescriptionParams) error {

     

       223
       -
       	return p.executePlain("fragments/repoDescription", w, params)

     

       224
        
       }

     

       225
        
       

     

       226
        
       type RepoInfo struct {

     
···

       246
        
       	return slices.Contains(r.Roles, "repo:settings")

     

       247
        
       }

     

       248
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       249
        
       func (r RolesInRepo) IsOwner() bool {

     

       250
        
       	return slices.Contains(r.Roles, "repo:owner")

     

       251
        
       }

     
···

       284
        
       

     

       285
        
       func (r RepoInfo) GetTabs() [][]string {

     

       286
        
       	tabs := [][]string{

     

       287
       -
       		{"overview", "/"},

     

       288
       -
       		{"issues", "/issues"},

     

       289
       -
       		{"pulls", "/pulls"},

     

       290
        
       	}

     

       291
        
       

     

       292
        
       	if r.Roles.SettingsAllowed() {

     

       293
       -
       		tabs = append(tabs, []string{"settings", "/settings"})

     

       294
        
       	}

     

       295
        
       

     

       296
        
       	return tabs

     
···

       341
        
       		ext := filepath.Ext(params.ReadmeFileName)

     

       342
        
       		switch ext {

     

       343
        
       		case ".md", ".markdown", ".mdown", ".mkdn", ".mkd":

     

       344
       -
       			htmlString = renderMarkdown(params.Readme)

     

       345
        
       			params.Raw = false

     

       346
        
       			params.HTMLReadme = template.HTML(bluemonday.UGCPolicy().Sanitize(htmlString))

     

       347
        
       		default:

     
···

       437
        
       }

     

       438
        
       

     

       439
        
       type RepoBlobParams struct {

     

       440
       -
       	LoggedInUser *auth.User

     

       441
       -
       	RepoInfo     RepoInfo

     

       442
       -
       	Active       string

     

       443
       -
       	BreadCrumbs  [][]string

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       444
        
       	types.RepoBlobResponse

     

       445
        
       }

     

       446
        
       

     
···

       450
        
       	b.Add(chroma.LiteralString, "noitalic")

     

       451
        
       	style, _ = b.Build()

     

       452
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       453
        
       	if params.Lines < 5000 {

     

       454
        
       		c := params.Contents

     

       455
        
       		formatter := chromahtml.New(

     
···

       560
        
       }

     

       561
        
       

     

       562
        
       func (p *Pages) EditIssueCommentFragment(w io.Writer, params EditIssueCommentParams) error {

     

       563
       -
       	return p.executePlain("fragments/editIssueComment", w, params)

     

       564
        
       }

     

       565
        
       

     

       566
        
       type SingleIssueCommentParams struct {

     
···

       572
        
       }

     

       573
        
       

     

       574
        
       func (p *Pages) SingleIssueCommentFragment(w io.Writer, params SingleIssueCommentParams) error {

     

       575
       -
       	return p.executePlain("fragments/issueComment", w, params)

     

       576
        
       }

     

       577
        
       

     

       578
        
       type RepoNewPullParams struct {

     
···

       655
        
       }

     

       656
        
       

     

       657
        
       func (p *Pages) PullPatchUploadFragment(w io.Writer, params PullPatchUploadParams) error {

     

       658
       -
       	return p.executePlain("fragments/pullPatchUpload", w, params)

     

       659
        
       }

     

       660
        
       

     

       661
        
       type PullCompareBranchesParams struct {

     
···

       664
        
       }

     

       665
        
       

     

       666
        
       func (p *Pages) PullCompareBranchesFragment(w io.Writer, params PullCompareBranchesParams) error {

     

       667
       -
       	return p.executePlain("fragments/pullCompareBranches", w, params)

     

       668
        
       }

     

       669
        
       

     

       670
        
       type PullCompareForkParams struct {

     
···

       673
        
       }

     

       674
        
       

     

       675
        
       func (p *Pages) PullCompareForkFragment(w io.Writer, params PullCompareForkParams) error {

     

       676
       -
       	return p.executePlain("fragments/pullCompareForks", w, params)

     

       677
        
       }

     

       678
        
       

     

       679
        
       type PullCompareForkBranchesParams struct {

     
···

       683
        
       }

     

       684
        
       

     

       685
        
       func (p *Pages) PullCompareForkBranchesFragment(w io.Writer, params PullCompareForkBranchesParams) error {

     

       686
       -
       	return p.executePlain("fragments/pullCompareForksBranches", w, params)

     

       687
        
       }

     

       688
        
       

     

       689
        
       type PullResubmitParams struct {

     
···

       694
        
       }

     

       695
        
       

     

       696
        
       func (p *Pages) PullResubmitFragment(w io.Writer, params PullResubmitParams) error {

     

       697
       -
       	return p.executePlain("fragments/pullResubmit", w, params)

     

       698
        
       }

     

       699
        
       

     

       700
        
       type PullActionsParams struct {

     
···

       707
        
       }

     

       708
        
       

     

       709
        
       func (p *Pages) PullActionsFragment(w io.Writer, params PullActionsParams) error {

     

       710
       -
       	return p.executePlain("fragments/pullActions", w, params)

     

       711
        
       }

     

       712
        
       

     

       713
        
       type PullNewCommentParams struct {

     
···

       718
        
       }

     

       719
        
       

     

       720
        
       func (p *Pages) PullNewCommentFragment(w io.Writer, params PullNewCommentParams) error {

     

       721
       -
       	return p.executePlain("fragments/pullNewComment", w, params)

     

       722
        
       }

     

       723
        
       

     

       724
        
       func (p *Pages) Static() http.Handler {

···

       24
        
       	"github.com/microcosm-cc/bluemonday"

     

       25
        
       	"tangled.sh/tangled.sh/core/appview/auth"

     

       26
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       27
       +
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       28
        
       	"tangled.sh/tangled.sh/core/appview/state/userutil"

     

       29
        
       	"tangled.sh/tangled.sh/core/types"

     

       30
        
       )

     
···

       39
        
       func NewPages() *Pages {

     

       40
        
       	templates := make(map[string]*template.Template)

     

       41
        
       

     

       42
       +
       	var fragmentPaths []string

     

       43
       +
       	// First, collect all fragment paths

     

       44
        
       	err := fs.WalkDir(Files, "templates", func(path string, d fs.DirEntry, err error) error {

     

       45
        
       		if err != nil {

     

       46
        
       			return err

     

       47
        
       		}

     

       48
        
       

     

       49
       +
       		if d.IsDir() {

     

       50
       +
       			return nil

     

       51
       +
       		}

     

       52
        
       

     

       53
       +
       		if !strings.HasSuffix(path, ".html") {

     

       54
       +
       			return nil

     

       55
       +
       		}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       56
        
       

     

       57
       +
       		if !strings.Contains(path, "fragments/") {

     

       58
       +
       			return nil

     

       59
       +
       		}

     

       60
        
       

     

       61
       +
       		name := strings.TrimPrefix(path, "templates/")

     

       62
       +
       		name = strings.TrimSuffix(name, ".html")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       63
        
       

     

       64
       +
       		tmpl, err := template.New(name).

     

       65
       +
       			Funcs(funcMap()).

     

       66
       +
       			ParseFS(Files, path)

     

       67
       +
       		if err != nil {

     

       68
       +
       			log.Fatalf("setting up fragment: %v", err)

     

       69
       +
       		}

     

       70
       +
       

     

       71
       +
       		templates[name] = tmpl

     

       72
       +
       		fragmentPaths = append(fragmentPaths, path)

     

       73
       +
       		log.Printf("loaded fragment: %s", name)

     

       74
       +
       		return nil

     

       75
       +
       	})

     

       76
       +
       	if err != nil {

     

       77
       +
       		log.Fatalf("walking template dir for fragments: %v", err)

     

       78
       +
       	}

     

       79
       +
       

     

       80
       +
       	// Then walk through and setup the rest of the templates

     

       81
       +
       	err = fs.WalkDir(Files, "templates", func(path string, d fs.DirEntry, err error) error {

     

       82
       +
       		if err != nil {

     

       83
       +
       			return err

     

       84
       +
       		}

     

       85
        
       

     

       86
       +
       		if d.IsDir() {

     

       87
        
       			return nil

     

       88
        
       		}

     

       89
       +
       

     

       90
       +
       		if !strings.HasSuffix(path, "html") {

     

       91
       +
       			return nil

     

       92
       +
       		}

     

       93
       +
       

     

       94
       +
       		// Skip fragments as they've already been loaded

     

       95
       +
       		if strings.Contains(path, "fragments/") {

     

       96
       +
       			return nil

     

       97
       +
       		}

     

       98
       +
       

     

       99
       +
       		// Skip layouts

     

       100
       +
       		if strings.Contains(path, "layouts/") {

     

       101
       +
       			return nil

     

       102
       +
       		}

     

       103
       +
       

     

       104
       +
       		name := strings.TrimPrefix(path, "templates/")

     

       105
       +
       		name = strings.TrimSuffix(name, ".html")

     

       106
       +
       

     

       107
       +
       		// Add the page template on top of the base

     

       108
       +
       		allPaths := []string{}

     

       109
       +
       		allPaths = append(allPaths, "templates/layouts/*.html")

     

       110
       +
       		allPaths = append(allPaths, fragmentPaths...)

     

       111
       +
       		allPaths = append(allPaths, path)

     

       112
       +
       		tmpl, err := template.New(name).

     

       113
       +
       			Funcs(funcMap()).

     

       114
       +
       			ParseFS(Files, allPaths...)

     

       115
       +
       		if err != nil {

     

       116
       +
       			return fmt.Errorf("setting up template: %w", err)

     

       117
       +
       		}

     

       118
       +
       

     

       119
       +
       		templates[name] = tmpl

     

       120
       +
       		log.Printf("loaded template: %s", name)

     

       121
        
       		return nil

     

       122
        
       	})

     

       123
        
       	if err != nil {

     
···

       218
        
       	CollaboratingRepos []db.Repo

     

       219
        
       	ProfileStats       ProfileStats

     

       220
        
       	FollowStatus       db.FollowStatus

     

       0
        
       
     

       221
        
       	AvatarUri          string

     

       222
       +
       	ProfileTimeline    *db.ProfileTimeline

     

       223
       +
       

     

       224
       +
       	DidHandleMap map[string]string

     

       225
        
       }

     

       226
        
       

     

       227
        
       type ProfileStats struct {

     
···

       239
        
       }

     

       240
        
       

     

       241
        
       func (p *Pages) FollowFragment(w io.Writer, params FollowFragmentParams) error {

     

       242
       +
       	return p.executePlain("user/fragments/follow", w, params)

     

       243
        
       }

     

       244
        
       

     

       245
        
       type RepoActionsFragmentParams struct {

     
···

       249
        
       }

     

       250
        
       

     

       251
        
       func (p *Pages) RepoActionsFragment(w io.Writer, params RepoActionsFragmentParams) error {

     

       252
       +
       	return p.executePlain("repo/fragments/repoActions", w, params)

     

       253
        
       }

     

       254
        
       

     

       255
        
       type RepoDescriptionParams struct {

     
···

       257
        
       }

     

       258
        
       

     

       259
        
       func (p *Pages) EditRepoDescriptionFragment(w io.Writer, params RepoDescriptionParams) error {

     

       260
       +
       	return p.executePlain("repo/fragments/editRepoDescription", w, params)

     

       261
        
       }

     

       262
        
       

     

       263
        
       func (p *Pages) RepoDescriptionFragment(w io.Writer, params RepoDescriptionParams) error {

     

       264
       +
       	return p.executePlain("repo/fragments/repoDescription", w, params)

     

       265
        
       }

     

       266
        
       

     

       267
        
       type RepoInfo struct {

     
···

       287
        
       	return slices.Contains(r.Roles, "repo:settings")

     

       288
        
       }

     

       289
        
       

     

       290
       +
       func (r RolesInRepo) CollaboratorInviteAllowed() bool {

     

       291
       +
       	return slices.Contains(r.Roles, "repo:invite")

     

       292
       +
       }

     

       293
       +
       

     

       294
       +
       func (r RolesInRepo) RepoDeleteAllowed() bool {

     

       295
       +
       	return slices.Contains(r.Roles, "repo:delete")

     

       296
       +
       }

     

       297
       +
       

     

       298
        
       func (r RolesInRepo) IsOwner() bool {

     

       299
        
       	return slices.Contains(r.Roles, "repo:owner")

     

       300
        
       }

     
···

       333
        
       

     

       334
        
       func (r RepoInfo) GetTabs() [][]string {

     

       335
        
       	tabs := [][]string{

     

       336
       +
       		{"overview", "/", "square-chart-gantt"},

     

       337
       +
       		{"issues", "/issues", "circle-dot"},

     

       338
       +
       		{"pulls", "/pulls", "git-pull-request"},

     

       339
        
       	}

     

       340
        
       

     

       341
        
       	if r.Roles.SettingsAllowed() {

     

       342
       +
       		tabs = append(tabs, []string{"settings", "/settings", "cog"})

     

       343
        
       	}

     

       344
        
       

     

       345
        
       	return tabs

     
···

       390
        
       		ext := filepath.Ext(params.ReadmeFileName)

     

       391
        
       		switch ext {

     

       392
        
       		case ".md", ".markdown", ".mdown", ".mkdn", ".mkd":

     

       393
       +
       			htmlString = markup.RenderMarkdown(params.Readme)

     

       394
        
       			params.Raw = false

     

       395
        
       			params.HTMLReadme = template.HTML(bluemonday.UGCPolicy().Sanitize(htmlString))

     

       396
        
       		default:

     
···

       486
        
       }

     

       487
        
       

     

       488
        
       type RepoBlobParams struct {

     

       489
       +
       	LoggedInUser     *auth.User

     

       490
       +
       	RepoInfo         RepoInfo

     

       491
       +
       	Active           string

     

       492
       +
       	BreadCrumbs      [][]string

     

       493
       +
       	ShowRendered     bool

     

       494
       +
       	RenderToggle     bool

     

       495
       +
       	RenderedContents template.HTML

     

       496
        
       	types.RepoBlobResponse

     

       497
        
       }

     

       498
        
       

     
···

       502
        
       	b.Add(chroma.LiteralString, "noitalic")

     

       503
        
       	style, _ = b.Build()

     

       504
        
       

     

       505
       +
       	if params.ShowRendered {

     

       506
       +
       		switch markup.GetFormat(params.Path) {

     

       507
       +
       		case markup.FormatMarkdown:

     

       508
       +
       			params.RenderedContents = template.HTML(markup.RenderMarkdown(params.Contents))

     

       509
       +
       		}

     

       510
       +
       	}

     

       511
       +
       

     

       512
        
       	if params.Lines < 5000 {

     

       513
        
       		c := params.Contents

     

       514
        
       		formatter := chromahtml.New(

     
···

       619
        
       }

     

       620
        
       

     

       621
        
       func (p *Pages) EditIssueCommentFragment(w io.Writer, params EditIssueCommentParams) error {

     

       622
       +
       	return p.executePlain("repo/issues/fragments/editIssueComment", w, params)

     

       623
        
       }

     

       624
        
       

     

       625
        
       type SingleIssueCommentParams struct {

     
···

       631
        
       }

     

       632
        
       

     

       633
        
       func (p *Pages) SingleIssueCommentFragment(w io.Writer, params SingleIssueCommentParams) error {

     

       634
       +
       	return p.executePlain("repo/issues/fragments/issueComment", w, params)

     

       635
        
       }

     

       636
        
       

     

       637
        
       type RepoNewPullParams struct {

     
···

       714
        
       }

     

       715
        
       

     

       716
        
       func (p *Pages) PullPatchUploadFragment(w io.Writer, params PullPatchUploadParams) error {

     

       717
       +
       	return p.executePlain("repo/pulls/fragments/pullPatchUpload", w, params)

     

       718
        
       }

     

       719
        
       

     

       720
        
       type PullCompareBranchesParams struct {

     
···

       723
        
       }

     

       724
        
       

     

       725
        
       func (p *Pages) PullCompareBranchesFragment(w io.Writer, params PullCompareBranchesParams) error {

     

       726
       +
       	return p.executePlain("repo/pulls/fragments/pullCompareBranches", w, params)

     

       727
        
       }

     

       728
        
       

     

       729
        
       type PullCompareForkParams struct {

     
···

       732
        
       }

     

       733
        
       

     

       734
        
       func (p *Pages) PullCompareForkFragment(w io.Writer, params PullCompareForkParams) error {

     

       735
       +
       	return p.executePlain("repo/pulls/fragments/pullCompareForks", w, params)

     

       736
        
       }

     

       737
        
       

     

       738
        
       type PullCompareForkBranchesParams struct {

     
···

       742
        
       }

     

       743
        
       

     

       744
        
       func (p *Pages) PullCompareForkBranchesFragment(w io.Writer, params PullCompareForkBranchesParams) error {

     

       745
       +
       	return p.executePlain("repo/pulls/fragments/pullCompareForksBranches", w, params)

     

       746
        
       }

     

       747
        
       

     

       748
        
       type PullResubmitParams struct {

     
···

       753
        
       }

     

       754
        
       

     

       755
        
       func (p *Pages) PullResubmitFragment(w io.Writer, params PullResubmitParams) error {

     

       756
       +
       	return p.executePlain("repo/pulls/fragments/pullResubmit", w, params)

     

       757
        
       }

     

       758
        
       

     

       759
        
       type PullActionsParams struct {

     
···

       766
        
       }

     

       767
        
       

     

       768
        
       func (p *Pages) PullActionsFragment(w io.Writer, params PullActionsParams) error {

     

       769
       +
       	return p.executePlain("repo/pulls/fragments/pullActions", w, params)

     

       770
        
       }

     

       771
        
       

     

       772
        
       type PullNewCommentParams struct {

     
···

       777
        
       }

     

       778
        
       

     

       779
        
       func (p *Pages) PullNewCommentFragment(w io.Writer, params PullNewCommentParams) error {

     

       780
       +
       	return p.executePlain("repo/pulls/fragments/pullNewComment", w, params)

     

       781
        
       }

     

       782
        
       

     

       783
        
       func (p *Pages) Static() http.Handler {

-33

appview/pages/templates/fragments/cloneInstructions.html

···

       1
       -
       {{ define "fragments/cloneInstructions" }}

     

       2
       -
       <section class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto flex flex-col gap-4">

     

       3
       -
         <div class="flex flex-col gap-2">

     

       4
       -
           <strong>push</strong>

     

       5
       -
           <div class="md:pl-4 overflow-x-auto whitespace-nowrap">

     

       6
       -
             <code class="dark:text-gray-100">git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>

     

       7
       -
           </div>

     

       8
       -
         </div>

     

       9
       -
       

     

       10
       -
         <div class="flex flex-col gap-2">

     

       11
       -
           <strong>clone</strong>

     

       12
       -
           <div class="md:pl-4 flex flex-col gap-2">

     

       13
       -
       

     

       14
       -
             <div class="flex items-center gap-3">

     

       15
       -
               <span class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white">HTTP</span>

     

       16
       -
               <div class="overflow-x-auto whitespace-nowrap flex-1">

     

       17
       -
                 <code class="dark:text-gray-100">git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>

     

       18
       -
               </div>

     

       19
       -
             </div>

     

       20
       -
       

     

       21
       -
             <div class="flex items-center gap-3">

     

       22
       -
               <span class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white">SSH</span>

     

       23
       -
               <div class="overflow-x-auto whitespace-nowrap flex-1">

     

       24
       -
                 <code class="dark:text-gray-100">git clone git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>

     

       25
       -
               </div>

     

       26
       -
             </div>

     

       27
       -
           </div>

     

       28
       -
         </div>

     

       29
       -
       

     

       30
       -
       

     

       31
       -
         <p class="py-2 text-gray-500 dark:text-gray-400">Note that for self-hosted knots, clone URLs may be different based on your setup.</p>

     

       32
       -
       </section>

     

       33
       -
       {{ end }}

-116

appview/pages/templates/fragments/diff.html

···

       1
       -
       {{ define "fragments/diff" }}

     

       2
       -
       {{ $repo := index . 0 }}

     

       3
       -
       {{ $diff := index . 1 }}

     

       4
       -
       {{ $commit := $diff.Commit }}

     

       5
       -
       {{ $stat := $diff.Stat }}

     

       6
       -
       {{ $diff := $diff.Diff }}

     

       7
       -
       

     

       8
       -
         {{ $this := $commit.This }}

     

       9
       -
         {{ $parent := $commit.Parent }}

     

       10
       -
       

     

       11
       -
         {{ $last := sub (len $diff) 1 }}

     

       12
       -
         {{ range $idx, $hunk := $diff }}

     

       13
       -
         {{ with $hunk }}

     

       14
       -
         <section class="mt-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">

     

       15
       -
           <div id="file-{{ .Name.New }}">

     

       16
       -
             <div id="diff-file">

     

       17
       -
               <details open>

     

       18
       -
                 <summary class="list-none cursor-pointer sticky top-0">

     

       19
       -
                   <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between">

     

       20
       -
                     <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto" style="direction: rtl;">

     

       21
       -
                       {{ $markerstyle := "diff-type p-1 mr-1 font-mono text-sm rounded select-none" }}

     

       22
       -
       

     

       23
       -
                       <div class="flex gap-2 items-center" style="direction: ltr;">

     

       24
       -
                       {{ if .IsNew }}

     

       25
       -
                       <span class="bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400 {{ $markerstyle }}">ADDED</span>

     

       26
       -
                       {{ else if .IsDelete }}

     

       27
       -
                       <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">DELETED</span>

     

       28
       -
                       {{ else if .IsCopy }}

     

       29
       -
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">COPIED</span>

     

       30
       -
                       {{ else if .IsRename }}

     

       31
       -
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">RENAMED</span>

     

       32
       -
                       {{ else }}

     

       33
       -
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">MODIFIED</span>

     

       34
       -
                       {{ end }}

     

       35
       -
       

     

       36
       -
                       {{ if .IsDelete }}

     

       37
       -
                       <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this }}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.Old }}"{{end}}>

     

       38
       -
                         {{ .Name.Old }}

     

       39
       -
                       </a>

     

       40
       -
                       {{ else if (or .IsCopy .IsRename) }}

     

       41
       -
                       <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $parent}}href="/{{ $repo }}/blob/{{ $parent }}/{{ .Name.Old }}"{{end}}>

     

       42
       -
                         {{ .Name.Old }}

     

       43
       -
                       </a>

     

       44
       -
                       {{ i "arrow-right" "w-4 h-4" }}

     

       45
       -
                       <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>

     

       46
       -
                         {{ .Name.New }}

     

       47
       -
                       </a>

     

       48
       -
                       {{ else }}

     

       49
       -
                       <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>

     

       50
       -
                         {{ .Name.New }}

     

       51
       -
                       </a>

     

       52
       -
                       {{ end }}

     

       53
       -
                       </div>

     

       54
       -
                     </div>

     

       55
       -
       

     

       56
       -
                     {{ $iconstyle := "p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" }}

     

       57
       -
                     <div id="right-side-items" class="p-2 flex items-center">

     

       58
       -
                       <a title="top of file" href="#file-{{ .Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up-to-line" "w-4 h-4" }}</a>

     

       59
       -
                       {{ if gt $idx 0 }}

     

       60
       -
                         {{ $prev := index $diff (sub $idx 1) }}

     

       61
       -
                         <a title="previous file" href="#file-{{ $prev.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up" "w-4 h-4" }}</a>

     

       62
       -
                       {{ end }}

     

       63
       -
       

     

       64
       -
                       {{ if lt $idx $last }}

     

       65
       -
                         {{ $next := index $diff (add $idx 1) }}

     

       66
       -
                         <a title="next file" href="#file-{{ $next.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-down" "w-4 h-4" }}</a>

     

       67
       -
                       {{ end }}

     

       68
       -
                     </div>

     

       69
       -
       

     

       70
       -
                   </div>

     

       71
       -
                 </summary>

     

       72
       -
       

     

       73
       -
                 <div class="transition-all duration-700 ease-in-out">

     

       74
       -
                   {{ if .IsDelete }}

     

       75
       -
                   <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       76
       -
                   This file has been deleted in this commit.

     

       77
       -
                   </p>

     

       78
       -
                   {{ else }}

     

       79
       -
                   {{ if .IsBinary }}

     

       80
       -
                   <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       81
       -
                   This is a binary file and will not be displayed.

     

       82
       -
                   </p>

     

       83
       -
                   {{ else }}

     

       84
       -
                   <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none">{{- .Header -}}</div>{{- range .Lines -}}

     

       85
       -
                              {{- if eq .Op.String "+" -}}

     

       86
       -
                              <div class="bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 flex min-w-full">

     

       87
       -
                                <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div>

     

       88
       -
                                <div class="p-1 whitespace-pre">{{ .Line }}</div>

     

       89
       -
                              </div>

     

       90
       -
                              {{- end -}}

     

       91
       -
                              {{- if eq .Op.String "-" -}}

     

       92
       -
                              <div class="bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 flex min-w-full">

     

       93
       -
                                <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div>

     

       94
       -
                                <div class="p-1 whitespace-pre">{{ .Line }}</div>

     

       95
       -
                              </div>

     

       96
       -
                              {{- end -}}

     

       97
       -
                              {{- if eq .Op.String " " -}}

     

       98
       -
                              <div class="bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 flex min-w-full">

     

       99
       -
                                <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div>

     

       100
       -
                                <div class="p-1 whitespace-pre">{{ .Line }}</div>

     

       101
       -
                              </div>

     

       102
       -
                              {{- end -}}

     

       103
       -
                            {{- end -}}

     

       104
       -
                          {{- end -}}</div></div></pre>

     

       105
       -
                   {{- end -}}

     

       106
       -
                   {{ end }}

     

       107
       -
                 </div>

     

       108
       -
       

     

       109
       -
               </details>

     

       110
       -
       

     

       111
       -
             </div>

     

       112
       -
           </div>

     

       113
       -
         </section>

     

       114
       -
         {{ end }}

     

       115
       -
         {{ end }}

     

       116
       -
       {{ end }}

-52

appview/pages/templates/fragments/editIssueComment.html

···

       1
       -
       {{ define "fragments/editIssueComment" }}

     

       2
       -
         {{ with .Comment }}

     

       3
       -
         <div id="comment-container-{{.CommentId}}">

     

       4
       -
           <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm">

     

       5
       -
             {{ $owner := didOrHandle $.LoggedInUser.Did $.LoggedInUser.Handle }}

     

       6
       -
             <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>

     

       7
       -
       

     

       8
       -
             <!-- show user "hats" -->

     

       9
       -
             {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }}

     

       10
       -
             {{ if $isIssueAuthor }}

     

       11
       -
             <span class="before:content-['·']"></span>

     

       12
       -
             <span class="rounded bg-gray-100 text-black font-mono px-2 mx-1/2 inline-flex items-center">

     

       13
       -
               author

     

       14
       -
             </span>

     

       15
       -
             {{ end }}

     

       16
       -
       

     

       17
       -
             <span class="before:content-['·']"></span>

     

       18
       -
             <a

     

       19
       -
                 href="#{{ .CommentId }}"

     

       20
       -
                 class="text-gray-500 hover:text-gray-500 hover:underline no-underline"

     

       21
       -
                 id="{{ .CommentId }}">

     

       22
       -
               {{ .Created | timeFmt }}

     

       23
       -
             </a>

     

       24
       -
       

     

       25
       -
             <button

     

       26
       -
               class="btn px-2 py-1 flex items-center gap-2 text-sm"

     

       27
       -
               hx-post="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit"

     

       28
       -
               hx-include="#edit-textarea-{{ .CommentId }}"

     

       29
       -
               hx-target="#comment-container-{{ .CommentId }}"

     

       30
       -
               hx-swap="outerHTML">

     

       31
       -
               {{ i "check" "w-4 h-4" }}

     

       32
       -
             </button>

     

       33
       -
             <button

     

       34
       -
               class="btn px-2 py-1  flex items-center gap-2 text-sm"

     

       35
       -
               hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"

     

       36
       -
               hx-target="#comment-container-{{ .CommentId }}"

     

       37
       -
               hx-swap="outerHTML">

     

       38
       -
               {{ i "x" "w-4 h-4" }}

     

       39
       -
             </button>

     

       40
       -
             <span id="comment-{{.CommentId}}-status"></span>

     

       41
       -
           </div>

     

       42
       -
       

     

       43
       -
           <div>

     

       44
       -
             <textarea

     

       45
       -
               id="edit-textarea-{{ .CommentId }}"

     

       46
       -
               name="body"

     

       47
       -
               class="w-full p-2 border rounded min-h-[100px]">{{ .Body }}</textarea>

     

       48
       -
           </div>

     

       49
       -
         </div>

     

       50
       -
         {{ end }}

     

       51
       -
       {{ end }}

     

       52
       -

-11

appview/pages/templates/fragments/editRepoDescription.html

···

       1
       -
       {{ define "fragments/editRepoDescription" }}

     

       2
       -
       <form hx-put="/{{ .RepoInfo.FullName }}/description" hx-target="this" hx-swap="outerHTML" class="flex flex-wrap gap-2">

     

       3
       -
           <input type="text" class="p-1" name="description" value="{{ .RepoInfo.Description }}">

     

       4
       -
           <button type="submit" class="btn p-2 flex items-center gap-2 no-underline text-sm">

     

       5
       -
             {{ i "check" "w-3 h-3" }} save 

     

       6
       -
           </button>

     

       7
       -
           <button type="button" class="btn p-2 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description" >

     

       8
       -
             {{ i "x" "w-3 h-3" }} cancel 

     

       9
       -
           </button>

     

       10
       -
       </form>

     

       11
       -
       {{ end }}

-17

appview/pages/templates/fragments/follow.html

···

       1
       -
       {{ define "fragments/follow" }}

     

       2
       -
         <button id="followBtn"

     

       3
       -
           class="btn mt-2 w-full"

     

       4
       -
       

     

       5
       -
           {{ if eq .FollowStatus.String "IsNotFollowing" }}

     

       6
       -
           hx-post="/follow?subject={{.UserDid}}"

     

       7
       -
           {{ else }}

     

       8
       -
           hx-delete="/follow?subject={{.UserDid}}"

     

       9
       -
           {{ end }}

     

       10
       -
       

     

       11
       -
           hx-trigger="click"

     

       12
       -
           hx-target="#followBtn"

     

       13
       -
           hx-swap="outerHTML"

     

       14
       -
           >

     

       15
       -
           {{ if eq .FollowStatus.String "IsNotFollowing" }}Follow{{ else }}Unfollow{{ end }}

     

       16
       -
         </button>

     

       17
       -
       {{ end }}

-60

appview/pages/templates/fragments/issueComment.html

···

       1
       -
       {{ define "fragments/issueComment" }}

     

       2
       -
         {{ with .Comment }}

     

       3
       -
         <div id="comment-container-{{.CommentId}}">

     

       4
       -
           <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm">

     

       5
       -
             {{ $owner := index $.DidHandleMap .OwnerDid }}

     

       6
       -
             <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>

     

       7
       -
       

     

       8
       -
             <!-- show user "hats" -->

     

       9
       -
             {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }}

     

       10
       -
             {{ if $isIssueAuthor }}

     

       11
       -
             <span class="before:content-['·']"></span>

     

       12
       -
             <span class="rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       13
       -
               author

     

       14
       -
             </span>

     

       15
       -
             {{ end }}

     

       16
       -
       

     

       17
       -
             <span class="before:content-['·']"></span>

     

       18
       -
             <a

     

       19
       -
                 href="#{{ .CommentId }}"

     

       20
       -
                 class="text-gray-500 hover:text-gray-500 hover:underline no-underline"

     

       21
       -
                 id="{{ .CommentId }}">

     

       22
       -
               {{ if .Deleted }}

     

       23
       -
                 deleted {{ .Deleted | timeFmt }}

     

       24
       -
               {{ else if .Edited }}

     

       25
       -
                 edited {{ .Edited | timeFmt }}

     

       26
       -
               {{ else }}

     

       27
       -
                 {{ .Created | timeFmt }}

     

       28
       -
               {{ end }}

     

       29
       -
             </a>

     

       30
       -
       

     

       31
       -
             {{ $isCommentOwner := and $.LoggedInUser (eq $.LoggedInUser.Did .OwnerDid) }}

     

       32
       -
             {{ if and $isCommentOwner (not .Deleted) }}

     

       33
       -
             <button 

     

       34
       -
               class="btn px-2 py-1 text-sm" 

     

       35
       -
               hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit"

     

       36
       -
               hx-swap="outerHTML"

     

       37
       -
               hx-target="#comment-container-{{.CommentId}}"

     

       38
       -
               >

     

       39
       -
               {{ i "pencil" "w-4 h-4" }}

     

       40
       -
             </button>

     

       41
       -
             <button 

     

       42
       -
               class="btn px-2 py-1 text-sm text-red-500"

     

       43
       -
               hx-delete="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"

     

       44
       -
               hx-confirm="Are you sure you want to delete your comment?"

     

       45
       -
               hx-swap="outerHTML"

     

       46
       -
               hx-target="#comment-container-{{.CommentId}}"

     

       47
       -
               >

     

       48
       -
               {{ i "trash-2" "w-4 h-4" }}

     

       49
       -
             </button>

     

       50
       -
             {{ end }}

     

       51
       -
       

     

       52
       -
           </div>

     

       53
       -
           {{ if not .Deleted }}

     

       54
       -
           <div class="prose dark:prose-invert">

     

       55
       -
             {{ .Body | markdown }}

     

       56
       -
           </div>

     

       57
       -
           {{ end }}

     

       58
       -
         </div>

     

       59
       -
         {{ end }}

     

       60
       -
       {{ end }}

-91

appview/pages/templates/fragments/pullActions.html

···

       1
       -
       {{ define "fragments/pullActions" }}

     

       2
       -
         {{ $lastIdx := sub (len .Pull.Submissions) 1 }}

     

       3
       -
         {{ $roundNumber := .RoundNumber }}

     

       4
       -
       

     

       5
       -
         {{ $isPushAllowed := .RepoInfo.Roles.IsPushAllowed }}

     

       6
       -
         {{ $isMerged := .Pull.State.IsMerged }}

     

       7
       -
         {{ $isClosed := .Pull.State.IsClosed }}

     

       8
       -
         {{ $isOpen := .Pull.State.IsOpen }}

     

       9
       -
         {{ $isConflicted := and .MergeCheck (or .MergeCheck.Error .MergeCheck.IsConflicted) }}

     

       10
       -
         {{ $isPullAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Pull.OwnerDid) }}

     

       11
       -
         {{ $isLastRound := eq $roundNumber $lastIdx }}

     

       12
       -
         {{ $isSameRepoBranch := .Pull.IsSameRepoBranch }}

     

       13
       -
         {{ $isUpToDate := .ResubmitCheck.No }}

     

       14
       -
         <div class="relative w-fit">

     

       15
       -
           <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       16
       -
           <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2">

     

       17
       -
               <button 

     

       18
       -
                 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment"

     

       19
       -
                 hx-target="#actions-{{$roundNumber}}"

     

       20
       -
                 hx-swap="outerHtml"

     

       21
       -
                 class="btn p-2 flex items-center gap-2 no-underline hover:no-underline">

     

       22
       -
                   {{ i "message-square-plus" "w-4 h-4" }}

     

       23
       -
                   <span>comment</span>

     

       24
       -
               </button>

     

       25
       -
               {{ if and $isPushAllowed $isOpen $isLastRound }}

     

       26
       -
                 {{ $disabled := "" }}

     

       27
       -
                 {{ if $isConflicted }}

     

       28
       -
                   {{ $disabled = "disabled" }}

     

       29
       -
                 {{ end }}

     

       30
       -
                 <button 

     

       31
       -
                   hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge"

     

       32
       -
                   hx-swap="none"

     

       33
       -
                   hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?"

     

       34
       -
                   class="btn p-2 flex items-center gap-2" {{ $disabled }}>

     

       35
       -
                   {{ i "git-merge" "w-4 h-4" }}

     

       36
       -
                     <span>merge</span>

     

       37
       -
                 </button>

     

       38
       -
               {{ end }}

     

       39
       -
       

     

       40
       -
               {{ if and $isPullAuthor $isOpen $isLastRound }}

     

       41
       -
                 {{ $disabled := "" }}

     

       42
       -
                 {{ if $isUpToDate }}

     

       43
       -
                   {{ $disabled = "disabled" }}

     

       44
       -
                 {{ end }}

     

       45
       -
                 <button id="resubmitBtn"

     

       46
       -
                     {{ if not .Pull.IsPatch }}

     

       47
       -
                       hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit"

     

       48
       -
                     {{ else }}

     

       49
       -
                       hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit"

     

       50
       -
                       hx-target="#actions-{{$roundNumber}}"

     

       51
       -
                       hx-swap="outerHtml"

     

       52
       -
                     {{ end }}

     

       53
       -
       

     

       54
       -
                     hx-disabled-elt="#resubmitBtn"

     

       55
       -
                     class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" {{ $disabled }}

     

       56
       -
       

     

       57
       -
                     {{ if $disabled }}

     

       58
       -
                     title="Update this branch to resubmit this pull request"

     

       59
       -
                     {{ else }}

     

       60
       -
                     title="Resubmit this pull request"

     

       61
       -
                     {{ end }}

     

       62
       -
                     >

     

       63
       -
                   {{ i "rotate-ccw" "w-4 h-4" }}

     

       64
       -
                     <span>resubmit</span>

     

       65
       -
                 </button>

     

       66
       -
               {{ end }}

     

       67
       -
       

     

       68
       -
               {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }}

     

       69
       -
               <button 

     

       70
       -
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close"

     

       71
       -
                 hx-swap="none"

     

       72
       -
                 class="btn p-2 flex items-center gap-2">

     

       73
       -
                 {{ i "ban" "w-4 h-4" }}

     

       74
       -
                   <span>close</span>

     

       75
       -
               </button>

     

       76
       -
               {{ end }}

     

       77
       -
       

     

       78
       -
               {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }}

     

       79
       -
               <button 

     

       80
       -
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen"

     

       81
       -
                 hx-swap="none"

     

       82
       -
                 class="btn p-2 flex items-center gap-2">

     

       83
       -
                 {{ i "circle-dot" "w-4 h-4" }}

     

       84
       -
                   <span>reopen</span>

     

       85
       -
               </button>

     

       86
       -
               {{ end }}

     

       87
       -
           </div>

     

       88
       -
         </div>

     

       89
       -
       {{ end }}

     

       90
       -
       

     

       91
       -

-20

appview/pages/templates/fragments/pullCompareBranches.html

···

       1
       -
       {{ define "fragments/pullCompareBranches" }}

     

       2
       -
           <div id="patch-upload">

     

       3
       -
               <label for="targetBranch" class="dark:text-white"

     

       4
       -
                   >select a branch</label

     

       5
       -
               >

     

       6
       -
               <div class="flex flex-wrap gap-2 items-center">

     

       7
       -
                   <select

     

       8
       -
                       name="sourceBranch"

     

       9
       -
                       class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       10
       -
                   >

     

       11
       -
                       <option disabled selected>source branch</option>

     

       12
       -
                       {{ range .Branches }}

     

       13
       -
                           <option value="{{ .Reference.Name }}" class="py-1">

     

       14
       -
                               {{ .Reference.Name }}

     

       15
       -
                           </option>

     

       16
       -
                       {{ end }}

     

       17
       -
                   </select>

     

       18
       -
               </div>

     

       19
       -
           </div>

     

       20
       -
       {{ end }}

-42

appview/pages/templates/fragments/pullCompareForks.html

···

       1
       -
       {{ define "fragments/pullCompareForks" }}

     

       2
       -
           <div id="patch-upload">

     

       3
       -
               <label for="forkSelect" class="dark:text-white"

     

       4
       -
                   >select a fork to compare</label

     

       5
       -
               >

     

       6
       -
               <div class="flex flex-wrap gap-4 items-center mb-4">

     

       7
       -
                   <div class="flex flex-wrap gap-2 items-center">

     

       8
       -
                       <select

     

       9
       -
                           id="forkSelect"

     

       10
       -
                           name="fork"

     

       11
       -
                           required

     

       12
       -
                           class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       13
       -
                           hx-get="/{{ $.RepoInfo.FullName }}/pulls/new/fork-branches"

     

       14
       -
                           hx-target="#branch-selection"

     

       15
       -
                           hx-vals='{"fork": this.value}'

     

       16
       -
                           hx-swap="innerHTML"

     

       17
       -
                           onchange="document.getElementById('hiddenForkInput').value = this.value;"

     

       18
       -
                       >

     

       19
       -
                           <option disabled selected>select a fork</option>

     

       20
       -
                           {{ range .Forks }}

     

       21
       -
                               <option value="{{ .Name }}" class="py-1">

     

       22
       -
                                   {{ .Name }}

     

       23
       -
                               </option>

     

       24
       -
                           {{ end }}

     

       25
       -
                       </select>

     

       26
       -
       

     

       27
       -
                       <input

     

       28
       -
                           type="hidden"

     

       29
       -
                           id="hiddenForkInput"

     

       30
       -
                           name="fork"

     

       31
       -
                           value=""

     

       32
       -
                       />

     

       33
       -
                   </div>

     

       34
       -
       

     

       35
       -
                   <div id="branch-selection">

     

       36
       -
                       <div class="text-sm text-gray-500 dark:text-gray-400">

     

       37
       -
                           Select a fork first to view available branches

     

       38
       -
                       </div>

     

       39
       -
                   </div>

     

       40
       -
               </div>

     

       41
       -
           </div>

     

       42
       -
       {{ end }}

-15

appview/pages/templates/fragments/pullCompareForksBranches.html

···

       1
       -
       {{ define "fragments/pullCompareForksBranches" }}

     

       2
       -
           <div class="flex flex-wrap gap-2 items-center">

     

       3
       -
               <select

     

       4
       -
                   name="sourceBranch"

     

       5
       -
                   class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       6
       -
               >

     

       7
       -
                   <option disabled selected>source branch</option>

     

       8
       -
                   {{ range .SourceBranches }}

     

       9
       -
                       <option value="{{ .Reference.Name }}" class="py-1">

     

       10
       -
                           {{ .Reference.Name }}

     

       11
       -
                       </option>

     

       12
       -
                   {{ end }}

     

       13
       -
               </select>

     

       14
       -
           </div>

     

       15
       -
       {{ end }}

-32

appview/pages/templates/fragments/pullNewComment.html

···

       1
       -
       {{ define "fragments/pullNewComment" }}

     

       2
       -
       <div 

     

       3
       -
         id="pull-comment-card-{{ .RoundNumber }}" 

     

       4
       -
         class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2">

     

       5
       -
         <div class="text-sm text-gray-500 dark:text-gray-400">

     

       6
       -
           {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }}

     

       7
       -
         </div>

     

       8
       -
         <form

     

       9
       -
           hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"

     

       10
       -
           hx-swap="none"

     

       11
       -
           class="w-full flex flex-wrap gap-2">

     

       12
       -
           <textarea

     

       13
       -
               name="body"

     

       14
       -
               class="w-full p-2 rounded border border-gray-200"

     

       15
       -
               placeholder="Add to the discussion..."></textarea>

     

       16
       -
           <button type="submit" class="btn flex items-center gap-2">

     

       17
       -
             {{ i "message-square" "w-4 h-4" }} comment

     

       18
       -
           </button>

     

       19
       -
           <button 

     

       20
       -
             type="button" 

     

       21
       -
             class="btn flex items-center gap-2" 

     

       22
       -
             hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions"

     

       23
       -
             hx-swap="outerHTML"

     

       24
       -
             hx-target="#pull-comment-card-{{ .RoundNumber }}">

     

       25
       -
             {{ i "x" "w-4 h-4" }}

     

       26
       -
             <span>cancel</span>

     

       27
       -
           </button>

     

       28
       -
           <div id="pull-comment"></div>

     

       29
       -
         </form>

     

       30
       -
       </div>

     

       31
       -
       {{ end }}

     

       32
       -

-14

appview/pages/templates/fragments/pullPatchUpload.html

···

       1
       -
       {{ define "fragments/pullPatchUpload" }}

     

       2
       -
           <div id="patch-upload">

     

       3
       -
               <textarea

     

       4
       -
                   name="patch"

     

       5
       -
                   id="patch"

     

       6
       -
                   rows="12"

     

       7
       -
                   class="w-full resize-y font-mono dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       8
       -
                   placeholder="diff --git a/file.txt b/file.txt

     

       9
       -
                   index 1234567..abcdefg 100644

     

       10
       -
                   --- a/file.txt

     

       11
       -
                   +++ b/file.txt"

     

       12
       -
               ></textarea>

     

       13
       -
           </div>

     

       14
       -
       {{ end }}

-52

appview/pages/templates/fragments/pullResubmit.html

···

       1
       -
       {{ define "fragments/pullResubmit" }}

     

       2
       -
         <div

     

       3
       -
             id="resubmit-pull-card"

     

       4
       -
             class="rounded relative border bg-amber-50 dark:bg-amber-900 border-amber-200 dark:border-amber-500 px-6 py-2">

     

       5
       -
       

     

       6
       -
             <div class="flex items-center gap-2 text-amber-500 dark:text-amber-50">

     

       7
       -
               {{ i "pencil" "w-4 h-4" }}

     

       8
       -
               <span class="font-medium">resubmit your patch</span>

     

       9
       -
             </div>

     

       10
       -
       

     

       11
       -
             <div class="mt-2 text-sm text-gray-700 dark:text-gray-200">

     

       12
       -
               You can update this patch to address any reviews. 

     

       13
       -
               This will begin a new round of reviews,

     

       14
       -
               but you'll still be able to view your previous submissions and feedback.

     

       15
       -
             </div>

     

       16
       -
       

     

       17
       -
             <div class="mt-4 flex flex-col">

     

       18
       -
               <form 

     

       19
       -
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 

     

       20
       -
                 hx-swap="none"

     

       21
       -
                 class="w-full flex flex-wrap gap-2">

     

       22
       -
                 <textarea

     

       23
       -
                   name="patch"

     

       24
       -
                   class="w-full p-2 mb-2"

     

       25
       -
                   placeholder="Paste your updated patch here."

     

       26
       -
                   rows="15"

     

       27
       -
                   >{{.Pull.LatestPatch}}</textarea>

     

       28
       -
                 <button

     

       29
       -
                     type="submit"

     

       30
       -
                     class="btn flex items-center gap-2"

     

       31
       -
                     {{ if or .Pull.State.IsClosed }}

     

       32
       -
                     disabled

     

       33
       -
                     {{ end }}>

     

       34
       -
                   {{ i "rotate-ccw" "w-4 h-4" }}

     

       35
       -
                   <span>resubmit</span>

     

       36
       -
                 </button>

     

       37
       -
                 <button 

     

       38
       -
                   type="button" 

     

       39
       -
                   class="btn flex items-center gap-2" 

     

       40
       -
                   hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Pull.LastRoundNumber }}/actions"

     

       41
       -
                   hx-swap="outerHTML"

     

       42
       -
                   hx-target="#resubmit-pull-card">

     

       43
       -
                   {{ i "x" "w-4 h-4" }}

     

       44
       -
                   <span>cancel</span>

     

       45
       -
                 </button>

     

       46
       -
               </form>

     

       47
       -
       

     

       48
       -
               <div id="resubmit-error" class="error"></div>

     

       49
       -
               <div id="resubmit-success" class="success"></div>

     

       50
       -
             </div>

     

       51
       -
         </div>

     

       52
       -
       {{ end }}

-41

appview/pages/templates/fragments/repoActions.html

···

       1
       -
       {{ define "fragments/repoActions" }}

     

       2
       -
       <div class="flex items-center gap-2 z-auto">

     

       3
       -
         <button id="starBtn"

     

       4
       -
           class="btn disabled:opacity-50 disabled:cursor-not-allowed"

     

       5
       -
       

     

       6
       -
           {{ if .IsStarred }}

     

       7
       -
           hx-delete="/star?subject={{.RepoAt}}&countHint={{.Stats.StarCount}}"

     

       8
       -
           {{ else }}

     

       9
       -
           hx-post="/star?subject={{.RepoAt}}&countHint={{.Stats.StarCount}}"

     

       10
       -
           {{ end }}

     

       11
       -
       

     

       12
       -
           hx-trigger="click"

     

       13
       -
           hx-target="#starBtn"

     

       14
       -
           hx-swap="outerHTML"

     

       15
       -
           hx-disabled-elt="#starBtn"

     

       16
       -
           >

     

       17
       -
           <div class="flex gap-2 items-center">

     

       18
       -
             {{ if .IsStarred }}

     

       19
       -
             {{ i "star" "w-4 h-4 fill-current" }}

     

       20
       -
             {{ else }}

     

       21
       -
             {{ i "star" "w-4 h-4" }}

     

       22
       -
             {{ end }}

     

       23
       -
             <span>

     

       24
       -
               {{ .Stats.StarCount }}

     

       25
       -
             </span>

     

       26
       -
           </div>

     

       27
       -
         </button>

     

       28
       -
         {{ if .DisableFork }}

     

       29
       -
         <button class="btn no-underline hover:no-underline flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" disabled title="Empty repositories cannot be forked">

     

       30
       -
             {{ i "git-fork" "w-4 h-4"}}

     

       31
       -
             fork

     

       32
       -
         </button>

     

       33
       -
         {{ else }}

     

       34
       -
         <a class="btn no-underline hover:no-underline flex items-center gap-2" href="/{{ .FullName }}/fork">

     

       35
       -
             {{ i "git-fork" "w-4 h-4"}}

     

       36
       -
             fork

     

       37
       -
         </a>

     

       38
       -
         {{ end }}

     

       39
       -
       </div>

     

       40
       -
       {{ end }}

     

       41
       -

-15

appview/pages/templates/fragments/repoDescription.html

···

       1
       -
       {{ define "fragments/repoDescription" }}

     

       2
       -
       <span id="repo-description" class="flex flex-wrap items-center gap-2" hx-target="this" hx-swap="outerHTML">

     

       3
       -
           {{ if .RepoInfo.Description }}

     

       4
       -
               {{ .RepoInfo.Description }}

     

       5
       -
           {{ else }}

     

       6
       -
               <span class="italic">this repo has no description</span>

     

       7
       -
           {{ end }}

     

       8
       -
       

     

       9
       -
           {{ if .RepoInfo.Roles.IsOwner }}

     

       10
       -
           <button class="btn p-2 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description/edit">

     

       11
       -
             {{ i "pencil" "w-3 h-3" }} edit

     

       12
       -
           </button>

     

       13
       -
           {{ end }}

     

       14
       -
       </span>

     

       15
       -
       {{ end }}

+10 -6

appview/pages/templates/layouts/repobase.html

···

       19
        
             <a href="/{{ .RepoInfo.FullName }}" class="font-bold">{{ .RepoInfo.Name }}</a>

     

       20
        
           </div>

     

       21
        
       

     

       22
       -
           {{ template "fragments/repoActions" .RepoInfo }}

     

       23
        
         </div>

     

       24
       -
         {{ template "fragments/repoDescription" . }}

     

       25
        
       </section>

     

       26
        
           <section class="min-h-screen flex flex-col drop-shadow-sm">

     

       27
        
               <nav class="w-full pl-4 overflow-auto">

     
···

       32
        
                       {{ range $item := $tabs }}

     

       33
        
                           {{ $key := index $item 0 }}

     

       34
        
                           {{ $value := index $item 1 }}

     

       0
        
       
     

       35
        
                           {{ $meta := index $tabmeta $key }}

     

       36
        
                           <a

     

       37
        
                               href="/{{ $.RepoInfo.FullName }}{{ $value }}"

     
···

       47
        
                                    {{ end }}

     

       48
        
                                    "

     

       49
        
                               >

     

       50
       -
                                   {{ $key }}

     

       51
       -
                                   {{ if not (isNil $meta) }}

     

       52
       -
                                   <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm">{{  $meta }}</span>

     

       53
       -
                                   {{ end }}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       54
        
                               </div>

     

       55
        
                           </a>

     

       56
        
                       {{ end }}

···

       19
        
             <a href="/{{ .RepoInfo.FullName }}" class="font-bold">{{ .RepoInfo.Name }}</a>

     

       20
        
           </div>

     

       21
        
       

     

       22
       +
           {{ template "repo/fragments/repoActions" .RepoInfo }}

     

       23
        
         </div>

     

       24
       +
         {{ template "repo/fragments/repoDescription" . }}

     

       25
        
       </section>

     

       26
        
           <section class="min-h-screen flex flex-col drop-shadow-sm">

     

       27
        
               <nav class="w-full pl-4 overflow-auto">

     
···

       32
        
                       {{ range $item := $tabs }}

     

       33
        
                           {{ $key := index $item 0 }}

     

       34
        
                           {{ $value := index $item 1 }}

     

       35
       +
                           {{ $icon := index $item 2 }}

     

       36
        
                           {{ $meta := index $tabmeta $key }}

     

       37
        
                           <a

     

       38
        
                               href="/{{ $.RepoInfo.FullName }}{{ $value }}"

     
···

       48
        
                                    {{ end }}

     

       49
        
                                    "

     

       50
        
                               >

     

       51
       +
                                   <span class="flex items-center justify-center">

     

       52
       +
                                       {{ i $icon "w-4 h-4 mr-2" }}

     

       53
       +
                                       {{ $key }}

     

       54
       +
                                       {{ if not (isNil $meta) }}

     

       55
       +
                                       <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm ml-1">{{  $meta }}</span>

     

       56
       +
                                       {{ end }}

     

       57
       +
                                   </span>

     

       58
        
                               </div>

     

       59
        
                           </a>

     

       60
        
                       {{ end }}

+13 -2

appview/pages/templates/repo/blob.html

···

       29
        
                               >

     

       30
        
                               /

     

       31
        
                           {{ else }}

     

       32
       -
                               <span class="text-bold text-gray-600 dark:text-gray-300"

     

       33
        
                                   >{{ index . 0 }}</span

     

       34
        
                               >

     

       35
        
                           {{ end }}

     
···

       43
        
                       <span>{{ byteFmt .SizeHint }}</span>

     

       44
        
                       <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       45
        
                       <a href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/raw/{{ .Path }}">view raw</a>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       46
        
                   </div>

     

       47
        
               </div>

     

       48
        
           </div>

     
···

       52
        
               </p>

     

       53
        
           {{ else }}

     

       54
        
           <div class="overflow-auto relative">

     

       55
       -
               <div class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ $.Contents | escapeHtml }}</div>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       56
        
           </div>

     

       57
        
           {{ end }}

     

       58
        
       {{ end }}

···

       29
        
                               >

     

       30
        
                               /

     

       31
        
                           {{ else }}

     

       32
       +
                               <span class="text-bold text-black dark:text-white"

     

       33
        
                                   >{{ index . 0 }}</span

     

       34
        
                               >

     

       35
        
                           {{ end }}

     
···

       43
        
                       <span>{{ byteFmt .SizeHint }}</span>

     

       44
        
                       <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       45
        
                       <a href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/raw/{{ .Path }}">view raw</a>

     

       46
       +
                       {{ if .RenderToggle }}

     

       47
       +
                       <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       48
       +
                       <a 

     

       49
       +
                       href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/{{ .Path }}?code={{ .ShowRendered }}" 

     

       50
       +
                       hx-boost="true"

     

       51
       +
                       >view {{ if .ShowRendered }}code{{ else }}rendered{{ end }}</a>

     

       52
       +
                       {{ end }}

     

       53
        
                   </div>

     

       54
        
               </div>

     

       55
        
           </div>

     
···

       59
        
               </p>

     

       60
        
           {{ else }}

     

       61
        
           <div class="overflow-auto relative">

     

       62
       +
               {{ if .ShowRendered }}

     

       63
       +
               <div id="blob-contents" class="prose dark:prose-invert">{{ .RenderedContents }}</div>

     

       64
       +
               {{ else }}

     

       65
       +
               <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ $.Contents | escapeHtml }}</div>

     

       66
       +
               {{ end }}

     

       67
        
           </div>

     

       68
        
           {{ end }}

     

       69
        
       {{ end }}

+2 -21

appview/pages/templates/repo/commit.html

···

       4
        
       

     

       5
        
       {{ $repo := .RepoInfo.FullName }}

     

       6
        
       {{ $commit := .Diff.Commit }}

     

       7
       -
       {{ $stat := .Diff.Stat }}

     

       8
       -
       {{ $diff := .Diff.Diff }}

     

       9
        
       

     

       10
        
       <section class="commit dark:text-white">

     

       11
        
         <div id="commit-message">

     
···

       13
        
           <div>

     

       14
        
             <p class="pb-2">{{ index $messageParts 0 }}</p>

     

       15
        
             {{ if gt (len $messageParts) 1 }}

     

       16
       -
             <p class="mt-1 cursor-text pb-2 text-sm">{{ nl2br (unwrapText (index $messageParts 1)) }}</p>

     

       17
        
             {{ end }}

     

       18
        
           </div>

     

       19
        
         </div>

     
···

       29
        
                 {{ end }}

     

       30
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       31
        
                 {{ timeFmt $commit.Author.When }}

     

       32
       -
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       33
       -
                 <span>{{ $stat.FilesChanged }}</span> files <span class="font-mono">(+{{ $stat.Insertions }}, -{{ $stat.Deletions }})</span>

     

       34
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       35
        
             </p>

     

       36
        
       

     
···

       43
        
             </p>

     

       44
        
         </div>

     

       45
        
       

     

       46
       -
         <div class="diff-stat">

     

       47
       -
           <br>

     

       48
       -
           <strong class="text-sm uppercase mb-4 dark:text-gray-200">Changed files</strong>

     

       49
       -
           <div class="overflow-x-auto">

     

       50
       -
             {{ range $diff }}

     

       51
       -
             <ul class="dark:text-gray-200">

     

       52
       -
               {{ if .IsDelete }}

     

       53
       -
               <li><a href="#file-{{ .Name.Old }}" class="dark:hover:text-gray-300">{{ .Name.Old }}</a></li>

     

       54
       -
               {{ else }}

     

       55
       -
               <li><a href="#file-{{ .Name.New }}" class="dark:hover:text-gray-300">{{ .Name.New }}</a></li>

     

       56
       -
               {{ end }}

     

       57
       -
             </ul>

     

       58
       -
             {{ end }}

     

       59
       -
           </div>

     

       60
       -
         </div>

     

       61
        
       </section>

     

       62
        
       

     

       63
        
       {{end}}

     

       64
        
       

     

       65
        
       {{ define "repoAfter" }}

     

       66
       -
       {{ template "fragments/diff" (list .RepoInfo.FullName .Diff) }}

     

       67
        
       {{end}}

···

       4
        
       

     

       5
        
       {{ $repo := .RepoInfo.FullName }}

     

       6
        
       {{ $commit := .Diff.Commit }}

     

       0
        
       
     

       0
        
       
     

       7
        
       

     

       8
        
       <section class="commit dark:text-white">

     

       9
        
         <div id="commit-message">

     
···

       11
        
           <div>

     

       12
        
             <p class="pb-2">{{ index $messageParts 0 }}</p>

     

       13
        
             {{ if gt (len $messageParts) 1 }}

     

       14
       +
             <p class="mt-1 cursor-text pb-2 text-sm">{{ nl2br (index $messageParts 1) }}</p>

     

       15
        
             {{ end }}

     

       16
        
           </div>

     

       17
        
         </div>

     
···

       27
        
                 {{ end }}

     

       28
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       29
        
                 {{ timeFmt $commit.Author.When }}

     

       0
        
       
     

       0
        
       
     

       30
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       31
        
             </p>

     

       32
        
       

     
···

       39
        
             </p>

     

       40
        
         </div>

     

       41
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       42
        
       </section>

     

       43
        
       

     

       44
        
       {{end}}

     

       45
        
       

     

       46
        
       {{ define "repoAfter" }}

     

       47
       +
       {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff) }}

     

       48
        
       {{end}}

+1 -1

appview/pages/templates/repo/empty.html

···

       9
        
       {{ end }}

     

       10
        
       

     

       11
        
       {{ define "repoAfter" }}

     

       12
       -
           {{ template "fragments/cloneInstructions" . }}

     

       13
        
       {{ end }}

···

       9
        
       {{ end }}

     

       10
        
       

     

       11
        
       {{ define "repoAfter" }}

     

       12
       +
           {{ template "repo/fragments/cloneInstructions" . }}

     

       13
        
       {{ end }}

+51

appview/pages/templates/repo/fragments/cloneInstructions.html

···

       1
       +
       {{ define "repo/fragments/cloneInstructions" }}

     

       2
       +
           <section

     

       3
       +
               class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto flex flex-col gap-4"

     

       4
       +
           >

     

       5
       +
               <div class="flex flex-col gap-2">

     

       6
       +
                   <strong>push</strong>

     

       7
       +
                   <div class="md:pl-4 overflow-x-auto whitespace-nowrap">

     

       8
       +
                       <code class="dark:text-gray-100"

     

       9
       +
                           >git remote add origin

     

       10
       +
                           git@{{ .RepoInfo.Knot }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code

     

       11
       +
                       >

     

       12
       +
                   </div>

     

       13
       +
               </div>

     

       14
       +
       

     

       15
       +
               <div class="flex flex-col gap-2">

     

       16
       +
                   <strong>clone</strong>

     

       17
       +
                   <div class="md:pl-4 flex flex-col gap-2">

     

       18
       +
                       <div class="flex items-center gap-3">

     

       19
       +
                           <span

     

       20
       +
                               class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white"

     

       21
       +
                               >HTTP</span

     

       22
       +
                           >

     

       23
       +
                           <div class="overflow-x-auto whitespace-nowrap flex-1">

     

       24
       +
                               <code class="dark:text-gray-100"

     

       25
       +
                                   >git clone

     

       26
       +
                                   https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code

     

       27
       +
                               >

     

       28
       +
                           </div>

     

       29
       +
                       </div>

     

       30
       +
       

     

       31
       +
                       <div class="flex items-center gap-3">

     

       32
       +
                           <span

     

       33
       +
                               class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white"

     

       34
       +
                               >SSH</span

     

       35
       +
                           >

     

       36
       +
                           <div class="overflow-x-auto whitespace-nowrap flex-1">

     

       37
       +
                               <code class="dark:text-gray-100"

     

       38
       +
                                   >git clone

     

       39
       +
                                   git@{{ .RepoInfo.Knot }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code

     

       40
       +
                               >

     

       41
       +
                           </div>

     

       42
       +
                       </div>

     

       43
       +
                   </div>

     

       44
       +
               </div>

     

       45
       +
       

     

       46
       +
               <p class="py-2 text-gray-500 dark:text-gray-400">

     

       47
       +
                   Note that for self-hosted knots, clone URLs may be different based

     

       48
       +
                   on your setup.

     

       49
       +
               </p>

     

       50
       +
           </section>

     

       51
       +
       {{ end }}

+175

appview/pages/templates/repo/fragments/diff.html

···

       1
       +
       {{ define "repo/fragments/diff" }}

     

       2
       +
       {{ $repo := index . 0 }}

     

       3
       +
       {{ $diff := index . 1 }}

     

       4
       +
       {{ $commit := $diff.Commit }}

     

       5
       +
       {{ $stat := $diff.Stat }}

     

       6
       +
       {{ $diff := $diff.Diff }}

     

       7
       +
       

     

       8
       +
         {{ $this := $commit.This }}

     

       9
       +
         {{ $parent := $commit.Parent }}

     

       10
       +
       

     

       11
       +
         <section class="mt-6 p-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">

     

       12
       +
           <div class="diff-stat">

     

       13
       +
             <div class="flex gap-2 items-center">

     

       14
       +
               <strong class="text-sm uppercase dark:text-gray-200">Changed files</strong>

     

       15
       +
               {{ block "statPill" $stat }} {{ end }}

     

       16
       +
             </div>

     

       17
       +
             <div class="overflow-x-auto">

     

       18
       +
               {{ range $diff }}

     

       19
       +
               <ul class="dark:text-gray-200">

     

       20
       +
                 {{ if .IsDelete }}

     

       21
       +
                 <li><a href="#file-{{ .Name.Old }}" class="dark:hover:text-gray-300">{{ .Name.Old }}</a></li>

     

       22
       +
                 {{ else }}

     

       23
       +
                 <li><a href="#file-{{ .Name.New }}" class="dark:hover:text-gray-300">{{ .Name.New }}</a></li>

     

       24
       +
                 {{ end }}

     

       25
       +
               </ul>

     

       26
       +
               {{ end }}

     

       27
       +
             </div>

     

       28
       +
           </div>

     

       29
       +
         </section>

     

       30
       +
       

     

       31
       +
         {{ $last := sub (len $diff) 1 }}

     

       32
       +
         {{ range $idx, $hunk := $diff }}

     

       33
       +
         {{ with $hunk }}

     

       34
       +
         <section class="mt-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">

     

       35
       +
           <div id="file-{{ .Name.New }}">

     

       36
       +
             <div id="diff-file">

     

       37
       +
               <details open>

     

       38
       +
                 <summary class="list-none cursor-pointer sticky top-0">

     

       39
       +
                   <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between">

     

       40
       +
                     <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto" style="direction: rtl;">

     

       41
       +
                       {{ $markerstyle := "diff-type p-1 mr-1 font-mono text-sm rounded select-none" }}

     

       42
       +
       

     

       43
       +
                       <div class="flex gap-2 items-center" style="direction: ltr;">

     

       44
       +
                       {{ if .IsNew }}

     

       45
       +
                       <span class="bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400 {{ $markerstyle }}">ADDED</span>

     

       46
       +
                       {{ else if .IsDelete }}

     

       47
       +
                       <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">DELETED</span>

     

       48
       +
                       {{ else if .IsCopy }}

     

       49
       +
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">COPIED</span>

     

       50
       +
                       {{ else if .IsRename }}

     

       51
       +
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">RENAMED</span>

     

       52
       +
                       {{ else }}

     

       53
       +
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">MODIFIED</span>

     

       54
       +
                       {{ end }}

     

       55
       +
       

     

       56
       +
                       {{ block "statPill" .Stats }} {{ end }}

     

       57
       +
       

     

       58
       +
                       {{ if .IsDelete }}

     

       59
       +
                       <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this }}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.Old }}"{{end}}>

     

       60
       +
                         {{ .Name.Old }}

     

       61
       +
                       </a>

     

       62
       +
                       {{ else if (or .IsCopy .IsRename) }}

     

       63
       +
                       <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $parent}}href="/{{ $repo }}/blob/{{ $parent }}/{{ .Name.Old }}"{{end}}>

     

       64
       +
                         {{ .Name.Old }}

     

       65
       +
                       </a>

     

       66
       +
                       {{ i "arrow-right" "w-4 h-4" }}

     

       67
       +
                       <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>

     

       68
       +
                         {{ .Name.New }}

     

       69
       +
                       </a>

     

       70
       +
                       {{ else }}

     

       71
       +
                       <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>

     

       72
       +
                         {{ .Name.New }}

     

       73
       +
                       </a>

     

       74
       +
                       {{ end }}

     

       75
       +
                       </div>

     

       76
       +
                     </div>

     

       77
       +
       

     

       78
       +
                     {{ $iconstyle := "p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" }}

     

       79
       +
                     <div id="right-side-items" class="p-2 flex items-center">

     

       80
       +
                       <a title="top of file" href="#file-{{ .Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up-to-line" "w-4 h-4" }}</a>

     

       81
       +
                       {{ if gt $idx 0 }}

     

       82
       +
                         {{ $prev := index $diff (sub $idx 1) }}

     

       83
       +
                         <a title="previous file" href="#file-{{ $prev.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up" "w-4 h-4" }}</a>

     

       84
       +
                       {{ end }}

     

       85
       +
       

     

       86
       +
                       {{ if lt $idx $last }}

     

       87
       +
                         {{ $next := index $diff (add $idx 1) }}

     

       88
       +
                         <a title="next file" href="#file-{{ $next.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-down" "w-4 h-4" }}</a>

     

       89
       +
                       {{ end }}

     

       90
       +
                     </div>

     

       91
       +
       

     

       92
       +
                   </div>

     

       93
       +
                 </summary>

     

       94
       +
       

     

       95
       +
                 <div class="transition-all duration-700 ease-in-out">

     

       96
       +
                   {{ if .IsDelete }}

     

       97
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       98
       +
                     This file has been deleted.

     

       99
       +
                     </p>

     

       100
       +
                   {{ else if .IsCopy }}

     

       101
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       102
       +
                     This file has been copied.

     

       103
       +
                     </p>

     

       104
       +
                   {{ else if .IsRename }}

     

       105
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       106
       +
                     This file has been renamed.

     

       107
       +
                     </p>

     

       108
       +
                   {{ else if .IsBinary }}

     

       109
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       110
       +
                     This is a binary file and will not be displayed.

     

       111
       +
                     </p>

     

       112
       +
                   {{ else }}

     

       113
       +
                   {{ $name := .Name.New }}

     

       114
       +
                   <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div>

     

       115
       +
                    {{- $oldStart := .OldPosition -}}

     

       116
       +
                    {{- $newStart := .NewPosition -}}

     

       117
       +
                    {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 scroll-mt-10 target:border target:border-amber-500 target:rounded " -}}

     

       118
       +
                    {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}}

     

       119
       +
                    {{- $lineNrSepStyle1 := "" -}}

     

       120
       +
                    {{- $lineNrSepStyle2 := "pr-2" -}}

     

       121
       +
                    {{- range .Lines -}}

     

       122
       +
                      {{- if eq .Op.String "+" -}}

     

       123
       +
                        <div class="bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 flex min-w-full items-center">

     

       124
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></div>

     

       125
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}" id="{{$name}}-N{{$newStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div>

     

       126
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       127
       +
                          <div class="px-2">{{ .Line }}</div>

     

       128
       +
                        </div>

     

       129
       +
                        {{- $newStart = add64 $newStart 1 -}}

     

       130
       +
                      {{- end -}}

     

       131
       +
                      {{- if eq .Op.String "-" -}}

     

       132
       +
                        <div class="bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 flex min-w-full items-center">

     

       133
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}" id="{{$name}}-O{{$oldStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div>

     

       134
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></div>

     

       135
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       136
       +
                          <div class="px-2">{{ .Line }}</div>

     

       137
       +
                        </div>

     

       138
       +
                        {{- $oldStart = add64 $oldStart 1 -}}

     

       139
       +
                      {{- end -}}

     

       140
       +
                      {{- if eq .Op.String " " -}}

     

       141
       +
                        <div class="bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 flex min-w-full items-center">

     

       142
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}" id="{{$name}}-O{{$oldStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div>

     

       143
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}" id="{{$name}}-N{{$newStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div>

     

       144
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       145
       +
                          <div class="px-2">{{ .Line }}</div>

     

       146
       +
                        </div>

     

       147
       +
                        {{- $newStart = add64 $newStart 1 -}}

     

       148
       +
                        {{- $oldStart = add64 $oldStart 1 -}}

     

       149
       +
                      {{- end -}}

     

       150
       +
                    {{- end -}}

     

       151
       +
                    {{- end -}}</div></div></pre>

     

       152
       +
                   {{- end -}}

     

       153
       +
                 </div>

     

       154
       +
       

     

       155
       +
               </details>

     

       156
       +
       

     

       157
       +
             </div>

     

       158
       +
           </div>

     

       159
       +
         </section>

     

       160
       +
         {{ end }}

     

       161
       +
         {{ end }}

     

       162
       +
       {{ end }}

     

       163
       +
       

     

       164
       +
       {{ define "statPill" }}

     

       165
       +
         <div class="flex items-center font-mono text-sm">

     

       166
       +
           {{ if and .Insertions .Deletions }}

     

       167
       +
             <span class="rounded-l p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span>

     

       168
       +
             <span class="rounded-r p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span>

     

       169
       +
           {{ else if .Insertions }}

     

       170
       +
             <span class="rounded p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span>

     

       171
       +
           {{ else if .Deletions }}

     

       172
       +
             <span class="rounded p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span>

     

       173
       +
           {{ end }}

     

       174
       +
         </div>

     

       175
       +
       {{ end }}

+11

appview/pages/templates/repo/fragments/editRepoDescription.html

···

       1
       +
       {{ define "repo/fragments/editRepoDescription" }}

     

       2
       +
       <form hx-put="/{{ .RepoInfo.FullName }}/description" hx-target="this" hx-swap="outerHTML" class="flex flex-wrap gap-2">

     

       3
       +
           <input type="text" class="p-1" name="description" value="{{ .RepoInfo.Description }}">

     

       4
       +
           <button type="submit" class="btn p-1 flex items-center gap-2 no-underline text-sm">

     

       5
       +
             {{ i "check" "w-3 h-3" }} save 

     

       6
       +
           </button>

     

       7
       +
           <button type="button" class="btn p-1 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description" >

     

       8
       +
             {{ i "x" "w-3 h-3" }} cancel 

     

       9
       +
           </button>

     

       10
       +
       </form>

     

       11
       +
       {{ end }}

+47

appview/pages/templates/repo/fragments/repoActions.html

···

       1
       +
       {{ define "repo/fragments/repoActions" }}

     

       2
       +
           <div class="flex items-center gap-2 z-auto">

     

       3
       +
               <button

     

       4
       +
                   id="starBtn"

     

       5
       +
                   class="btn disabled:opacity-50 disabled:cursor-not-allowed"

     

       6
       +
                   {{ if .IsStarred }}

     

       7
       +
                       hx-delete="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"

     

       8
       +
                   {{ else }}

     

       9
       +
                       hx-post="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"

     

       10
       +
                   {{ end }}

     

       11
       +
       

     

       12
       +
                   hx-trigger="click"

     

       13
       +
                   hx-target="#starBtn"

     

       14
       +
                   hx-swap="outerHTML"

     

       15
       +
                   hx-disabled-elt="#starBtn"

     

       16
       +
               >

     

       17
       +
                   <div class="flex gap-2 items-center">

     

       18
       +
                       {{ if .IsStarred }}

     

       19
       +
                           {{ i "star" "w-4 h-4 fill-current" }}

     

       20
       +
                       {{ else }}

     

       21
       +
                           {{ i "star" "w-4 h-4" }}

     

       22
       +
                       {{ end }}

     

       23
       +
                       <span class="text-sm">

     

       24
       +
                           {{ .Stats.StarCount }}

     

       25
       +
                       </span>

     

       26
       +
                   </div>

     

       27
       +
               </button>

     

       28
       +
               {{ if .DisableFork }}

     

       29
       +
                   <button

     

       30
       +
                       class="btn text-sm no-underline hover:no-underline flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed"

     

       31
       +
                       disabled

     

       32
       +
                       title="Empty repositories cannot be forked"

     

       33
       +
                   >

     

       34
       +
                       {{ i "git-fork" "w-4 h-4" }}

     

       35
       +
                       fork

     

       36
       +
                   </button>

     

       37
       +
               {{ else }}

     

       38
       +
                   <a

     

       39
       +
                       class="btn text-sm no-underline hover:no-underline flex items-center gap-2"

     

       40
       +
                       href="/{{ .FullName }}/fork"

     

       41
       +
                   >

     

       42
       +
                       {{ i "git-fork" "w-4 h-4" }}

     

       43
       +
                       fork

     

       44
       +
                   </a>

     

       45
       +
               {{ end }}

     

       46
       +
           </div>

     

       47
       +
       {{ end }}

+15

appview/pages/templates/repo/fragments/repoDescription.html

···

       1
       +
       {{ define "repo/fragments/repoDescription" }}

     

       2
       +
       <span id="repo-description" class="flex flex-wrap items-center gap-2 text-sm" hx-target="this" hx-swap="outerHTML">

     

       3
       +
           {{ if .RepoInfo.Description }}

     

       4
       +
               {{ .RepoInfo.Description }}

     

       5
       +
           {{ else }}

     

       6
       +
               <span class="italic">this repo has no description</span>

     

       7
       +
           {{ end }}

     

       8
       +
       

     

       9
       +
           {{ if .RepoInfo.Roles.IsOwner }}

     

       10
       +
           <button class="flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description/edit">

     

       11
       +
             {{ i "pencil" "w-3 h-3" }}

     

       12
       +
           </button>

     

       13
       +
           {{ end }}

     

       14
       +
       </span>

     

       15
       +
       {{ end }}

+207 -172

appview/pages/templates/repo/index.html

···

       1
        
       {{ define "title" }}{{ .RepoInfo.FullName }} at {{ .Ref }}{{ end }}

     

       2
        
       

     

       3
       -
       

     

       4
        
       {{ define "extrameta" }}

     

       5
       -
           <meta name="vcs:clone" content="https://tangled.sh/{{ .RepoInfo.FullName }}"/>

     

       6
       -
           <meta name="forge:summary" content="https://tangled.sh/{{ .RepoInfo.FullName }}">

     

       7
       -
           <meta name="forge:dir" content="https://tangled.sh/{{ .RepoInfo.FullName }}/tree/{ref}/{path}">

     

       8
       -
           <meta name="forge:file" content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}">

     

       9
       -
           <meta name="forge:line" content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}">

     

       10
       -
           <meta name="go-import" content="tangled.sh/{{ .RepoInfo.FullNameWithoutAt }} git https://tangled.sh/{{ .RepoInfo.FullName }}">

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
       {{ end }}

     

       12
       -
       

     

       13
        
       

     

       14
        
       {{ define "repoContent" }}

     

       15
        
           <main>

     

       16
       -
             {{ block "branchSelector" . }} {{ end }}

     

       17
        
               <div class="grid grid-cols-1 md:grid-cols-2 gap-2">

     

       18
       -
                 {{ block "fileTree" . }} {{ end }}

     

       19
       -
                 {{ block "commitLog" . }} {{ end }}

     

       20
        
               </div>

     

       21
        
           </main>

     

       22
        
       {{ end }}

     

       23
        
       

     

       24
        
       {{ define "branchSelector" }}

     

       25
       -
       <div class="flex justify-between pb-5">

     

       26
       -
           <select

     

       27
       -
               onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + encodeURIComponent(this.value)"

     

       28
       -
               class="p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"

     

       29
       -
           >

     

       30
       -
               <optgroup label="branches" class="bold text-sm">

     

       31
       -
                   {{ range .Branches }}

     

       32
       -
                       <option

     

       33
       -
                           value="{{ .Reference.Name }}"

     

       34
       -
                           class="py-1"

     

       35
       -
                           {{ if eq .Reference.Name $.Ref }}

     

       36
       -
                               selected

     

       37
       -
                           {{ end }}

     

       38
       -
                       >

     

       39
       -
                           {{ .Reference.Name }}

     

       40
       -
                       </option>

     

       41
       -
                   {{ end }}

     

       42
       -
               </optgroup>

     

       43
       -
               <optgroup label="tags" class="bold text-sm">

     

       44
       -
                   {{ range .Tags }}

     

       45
       -
                       <option

     

       46
       -
                           value="{{ .Reference.Name }}"

     

       47
       -
                           class="py-1"

     

       48
       -
                           {{ if eq .Reference.Name $.Ref }}

     

       49
       -
                               selected

     

       50
       -
                           {{ end }}

     

       51
       -
                       >

     

       52
       -
                           {{ .Reference.Name }}

     

       53
       -
                       </option>

     

       54
       -
                   {{ else }}

     

       55
       -
                       <option class="py-1" disabled>no tags found</option>

     

       56
       -
                   {{ end }}

     

       57
       -
               </optgroup>

     

       58
       -
           </select>

     

       59
       -
           <a

     

       60
       -
               href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}"

     

       61
       -
               class="ml-2 no-underline flex items-center gap-2 text-sm uppercase font-bold dark:text-white"

     

       62
       -
           >

     

       63
       -
               {{ i "logs" "w-4 h-4" }}

     

       64
       -
               {{ .TotalCommits }}

     

       65
       -
               {{ if eq .TotalCommits 1 }}commit{{ else }}commits{{ end }}

     

       66
       -
           </a>

     

       67
       -
       </div>

     

       68
        
       {{ end }}

     

       69
        
       

     

       70
        
       {{ define "fileTree" }}

     

       71
       -
       <div id="file-tree" class="col-span-1 pr-2 md:border-r md:border-gray-200 dark:md:border-gray-700">

     

       72
       -
           {{ $containerstyle := "py-1" }}

     

       73
       -
           {{ $linkstyle := "no-underline hover:underline dark:text-white" }}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
       

     

       75
       -
           {{ range .Files }}

     

       76
       -
               {{ if not .IsFile }}

     

       77
       -
                   <div class="{{ $containerstyle }}">

     

       78
       -
                       <div class="flex justify-between items-center">

     

       79
       -
                           <a

     

       80
       -
                               href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref | urlquery }}/{{ .Name }}"

     

       81
       -
                               class="{{ $linkstyle }}"

     

       82
       -
                           >

     

       83
       -
                               <div class="flex items-center gap-2">

     

       84
       -
                                 {{ i "folder" "w-3 h-3 fill-current" }}

     

       85
       -
                                 {{ .Name }}

     

       86
       -
                               </div>

     

       87
       -
                           </a>

     

       88
        
       

     

       89
       -
                           <time class="text-xs text-gray-500 dark:text-gray-400"

     

       90
       -
                               >{{ timeFmt .LastCommit.When }}</time

     

       91
       -
                           >

     

       0
        
       
     

       92
        
                       </div>

     

       93
       -
                   </div>

     

       94
        
               {{ end }}

     

       95
       -
           {{ end }}

     

       96
        
       

     

       97
       -
           {{ range .Files }}

     

       98
       -
               {{ if .IsFile }}

     

       99
       -
                   <div class="{{ $containerstyle }}">

     

       100
       -
                       <div class="flex justify-between items-center">

     

       101
       -
                           <a

     

       102
       -
                               href="/{{ $.RepoInfo.FullName }}/blob/{{ $.Ref | urlquery }}/{{ .Name }}"

     

       103
       -
                               class="{{ $linkstyle }}"

     

       104
       -
                           >

     

       105
       -
                               <div class="flex items-center gap-2">

     

       106
       -
                                 {{ i "file" "w-3 h-3" }}{{ .Name }}

     

       107
       -
                               </div>

     

       108
       -
                           </a>

     

       109
        
       

     

       110
       -
                           <time class="text-xs text-gray-500 dark:text-gray-400"

     

       111
       -
                               >{{ timeFmt .LastCommit.When }}</time

     

       112
       -
                           >

     

       0
        
       
     

       113
        
                       </div>

     

       114
       -
                   </div>

     

       115
        
               {{ end }}

     

       116
       -
           {{ end }}

     

       117
       -
       </div>

     

       118
        
       {{ end }}

     

       119
        
       

     

       120
       -
       

     

       121
        
       {{ define "commitLog" }}

     

       122
       -
       <div id="commit-log" class="hidden md:block md:col-span-1">

     

       123
       -
           {{ range .Commits }}

     

       124
       -
                 <div class="relative px-2 pb-8">

     

       125
       -
                     <div id="commit-message">

     

       126
       -
                         {{ $messageParts := splitN .Message "\n\n" 2 }}

     

       127
       -
                         <div class="text-base cursor-pointer">

     

       128
       -
                             <div>

     

       129
       -
                                 <div>

     

       130
       -
                                     <a

     

       131
       -
                                         href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"

     

       132
       -
                                         class="inline no-underline hover:underline dark:text-white"

     

       133
       -
                                         >{{ index $messageParts 0 }}</a

     

       134
       -
                                     >

     

       135
       -
                                     {{ if gt (len $messageParts) 1 }}

     

       136
        
       

     

       137
       -
                                         <button

     

       138
       -
                                             class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600"

     

       139
       -
                                             hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')"

     

       140
       -
                                         >

     

       141
       -
                                         {{ i "ellipsis" "w-3 h-3" }}

     

       142
       -
                                         </button>

     

       143
       -
                                     {{ end }}

     

       144
       -
                                 </div>

     

       145
       -
                                 {{ if gt (len $messageParts) 1 }}

     

       146
       -
                                     <p

     

       147
       -
                                         class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300"

     

       148
       -
                                     >

     

       149
       -
                                         {{ nl2br (unwrapText (index $messageParts 1)) }}

     

       150
       -
                                     </p>

     

       151
       -
                                 {{ end }}

     

       152
       -
                             </div>

     

       153
       -
                         </div>

     

       154
       -
                     </div>

     

       155
        
       

     

       156
       -
                     <div class="text-xs text-gray-500 dark:text-gray-400">

     

       157
       -
                         <span class="font-mono">

     

       158
       -
                             <a

     

       159
       -
                                 href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"

     

       160
       -
                                 class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       161
       -
                                 >{{ slice .Hash.String 0 8 }}</a

     

       162
       -
                             >

     

       163
       -
                         </span>

     

       164
       -
                         <span

     

       165
       -
                             class="mx-2 before:content-['·'] before:select-none"

     

       166
       -
                         ></span>

     

       167
       -
                         <span>

     

       168
       -
                             {{ $didOrHandle := index $.EmailToDidOrHandle .Author.Email }}

     

       169
       -
                             <a

     

       170
       -
                                 href="{{ if $didOrHandle }}/{{ $didOrHandle }}{{ else }}mailto:{{ .Author.Email }}{{ end }}"

     

       171
       -
                                 class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       172
       -
                                 >{{ if $didOrHandle }}{{ $didOrHandle }}{{ else }}{{ .Author.Name }}{{ end }}</a

     

       173
       -
                             >

     

       174
       -
                         </span>

     

       175
       -
                         <div

     

       176
       -
                             class="inline-block px-1 select-none after:content-['·']"

     

       177
       -
                         ></div>

     

       178
       -
                         <span>{{ timeFmt .Author.When }}</span>

     

       179
       -
                         {{ $tagsForCommit := index $.TagMap .Hash.String }}

     

       180
       -
                         {{ if gt (len $tagsForCommit) 0 }}

     

       181
        
                           <div

     

       182
        
                               class="inline-block px-1 select-none after:content-['·']"

     

       183
        
                           ></div>

     

       184
       -
                         {{ end }}

     

       185
       -
                         {{ range $tagsForCommit }}

     

       186
       -
                           <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       187
       -
                             {{ . }}

     

       188
       -
                           </span>

     

       189
       -
                         {{ end }}

     

       190
       -
                     </div>

     

       191
       -
                 </div>

     

       192
       -
           {{ end }}

     

       193
       -
       </div>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       194
        
       {{ end }}

     

       195
       -
       

     

       196
        
       

     

       197
        
       {{ define "repoAfter" }}

     

       198
        
           {{- if .HTMLReadme }}

     

       199
       -
           <section class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto {{ if not .Raw }} prose dark:prose-invert dark:[&_pre]:bg-gray-900 dark:[&_code]:text-gray-300 dark:[&_pre_code]:bg-gray-900 dark:[&_pre]:border dark:[&_pre]:border-gray-700 {{ end }}">

     

       200
       -
               <article class="{{ if .Raw }}whitespace-pre{{end}}">

     

       201
       -
                   {{ if .Raw }}

     

       202
       -
                       <pre class="dark:bg-gray-900 dark:text-gray-200 dark:border dark:border-gray-700 dark:p-4 dark:rounded">{{ .HTMLReadme }}</pre>

     

       203
       -
                   {{ else }}

     

       204
       -
                       {{ .HTMLReadme }}

     

       205
       -
                   {{ end }}

     

       206
       -
               </article>

     

       207
       -
           </section>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       208
        
           {{- end -}}

     

       209
        
       

     

       210
       -
           {{ template "fragments/cloneInstructions" . }}

     

       211
        
       {{ end }}

···

       1
        
       {{ define "title" }}{{ .RepoInfo.FullName }} at {{ .Ref }}{{ end }}

     

       2
        
       

     

       0
        
       
     

       3
        
       {{ define "extrameta" }}

     

       4
       +
           <meta

     

       5
       +
               name="vcs:clone"

     

       6
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}"

     

       7
       +
           />

     

       8
       +
           <meta

     

       9
       +
               name="forge:summary"

     

       10
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}"

     

       11
       +
           />

     

       12
       +
           <meta

     

       13
       +
               name="forge:dir"

     

       14
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}/tree/{ref}/{path}"

     

       15
       +
           />

     

       16
       +
           <meta

     

       17
       +
               name="forge:file"

     

       18
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}"

     

       19
       +
           />

     

       20
       +
           <meta

     

       21
       +
               name="forge:line"

     

       22
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}"

     

       23
       +
           />

     

       24
       +
           <meta

     

       25
       +
               name="go-import"

     

       26
       +
               content="tangled.sh/{{ .RepoInfo.FullNameWithoutAt }} git https://tangled.sh/{{ .RepoInfo.FullName }}"

     

       27
       +
           />

     

       28
        
       {{ end }}

     

       0
        
       
     

       29
        
       

     

       30
        
       {{ define "repoContent" }}

     

       31
        
           <main>

     

       32
       +
               {{ block "branchSelector" . }}{{ end }}

     

       33
        
               <div class="grid grid-cols-1 md:grid-cols-2 gap-2">

     

       34
       +
                   {{ block "fileTree" . }}{{ end }}

     

       35
       +
                   {{ block "commitLog" . }}{{ end }}

     

       36
        
               </div>

     

       37
        
           </main>

     

       38
        
       {{ end }}

     

       39
        
       

     

       40
        
       {{ define "branchSelector" }}

     

       41
       +
           <div class="flex justify-between pb-5">

     

       42
       +
               <select

     

       43
       +
                   onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + encodeURIComponent(this.value)"

     

       44
       +
                   class="p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"

     

       45
       +
               >

     

       46
       +
                   <optgroup label="branches" class="bold text-sm">

     

       47
       +
                       {{ range .Branches }}

     

       48
       +
                           <option

     

       49
       +
                               value="{{ .Reference.Name }}"

     

       50
       +
                               class="py-1"

     

       51
       +
                               {{ if eq .Reference.Name $.Ref }}

     

       52
       +
                                   selected

     

       53
       +
                               {{ end }}

     

       54
       +
                           >

     

       55
       +
                               {{ .Reference.Name }}

     

       56
       +
                           </option>

     

       57
       +
                       {{ end }}

     

       58
       +
                   </optgroup>

     

       59
       +
                   <optgroup label="tags" class="bold text-sm">

     

       60
       +
                       {{ range .Tags }}

     

       61
       +
                           <option

     

       62
       +
                               value="{{ .Reference.Name }}"

     

       63
       +
                               class="py-1"

     

       64
       +
                               {{ if eq .Reference.Name $.Ref }}

     

       65
       +
                                   selected

     

       66
       +
                               {{ end }}

     

       67
       +
                           >

     

       68
       +
                               {{ .Reference.Name }}

     

       69
       +
                           </option>

     

       70
       +
                       {{ else }}

     

       71
       +
                           <option class="py-1" disabled>no tags found</option>

     

       72
       +
                       {{ end }}

     

       73
       +
                   </optgroup>

     

       74
       +
               </select>

     

       75
       +
               <a

     

       76
       +
                   href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}"

     

       77
       +
                   class="ml-2 no-underline flex items-center gap-2 text-sm uppercase font-bold dark:text-white"

     

       78
       +
               >

     

       79
       +
                   {{ i "logs" "w-4 h-4" }}

     

       80
       +
                   {{ .TotalCommits }}

     

       81
       +
                   {{ if eq .TotalCommits 1 }}commit{{ else }}commits{{ end }}

     

       82
       +
               </a>

     

       83
       +
           </div>

     

       84
        
       {{ end }}

     

       85
        
       

     

       86
        
       {{ define "fileTree" }}

     

       87
       +
           <div

     

       88
       +
               id="file-tree"

     

       89
       +
               class="col-span-1 pr-2 md:border-r md:border-gray-200 dark:md:border-gray-700"

     

       90
       +
           >

     

       91
       +
               {{ $containerstyle := "py-1" }}

     

       92
       +
               {{ $linkstyle := "no-underline hover:underline dark:text-white" }}

     

       93
        
       

     

       94
       +
               {{ range .Files }}

     

       95
       +
                   {{ if not .IsFile }}

     

       96
       +
                       <div class="{{ $containerstyle }}">

     

       97
       +
                           <div class="flex justify-between items-center">

     

       98
       +
                               <a

     

       99
       +
                                   href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref | urlquery }}/{{ .Name }}"

     

       100
       +
                                   class="{{ $linkstyle }}"

     

       101
       +
                               >

     

       102
       +
                                   <div class="flex items-center gap-2">

     

       103
       +
                                       {{ i "folder" "w-3 h-3 fill-current" }}

     

       104
       +
                                       {{ .Name }}

     

       105
       +
                                   </div>

     

       106
       +
                               </a>

     

       107
        
       

     

       108
       +
                               <time class="text-xs text-gray-500 dark:text-gray-400"

     

       109
       +
                                   >{{ timeFmt .LastCommit.When }}</time

     

       110
       +
                               >

     

       111
       +
                           </div>

     

       112
        
                       </div>

     

       113
       +
                   {{ end }}

     

       114
        
               {{ end }}

     

       0
        
       
     

       115
        
       

     

       116
       +
               {{ range .Files }}

     

       117
       +
                   {{ if .IsFile }}

     

       118
       +
                       <div class="{{ $containerstyle }}">

     

       119
       +
                           <div class="flex justify-between items-center">

     

       120
       +
                               <a

     

       121
       +
                                   href="/{{ $.RepoInfo.FullName }}/blob/{{ $.Ref | urlquery }}/{{ .Name }}"

     

       122
       +
                                   class="{{ $linkstyle }}"

     

       123
       +
                               >

     

       124
       +
                                   <div class="flex items-center gap-2">

     

       125
       +
                                       {{ i "file" "w-3 h-3" }}{{ .Name }}

     

       126
       +
                                   </div>

     

       127
       +
                               </a>

     

       128
        
       

     

       129
       +
                               <time class="text-xs text-gray-500 dark:text-gray-400"

     

       130
       +
                                   >{{ timeFmt .LastCommit.When }}</time

     

       131
       +
                               >

     

       132
       +
                           </div>

     

       133
        
                       </div>

     

       134
       +
                   {{ end }}

     

       135
        
               {{ end }}

     

       136
       +
           </div>

     

       0
        
       
     

       137
        
       {{ end }}

     

       138
        
       

     

       0
        
       
     

       139
        
       {{ define "commitLog" }}

     

       140
       +
           <div id="commit-log" class="hidden md:block md:col-span-1">

     

       141
       +
               {{ range .Commits }}

     

       142
       +
                   <div class="relative px-2 pb-8">

     

       143
       +
                       <div id="commit-message">

     

       144
       +
                           {{ $messageParts := splitN .Message "\n\n" 2 }}

     

       145
       +
                           <div class="text-base cursor-pointer">

     

       146
       +
                               <div>

     

       147
       +
                                   <div>

     

       148
       +
                                       <a

     

       149
       +
                                           href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"

     

       150
       +
                                           class="inline no-underline hover:underline dark:text-white"

     

       151
       +
                                           >{{ index $messageParts 0 }}</a

     

       152
       +
                                       >

     

       153
       +
                                       {{ if gt (len $messageParts) 1 }}

     

       154
        
       

     

       155
       +
                                           <button

     

       156
       +
                                               class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600"

     

       157
       +
                                               hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')"

     

       158
       +
                                           >

     

       159
       +
                                               {{ i "ellipsis" "w-3 h-3" }}

     

       160
       +
                                           </button>

     

       161
       +
                                       {{ end }}

     

       162
       +
                                   </div>

     

       163
       +
                                   {{ if gt (len $messageParts) 1 }}

     

       164
       +
                                       <p

     

       165
       +
                                           class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300"

     

       166
       +
                                       >

     

       167
       +
                                           {{ nl2br (index $messageParts 1) }}

     

       168
       +
                                       </p>

     

       169
       +
                                   {{ end }}

     

       170
       +
                               </div>

     

       171
       +
                           </div>

     

       172
       +
                       </div>

     

       173
        
       

     

       174
       +
                       <div class="text-xs text-gray-500 dark:text-gray-400">

     

       175
       +
                           <span class="font-mono">

     

       176
       +
                               <a

     

       177
       +
                                   href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"

     

       178
       +
                                   class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       179
       +
                                   >{{ slice .Hash.String 0 8 }}</a></span>

     

       180
       +
                           <span

     

       181
       +
                               class="mx-2 before:content-['·'] before:select-none"

     

       182
       +
                           ></span>

     

       183
       +
                           <span>

     

       184
       +
                               {{ $didOrHandle := index $.EmailToDidOrHandle .Author.Email }}

     

       185
       +
                               <a

     

       186
       +
                                   href="{{ if $didOrHandle }}

     

       187
       +
                                       /{{ $didOrHandle }}

     

       188
       +
                                   {{ else }}

     

       189
       +
                                       mailto:{{ .Author.Email }}

     

       190
       +
                                   {{ end }}"

     

       191
       +
                                   class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       192
       +
                                   >{{ if $didOrHandle }}

     

       193
       +
                                       {{ $didOrHandle }}

     

       194
       +
                                   {{ else }}

     

       195
       +
                                       {{ .Author.Name }}

     

       196
       +
                                   {{ end }}</a

     

       197
       +
                               >

     

       198
       +
                           </span>

     

       199
        
                           <div

     

       200
        
                               class="inline-block px-1 select-none after:content-['·']"

     

       201
        
                           ></div>

     

       202
       +
                           <span>{{ timeFmt .Author.When }}</span>

     

       203
       +
                           {{ $tagsForCommit := index $.TagMap .Hash.String }}

     

       204
       +
                           {{ if gt (len $tagsForCommit) 0 }}

     

       205
       +
                               <div

     

       206
       +
                                   class="inline-block px-1 select-none after:content-['·']"

     

       207
       +
                               ></div>

     

       208
       +
                           {{ end }}

     

       209
       +
                           {{ range $tagsForCommit }}

     

       210
       +
                               <span

     

       211
       +
                                   class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center"

     

       212
       +
                               >

     

       213
       +
                                   {{ . }}

     

       214
       +
                               </span>

     

       215
       +
                           {{ end }}

     

       216
       +
                       </div>

     

       217
       +
                   </div>

     

       218
       +
               {{ end }}

     

       219
       +
           </div>

     

       220
        
       {{ end }}

     

       0
        
       
     

       221
        
       

     

       222
        
       {{ define "repoAfter" }}

     

       223
        
           {{- if .HTMLReadme }}

     

       224
       +
               <section

     

       225
       +
                   class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto {{ if not .Raw }}

     

       226
       +
                       prose dark:prose-invert dark:[&_pre]:bg-gray-900

     

       227
       +
                       dark:[&_code]:text-gray-300 dark:[&_pre_code]:bg-gray-900

     

       228
       +
                       dark:[&_pre]:border dark:[&_pre]:border-gray-700

     

       229
       +
                   {{ end }}"

     

       230
       +
               >

     

       231
       +
                   <article class="{{ if .Raw }}whitespace-pre{{ end }}">

     

       232
       +
                       {{ if .Raw }}

     

       233
       +
                           <pre

     

       234
       +
                               class="dark:bg-gray-900 dark:text-gray-200 dark:border dark:border-gray-700 dark:p-4 dark:rounded"

     

       235
       +
                           >

     

       236
       +
       {{ .HTMLReadme }}</pre

     

       237
       +
                           >

     

       238
       +
                       {{ else }}

     

       239
       +
                           {{ .HTMLReadme }}

     

       240
       +
                       {{ end }}

     

       241
       +
                   </article>

     

       242
       +
               </section>

     

       243
        
           {{- end -}}

     

       244
        
       

     

       245
       +
           {{ template "repo/fragments/cloneInstructions" . }}

     

       246
        
       {{ end }}

+52

appview/pages/templates/repo/issues/fragments/editIssueComment.html

···

       1
       +
       {{ define "repo/issues/fragments/editIssueComment" }}

     

       2
       +
         {{ with .Comment }}

     

       3
       +
         <div id="comment-container-{{.CommentId}}">

     

       4
       +
           <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm">

     

       5
       +
             {{ $owner := didOrHandle $.LoggedInUser.Did $.LoggedInUser.Handle }}

     

       6
       +
             <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>

     

       7
       +
       

     

       8
       +
             <!-- show user "hats" -->

     

       9
       +
             {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }}

     

       10
       +
             {{ if $isIssueAuthor }}

     

       11
       +
             <span class="before:content-['·']"></span>

     

       12
       +
             <span class="rounded bg-gray-100 text-black font-mono px-2 mx-1/2 inline-flex items-center">

     

       13
       +
               author

     

       14
       +
             </span>

     

       15
       +
             {{ end }}

     

       16
       +
       

     

       17
       +
             <span class="before:content-['·']"></span>

     

       18
       +
             <a

     

       19
       +
                 href="#{{ .CommentId }}"

     

       20
       +
                 class="text-gray-500 hover:text-gray-500 hover:underline no-underline"

     

       21
       +
                 id="{{ .CommentId }}">

     

       22
       +
               {{ .Created | timeFmt }}

     

       23
       +
             </a>

     

       24
       +
       

     

       25
       +
             <button

     

       26
       +
               class="btn px-2 py-1 flex items-center gap-2 text-sm"

     

       27
       +
               hx-post="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit"

     

       28
       +
               hx-include="#edit-textarea-{{ .CommentId }}"

     

       29
       +
               hx-target="#comment-container-{{ .CommentId }}"

     

       30
       +
               hx-swap="outerHTML">

     

       31
       +
               {{ i "check" "w-4 h-4" }}

     

       32
       +
             </button>

     

       33
       +
             <button

     

       34
       +
               class="btn px-2 py-1  flex items-center gap-2 text-sm"

     

       35
       +
               hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"

     

       36
       +
               hx-target="#comment-container-{{ .CommentId }}"

     

       37
       +
               hx-swap="outerHTML">

     

       38
       +
               {{ i "x" "w-4 h-4" }}

     

       39
       +
             </button>

     

       40
       +
             <span id="comment-{{.CommentId}}-status"></span>

     

       41
       +
           </div>

     

       42
       +
       

     

       43
       +
           <div>

     

       44
       +
             <textarea

     

       45
       +
               id="edit-textarea-{{ .CommentId }}"

     

       46
       +
               name="body"

     

       47
       +
               class="w-full p-2 border rounded min-h-[100px]">{{ .Body }}</textarea>

     

       48
       +
           </div>

     

       49
       +
         </div>

     

       50
       +
         {{ end }}

     

       51
       +
       {{ end }}

     

       52
       +

+59

appview/pages/templates/repo/issues/fragments/issueComment.html

···

       1
       +
       {{ define "repo/issues/fragments/issueComment" }}

     

       2
       +
         {{ with .Comment }}

     

       3
       +
         <div id="comment-container-{{.CommentId}}">

     

       4
       +
           <div class="flex items-center gap-2 mb-2 text-gray-500 dark:text-gray-400 text-sm">

     

       5
       +
             {{ $owner := index $.DidHandleMap .OwnerDid }}

     

       6
       +
             <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>

     

       7
       +
       

     

       8
       +
            <span class="before:content-['·']"></span>

     

       9
       +
             <a

     

       10
       +
                 href="#{{ .CommentId }}"

     

       11
       +
                 class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-400 hover:underline no-underline"

     

       12
       +
                 id="{{ .CommentId }}">

     

       13
       +
               {{ if .Deleted }}

     

       14
       +
                 deleted {{ .Deleted | timeFmt }}

     

       15
       +
               {{ else if .Edited }}

     

       16
       +
                 edited {{ .Edited | timeFmt }}

     

       17
       +
               {{ else }}

     

       18
       +
                 {{ .Created | timeFmt }}

     

       19
       +
               {{ end }}

     

       20
       +
             </a>

     

       21
       +
             

     

       22
       +
             <!-- show user "hats" -->

     

       23
       +
             {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }}

     

       24
       +
             {{ if $isIssueAuthor }}

     

       25
       +
             <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       26
       +
               author

     

       27
       +
             </span>

     

       28
       +
             {{ end }}

     

       29
       +
       

     

       30
       +
             {{ $isCommentOwner := and $.LoggedInUser (eq $.LoggedInUser.Did .OwnerDid) }}

     

       31
       +
             {{ if and $isCommentOwner (not .Deleted) }}

     

       32
       +
             <button 

     

       33
       +
               class="btn px-2 py-1 text-sm" 

     

       34
       +
               hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit"

     

       35
       +
               hx-swap="outerHTML"

     

       36
       +
               hx-target="#comment-container-{{.CommentId}}"

     

       37
       +
               >

     

       38
       +
               {{ i "pencil" "w-4 h-4" }}

     

       39
       +
             </button>

     

       40
       +
             <button 

     

       41
       +
               class="btn px-2 py-1 text-sm text-red-500"

     

       42
       +
               hx-delete="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"

     

       43
       +
               hx-confirm="Are you sure you want to delete your comment?"

     

       44
       +
               hx-swap="outerHTML"

     

       45
       +
               hx-target="#comment-container-{{.CommentId}}"

     

       46
       +
               >

     

       47
       +
               {{ i "trash-2" "w-4 h-4" }}

     

       48
       +
             </button>

     

       49
       +
             {{ end }}

     

       50
       +
       

     

       51
       +
           </div>

     

       52
       +
           {{ if not .Deleted }}

     

       53
       +
           <div class="prose dark:prose-invert">

     

       54
       +
             {{ .Body | markdown }}

     

       55
       +
           </div>

     

       56
       +
           {{ end }}

     

       57
       +
         </div>

     

       58
       +
         {{ end }}

     

       59
       +
       {{ end }}

+112 -42

appview/pages/templates/repo/issues/issue.html

···

       44
        
       {{ end }}

     

       45
        
       

     

       46
        
       {{ define "repoAfter" }}

     

       47
       -
           {{ if gt (len .Comments) 0 }}

     

       48
       -
           <section id="comments" class="mt-8 space-y-4 relative">

     

       49
        
               {{ range $index, $comment := .Comments }}

     

       50
        
                   <div

     

       51
        
                       id="comment-{{ .CommentId }}"

     

       52
       -
                       class="rounded bg-white px-6 py-4 relative dark:bg-gray-800">

     

       53
       -
                       {{ if eq $index 0 }}

     

       54
       -
                           <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div>

     

       55
       -
                       {{ else }}

     

       56
       -
                           <div class="absolute left-8 -top-4 w-px h-4 bg-gray-300 dark:bg-gray-700" ></div>

     

       57
        
                       {{ end }}

     

       58
       -
       

     

       59
       -
                       {{ template "fragments/issueComment" (dict "RepoInfo" $.RepoInfo "LoggedInUser" $.LoggedInUser "DidHandleMap" $.DidHandleMap "Issue" $.Issue "Comment" .)}}

     

       60
        
                   </div>

     

       61
        
               {{ end }}

     

       62
        
           </section>

     

       63
       -
           {{ end }}

     

       64
        
       

     

       65
        
           {{ block "newComment" . }} {{ end }}

     

       66
        
       

     

       67
       -
           {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.OwnerDid) }}

     

       68
       -
           {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }}

     

       69
       -
           {{ if or $isIssueAuthor $isRepoCollaborator }}

     

       70
       -
               {{ $action := "close" }}

     

       71
       -
               {{ $icon := "circle-x" }}

     

       72
       -
               {{ $hoverColor := "red" }}

     

       73
       -
               {{ if eq .State "closed" }}

     

       74
       -
                   {{ $action = "reopen" }}

     

       75
       -
                   {{ $icon = "circle-dot" }}

     

       76
       -
                   {{ $hoverColor = "green" }}

     

       77
       -
               {{ end }}

     

       78
       -
               <form

     

       79
       -
                   hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/{{ $action }}"

     

       80
       -
                   hx-swap="none"

     

       81
       -
                   class="mt-8"

     

       82
       -
               >

     

       83
       -
                   <button type="submit" class="btn hover:bg-{{ $hoverColor }}-300">

     

       84
       -
                       {{ i $icon "w-4 h-4 mr-2" }}

     

       85
       -
                       <span class="text-black dark:text-gray-400">{{ $action }}</span>

     

       86
       -
                   </button>

     

       87
       -
                   <div id="issue-action" class="error"></div>

     

       88
       -
               </form>

     

       89
       -
           {{ end }}

     

       90
        
       {{ end }}

     

       91
        
       

     

       92
        
       {{ define "newComment" }}

     

       93
        
         {{ if .LoggedInUser }}

     

       94
       -
           <div class="bg-white rounded drop-shadow-sm py-4 px-6 relative w-full flex flex-col gap-2 mt-8 dark:bg-gray-800 dark:text-gray-400">

     

       95
       -
             <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div>

     

       96
       -
             <div class="text-sm text-gray-500 dark:text-gray-400">

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       97
        
               {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }}

     

       98
        
             </div>

     

       99
       -
             <form hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment">

     

       100
        
                 <textarea

     

       0
        
       
     

       101
        
                     name="body"

     

       102
        
                     class="w-full p-2 rounded border border-gray-200 dark:border-gray-700"

     

       103
       -
                     placeholder="Add to the discussion..."

     

       0
        
       
     

       104
        
                 ></textarea>

     

       105
       -
                 <button type="submit" class="btn mt-2">comment</button>

     

       106
        
                 <div id="issue-comment"></div>

     

       107
       -
             </form>

     

       108
        
           </div>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       109
        
         {{ else }}

     

       110
       -
           <div class="bg-white dark:bg-gray-800 dark:text-gray-400 rounded drop-shadow-sm px-6 py-4 mt-8">

     

       111
       -
             <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div>

     

       112
        
             <a href="/login" class="underline">login</a> to join the discussion

     

       113
        
           </div>

     

       114
        
         {{ end }}

···

       44
        
       {{ end }}

     

       45
        
       

     

       46
        
       {{ define "repoAfter" }}

     

       47
       +
           <section id="comments" class="my-2 mt-2 space-y-2 relative">

     

       0
        
       
     

       48
        
               {{ range $index, $comment := .Comments }}

     

       49
        
                   <div

     

       50
        
                       id="comment-{{ .CommentId }}"

     

       51
       +
                       class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit">

     

       52
       +
                       {{ if gt $index 0 }}

     

       53
       +
                       <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       0
        
       
     

       0
        
       
     

       54
        
                       {{ end }}

     

       55
       +
                       {{ template "repo/issues/fragments/issueComment" (dict "RepoInfo" $.RepoInfo "LoggedInUser" $.LoggedInUser "DidHandleMap" $.DidHandleMap "Issue" $.Issue "Comment" .)}}

     

       0
        
       
     

       56
        
                   </div>

     

       57
        
               {{ end }}

     

       58
        
           </section>

     

       0
        
       
     

       59
        
       

     

       60
        
           {{ block "newComment" . }} {{ end }}

     

       61
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       62
        
       {{ end }}

     

       63
        
       

     

       64
        
       {{ define "newComment" }}

     

       65
        
         {{ if .LoggedInUser }}

     

       66
       +
         <form 

     

       67
       +
             id="comment-form" 

     

       68
       +
             hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment"

     

       69
       +
             hx-on::after-request="if(event.detail.successful) this.reset()"

     

       70
       +
         >

     

       71
       +
           <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full md:w-3/5">

     

       72
       +
             <div class="text-sm pb-2 text-gray-500 dark:text-gray-400">

     

       73
        
               {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }}

     

       74
        
             </div>

     

       0
        
       
     

       75
        
                 <textarea

     

       76
       +
                     id="comment-textarea"

     

       77
        
                     name="body"

     

       78
        
                     class="w-full p-2 rounded border border-gray-200 dark:border-gray-700"

     

       79
       +
                     placeholder="Add to the discussion. Markdown is supported."

     

       80
       +
                     onkeyup="updateCommentForm()"

     

       81
        
                 ></textarea>

     

       0
        
       
     

       82
        
                 <div id="issue-comment"></div>

     

       83
       +
             <div id="issue-action" class="error"></div>

     

       84
        
           </div>

     

       85
       +
           

     

       86
       +
           <div class="flex gap-2 mt-2">

     

       87
       +
               <button 

     

       88
       +
                   id="comment-button" 

     

       89
       +
                   hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 

     

       90
       +
                   type="submit" 

     

       91
       +
                   hx-disabled-elt="#comment-button"

     

       92
       +
                   class="btn p-2 flex items-center gap-2 no-underline hover:no-underline" 

     

       93
       +
                   disabled

     

       94
       +
               >

     

       95
       +
                   {{ i "message-square-plus" "w-4 h-4" }}

     

       96
       +
                   comment

     

       97
       +
               </button>

     

       98
       +
       

     

       99
       +
               {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.OwnerDid) }}

     

       100
       +
               {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }}

     

       101
       +
               {{ if and (or $isIssueAuthor $isRepoCollaborator) (eq .State "open") }}

     

       102
       +
               <button 

     

       103
       +
                   id="close-button"

     

       104
       +
                   type="button" 

     

       105
       +
                   class="btn flex items-center gap-2"

     

       106
       +
                   hx-trigger="click"

     

       107
       +
               >

     

       108
       +
                   {{ i "ban" "w-4 h-4" }}

     

       109
       +
                   close

     

       110
       +
               </button>

     

       111
       +
               <div 

     

       112
       +
                   id="close-with-comment" 

     

       113
       +
                   hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 

     

       114
       +
                   hx-trigger="click from:#close-button" 

     

       115
       +
                   hx-disabled-elt="#close-with-comment"

     

       116
       +
                   hx-target="#issue-comment"

     

       117
       +
                   hx-vals="js:{body: document.getElementById('comment-textarea').value.trim() !== '' ? document.getElementById('comment-textarea').value : ''}"

     

       118
       +
                   hx-swap="none"

     

       119
       +
               >

     

       120
       +
               </div>

     

       121
       +
               <div 

     

       122
       +
                   id="close-issue" 

     

       123
       +
                   hx-disabled-elt="#close-issue"

     

       124
       +
                   hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/close" 

     

       125
       +
                   hx-trigger="click from:#close-button" 

     

       126
       +
                   hx-target="#issue-action"

     

       127
       +
                   hx-swap="none"

     

       128
       +
               >

     

       129
       +
               </div>

     

       130
       +
               <script>

     

       131
       +
                   document.addEventListener('htmx:configRequest', function(evt) {

     

       132
       +
                       if (evt.target.id === 'close-with-comment') {

     

       133
       +
                           const commentText = document.getElementById('comment-textarea').value.trim();

     

       134
       +
                           if (commentText === '') {

     

       135
       +
                               evt.detail.parameters = {};

     

       136
       +
                               evt.preventDefault();

     

       137
       +
                           }

     

       138
       +
                       }

     

       139
       +
                   });

     

       140
       +
               </script>

     

       141
       +
               {{ else if and (or $isIssueAuthor $isRepoCollaborator) (eq .State "closed") }}

     

       142
       +
               <button 

     

       143
       +
                   type="button" 

     

       144
       +
                   class="btn flex items-center gap-2"

     

       145
       +
                   hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/reopen"

     

       146
       +
                   hx-swap="none"

     

       147
       +
               >

     

       148
       +
                   {{ i "refresh-ccw-dot" "w-4 h-4" }}

     

       149
       +
                   reopen

     

       150
       +
               </button>

     

       151
       +
               {{ end }}

     

       152
       +
       

     

       153
       +
               <script>

     

       154
       +
               function updateCommentForm() {

     

       155
       +
                   const textarea = document.getElementById('comment-textarea');

     

       156
       +
                   const commentButton = document.getElementById('comment-button');

     

       157
       +
                   const closeButton = document.getElementById('close-button');

     

       158
       +
       

     

       159
       +
                   if (textarea.value.trim() !== '') {

     

       160
       +
                       commentButton.removeAttribute('disabled');

     

       161
       +
                   } else {

     

       162
       +
                       commentButton.setAttribute('disabled', '');

     

       163
       +
                   }

     

       164
       +
       

     

       165
       +
                   if (closeButton) {

     

       166
       +
                       if (textarea.value.trim() !== '') {

     

       167
       +
                           closeButton.innerHTML = '{{ i "ban" "w-4 h-4" }} close with comment';

     

       168
       +
                       } else {

     

       169
       +
                           closeButton.innerHTML = '{{ i "ban" "w-4 h-4" }} close';

     

       170
       +
                       }

     

       171
       +
                   }

     

       172
       +
               }

     

       173
       +
       

     

       174
       +
               document.addEventListener('DOMContentLoaded', function() {

     

       175
       +
                   updateCommentForm();

     

       176
       +
               });

     

       177
       +
               </script>

     

       178
       +
           </div>

     

       179
       +
         </form> 

     

       180
        
         {{ else }}

     

       181
       +
           <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-fit">

     

       0
        
       
     

       182
        
             <a href="/login" class="underline">login</a> to join the discussion

     

       183
        
           </div>

     

       184
        
         {{ end }}

+3 -3

appview/pages/templates/repo/issues/issues.html

···

       4
        
           <div class="flex justify-between items-center">

     

       5
        
               <p>

     

       6
        
               filtering

     

       7
       -
               <select class="border px-1 bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-700" onchange="window.location.href = '/{{ .RepoInfo.FullName }}/issues?state=' + this.value">

     

       8
        
                 <option value="open" {{ if .FilteringByOpen }}selected{{ end }}>open ({{ .RepoInfo.Stats.IssueCount.Open }})</option>

     

       9
        
                 <option value="closed" {{ if not .FilteringByOpen }}selected{{ end }}>closed ({{ .RepoInfo.Stats.IssueCount.Closed }})</option>

     

       10
        
               </select>

     
···

       13
        
               <a

     

       14
        
                   href="/{{ .RepoInfo.FullName }}/issues/new"

     

       15
        
                   class="btn text-sm flex items-center gap-2 no-underline hover:no-underline">

     

       16
       -
                   {{ i "plus" "w-4 h-4" }}

     

       17
       -
                   <span>new issue</span>

     

       18
        
               </a>

     

       19
        
           </div>

     

       20
        
           <div class="error" id="issues"></div>

···

       4
        
           <div class="flex justify-between items-center">

     

       5
        
               <p>

     

       6
        
               filtering

     

       7
       +
               <select class="border p-1 bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-700" onchange="window.location.href = '/{{ .RepoInfo.FullName }}/issues?state=' + this.value">

     

       8
        
                 <option value="open" {{ if .FilteringByOpen }}selected{{ end }}>open ({{ .RepoInfo.Stats.IssueCount.Open }})</option>

     

       9
        
                 <option value="closed" {{ if not .FilteringByOpen }}selected{{ end }}>closed ({{ .RepoInfo.Stats.IssueCount.Closed }})</option>

     

       10
        
               </select>

     
···

       13
        
               <a

     

       14
        
                   href="/{{ .RepoInfo.FullName }}/issues/new"

     

       15
        
                   class="btn text-sm flex items-center gap-2 no-underline hover:no-underline">

     

       16
       +
                   {{ i "circle-plus" "w-4 h-4" }}

     

       17
       +
                   <span>new</span>

     

       18
        
               </a>

     

       19
        
           </div>

     

       20
        
           <div class="error" id="issues"></div>

+1 -1

appview/pages/templates/repo/log.html

···

       83
        
                                               <p

     

       84
        
                                                   class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300"

     

       85
        
                                               >

     

       86
       -
                                                   {{ nl2br (unwrapText (index $messageParts 1)) }}

     

       87
        
                                               </p>

     

       88
        
                                           {{ end }}

     

       89
        
                                       </div>

···

       83
        
                                               <p

     

       84
        
                                                   class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300"

     

       85
        
                                               >

     

       86
       +
                                                   {{ nl2br (index $messageParts 1) }}

     

       87
        
                                               </p>

     

       88
        
                                           {{ end }}

     

       89
        
                                       </div>

+90

appview/pages/templates/repo/pulls/fragments/pullActions.html

···

       1
       +
       {{ define "repo/pulls/fragments/pullActions" }}

     

       2
       +
         {{ $lastIdx := sub (len .Pull.Submissions) 1 }}

     

       3
       +
         {{ $roundNumber := .RoundNumber }}

     

       4
       +
       

     

       5
       +
         {{ $isPushAllowed := .RepoInfo.Roles.IsPushAllowed }}

     

       6
       +
         {{ $isMerged := .Pull.State.IsMerged }}

     

       7
       +
         {{ $isClosed := .Pull.State.IsClosed }}

     

       8
       +
         {{ $isOpen := .Pull.State.IsOpen }}

     

       9
       +
         {{ $isConflicted := and .MergeCheck (or .MergeCheck.Error .MergeCheck.IsConflicted) }}

     

       10
       +
         {{ $isPullAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Pull.OwnerDid) }}

     

       11
       +
         {{ $isLastRound := eq $roundNumber $lastIdx }}

     

       12
       +
         {{ $isSameRepoBranch := .Pull.IsBranchBased }}

     

       13
       +
         {{ $isUpToDate := .ResubmitCheck.No }}

     

       14
       +
         <div class="relative w-fit">

     

       15
       +
           <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2">

     

       16
       +
               <button 

     

       17
       +
                 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment"

     

       18
       +
                 hx-target="#actions-{{$roundNumber}}"

     

       19
       +
                 hx-swap="outerHtml"

     

       20
       +
                 class="btn p-2 flex items-center gap-2 no-underline hover:no-underline">

     

       21
       +
                   {{ i "message-square-plus" "w-4 h-4" }}

     

       22
       +
                   <span>comment</span>

     

       23
       +
               </button>

     

       24
       +
               {{ if and $isPushAllowed $isOpen $isLastRound }}

     

       25
       +
                 {{ $disabled := "" }}

     

       26
       +
                 {{ if $isConflicted }}

     

       27
       +
                   {{ $disabled = "disabled" }}

     

       28
       +
                 {{ end }}

     

       29
       +
                 <button 

     

       30
       +
                   hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge"

     

       31
       +
                   hx-swap="none"

     

       32
       +
                   hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?"

     

       33
       +
                   class="btn p-2 flex items-center gap-2" {{ $disabled }}>

     

       34
       +
                   {{ i "git-merge" "w-4 h-4" }}

     

       35
       +
                     <span>merge</span>

     

       36
       +
                 </button>

     

       37
       +
               {{ end }}

     

       38
       +
       

     

       39
       +
               {{ if and $isPullAuthor $isOpen $isLastRound }}

     

       40
       +
                 {{ $disabled := "" }}

     

       41
       +
                 {{ if $isUpToDate }}

     

       42
       +
                   {{ $disabled = "disabled" }}

     

       43
       +
                 {{ end }}

     

       44
       +
                 <button id="resubmitBtn"

     

       45
       +
                     {{ if not .Pull.IsPatchBased }}

     

       46
       +
                       hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit"

     

       47
       +
                     {{ else }}

     

       48
       +
                       hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit"

     

       49
       +
                       hx-target="#actions-{{$roundNumber}}"

     

       50
       +
                       hx-swap="outerHtml"

     

       51
       +
                     {{ end }}

     

       52
       +
       

     

       53
       +
                     hx-disabled-elt="#resubmitBtn"

     

       54
       +
                     class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" {{ $disabled }}

     

       55
       +
       

     

       56
       +
                     {{ if $disabled }}

     

       57
       +
                     title="Update this branch to resubmit this pull request"

     

       58
       +
                     {{ else }}

     

       59
       +
                     title="Resubmit this pull request"

     

       60
       +
                     {{ end }}

     

       61
       +
                     >

     

       62
       +
                   {{ i "rotate-ccw" "w-4 h-4" }}

     

       63
       +
                     <span>resubmit</span>

     

       64
       +
                 </button>

     

       65
       +
               {{ end }}

     

       66
       +
       

     

       67
       +
               {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }}

     

       68
       +
               <button 

     

       69
       +
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close"

     

       70
       +
                 hx-swap="none"

     

       71
       +
                 class="btn p-2 flex items-center gap-2">

     

       72
       +
                 {{ i "ban" "w-4 h-4" }}

     

       73
       +
                   <span>close</span>

     

       74
       +
               </button>

     

       75
       +
               {{ end }}

     

       76
       +
       

     

       77
       +
               {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }}

     

       78
       +
               <button 

     

       79
       +
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen"

     

       80
       +
                 hx-swap="none"

     

       81
       +
                 class="btn p-2 flex items-center gap-2">

     

       82
       +
                 {{ i "refresh-ccw-dot" "w-4 h-4" }}

     

       83
       +
                   <span>reopen</span>

     

       84
       +
               </button>

     

       85
       +
               {{ end }}

     

       86
       +
           </div>

     

       87
       +
         </div>

     

       88
       +
       {{ end }}

     

       89
       +
       

     

       90
       +

+20

appview/pages/templates/repo/pulls/fragments/pullCompareBranches.html

···

       1
       +
       {{ define "repo/pulls/fragments/pullCompareBranches" }}

     

       2
       +
           <div id="patch-upload">

     

       3
       +
               <label for="targetBranch" class="dark:text-white"

     

       4
       +
                   >select a branch</label

     

       5
       +
               >

     

       6
       +
               <div class="flex flex-wrap gap-2 items-center">

     

       7
       +
                   <select

     

       8
       +
                       name="sourceBranch"

     

       9
       +
                       class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       10
       +
                   >

     

       11
       +
                       <option disabled selected>source branch</option>

     

       12
       +
                       {{ range .Branches }}

     

       13
       +
                           <option value="{{ .Reference.Name }}" class="py-1">

     

       14
       +
                               {{ .Reference.Name }}

     

       15
       +
                           </option>

     

       16
       +
                       {{ end }}

     

       17
       +
                   </select>

     

       18
       +
               </div>

     

       19
       +
           </div>

     

       20
       +
       {{ end }}

+42

appview/pages/templates/repo/pulls/fragments/pullCompareForks.html

···

       1
       +
       {{ define "repo/pulls/fragments/pullCompareForks" }}

     

       2
       +
           <div id="patch-upload">

     

       3
       +
               <label for="forkSelect" class="dark:text-white"

     

       4
       +
                   >select a fork to compare</label

     

       5
       +
               >

     

       6
       +
               <div class="flex flex-wrap gap-4 items-center mb-4">

     

       7
       +
                   <div class="flex flex-wrap gap-2 items-center">

     

       8
       +
                       <select

     

       9
       +
                           id="forkSelect"

     

       10
       +
                           name="fork"

     

       11
       +
                           required

     

       12
       +
                           class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       13
       +
                           hx-get="/{{ $.RepoInfo.FullName }}/pulls/new/fork-branches"

     

       14
       +
                           hx-target="#branch-selection"

     

       15
       +
                           hx-vals='{"fork": this.value}'

     

       16
       +
                           hx-swap="innerHTML"

     

       17
       +
                           onchange="document.getElementById('hiddenForkInput').value = this.value;"

     

       18
       +
                       >

     

       19
       +
                           <option disabled selected>select a fork</option>

     

       20
       +
                           {{ range .Forks }}

     

       21
       +
                               <option value="{{ .Name }}" class="py-1">

     

       22
       +
                                   {{ .Name }}

     

       23
       +
                               </option>

     

       24
       +
                           {{ end }}

     

       25
       +
                       </select>

     

       26
       +
       

     

       27
       +
                       <input

     

       28
       +
                           type="hidden"

     

       29
       +
                           id="hiddenForkInput"

     

       30
       +
                           name="fork"

     

       31
       +
                           value=""

     

       32
       +
                       />

     

       33
       +
                   </div>

     

       34
       +
       

     

       35
       +
                   <div id="branch-selection">

     

       36
       +
                       <div class="text-sm text-gray-500 dark:text-gray-400">

     

       37
       +
                           Select a fork first to view available branches

     

       38
       +
                       </div>

     

       39
       +
                   </div>

     

       40
       +
               </div>

     

       41
       +
           </div>

     

       42
       +
       {{ end }}

+15

appview/pages/templates/repo/pulls/fragments/pullCompareForksBranches.html

···

       1
       +
       {{ define "repo/pulls/fragments/pullCompareForksBranches" }}

     

       2
       +
           <div class="flex flex-wrap gap-2 items-center">

     

       3
       +
               <select

     

       4
       +
                   name="sourceBranch"

     

       5
       +
                   class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       6
       +
               >

     

       7
       +
                   <option disabled selected>source branch</option>

     

       8
       +
                   {{ range .SourceBranches }}

     

       9
       +
                       <option value="{{ .Reference.Name }}" class="py-1">

     

       10
       +
                           {{ .Reference.Name }}

     

       11
       +
                       </option>

     

       12
       +
                   {{ end }}

     

       13
       +
               </select>

     

       14
       +
           </div>

     

       15
       +
       {{ end }}

+32

appview/pages/templates/repo/pulls/fragments/pullNewComment.html

···

       1
       +
       {{ define "repo/pulls/fragments/pullNewComment" }}

     

       2
       +
       <div 

     

       3
       +
         id="pull-comment-card-{{ .RoundNumber }}" 

     

       4
       +
         class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2">

     

       5
       +
         <div class="text-sm text-gray-500 dark:text-gray-400">

     

       6
       +
           {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }}

     

       7
       +
         </div>

     

       8
       +
         <form

     

       9
       +
           hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"

     

       10
       +
           hx-swap="none"

     

       11
       +
           class="w-full flex flex-wrap gap-2">

     

       12
       +
           <textarea

     

       13
       +
               name="body"

     

       14
       +
               class="w-full p-2 rounded border border-gray-200"

     

       15
       +
               placeholder="Add to the discussion..."></textarea>

     

       16
       +
           <button type="submit" class="btn flex items-center gap-2">

     

       17
       +
             {{ i "message-square" "w-4 h-4" }} comment

     

       18
       +
           </button>

     

       19
       +
           <button 

     

       20
       +
             type="button" 

     

       21
       +
             class="btn flex items-center gap-2" 

     

       22
       +
             hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions"

     

       23
       +
             hx-swap="outerHTML"

     

       24
       +
             hx-target="#pull-comment-card-{{ .RoundNumber }}">

     

       25
       +
             {{ i "x" "w-4 h-4" }}

     

       26
       +
             <span>cancel</span>

     

       27
       +
           </button>

     

       28
       +
           <div id="pull-comment"></div>

     

       29
       +
         </form>

     

       30
       +
       </div>

     

       31
       +
       {{ end }}

     

       32
       +

+14

appview/pages/templates/repo/pulls/fragments/pullPatchUpload.html

···

       1
       +
       {{ define "repo/pulls/fragments/pullPatchUpload" }}

     

       2
       +
           <div id="patch-upload">

     

       3
       +
               <textarea

     

       4
       +
                   name="patch"

     

       5
       +
                   id="patch"

     

       6
       +
                   rows="12"

     

       7
       +
                   class="w-full resize-y font-mono dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       8
       +
                   placeholder="diff --git a/file.txt b/file.txt

     

       9
       +
                   index 1234567..abcdefg 100644

     

       10
       +
                   --- a/file.txt

     

       11
       +
                   +++ b/file.txt"

     

       12
       +
               ></textarea>

     

       13
       +
           </div>

     

       14
       +
       {{ end }}

+52

appview/pages/templates/repo/pulls/fragments/pullResubmit.html

···

       1
       +
       {{ define "repo/pulls/fragments/pullResubmit" }}

     

       2
       +
         <div

     

       3
       +
             id="resubmit-pull-card"

     

       4
       +
             class="rounded relative border bg-amber-50 dark:bg-amber-900 border-amber-200 dark:border-amber-500 px-6 py-2">

     

       5
       +
       

     

       6
       +
             <div class="flex items-center gap-2 text-amber-500 dark:text-amber-50">

     

       7
       +
               {{ i "pencil" "w-4 h-4" }}

     

       8
       +
               <span class="font-medium">resubmit your patch</span>

     

       9
       +
             </div>

     

       10
       +
       

     

       11
       +
             <div class="mt-2 text-sm text-gray-700 dark:text-gray-200">

     

       12
       +
               You can update this patch to address any reviews. 

     

       13
       +
               This will begin a new round of reviews,

     

       14
       +
               but you'll still be able to view your previous submissions and feedback.

     

       15
       +
             </div>

     

       16
       +
       

     

       17
       +
             <div class="mt-4 flex flex-col">

     

       18
       +
               <form 

     

       19
       +
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 

     

       20
       +
                 hx-swap="none"

     

       21
       +
                 class="w-full flex flex-wrap gap-2">

     

       22
       +
                 <textarea

     

       23
       +
                   name="patch"

     

       24
       +
                   class="w-full p-2 mb-2"

     

       25
       +
                   placeholder="Paste your updated patch here."

     

       26
       +
                   rows="15"

     

       27
       +
                   >{{.Pull.LatestPatch}}</textarea>

     

       28
       +
                 <button

     

       29
       +
                     type="submit"

     

       30
       +
                     class="btn flex items-center gap-2"

     

       31
       +
                     {{ if or .Pull.State.IsClosed }}

     

       32
       +
                     disabled

     

       33
       +
                     {{ end }}>

     

       34
       +
                   {{ i "rotate-ccw" "w-4 h-4" }}

     

       35
       +
                   <span>resubmit</span>

     

       36
       +
                 </button>

     

       37
       +
                 <button 

     

       38
       +
                   type="button" 

     

       39
       +
                   class="btn flex items-center gap-2" 

     

       40
       +
                   hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Pull.LastRoundNumber }}/actions"

     

       41
       +
                   hx-swap="outerHTML"

     

       42
       +
                   hx-target="#resubmit-pull-card">

     

       43
       +
                   {{ i "x" "w-4 h-4" }}

     

       44
       +
                   <span>cancel</span>

     

       45
       +
                 </button>

     

       46
       +
               </form>

     

       47
       +
       

     

       48
       +
               <div id="resubmit-error" class="error"></div>

     

       49
       +
               <div id="resubmit-success" class="success"></div>

     

       50
       +
             </div>

     

       51
       +
         </div>

     

       52
       +
       {{ end }}

+1 -1

appview/pages/templates/repo/pulls/new.html

···

       84
        
               </nav>

     

       85
        
       

     

       86
        
              <section id="patch-strategy">

     

       87
       -
                   {{ template "fragments/pullPatchUpload" . }}

     

       88
        
               </section>

     

       89
        
       

     

       90
        
               <div class="flex justify-start items-center gap-2 mt-4">

···

       84
        
               </nav>

     

       85
        
       

     

       86
        
              <section id="patch-strategy">

     

       87
       +
                   {{ template "repo/pulls/fragments/pullPatchUpload" . }}

     

       88
        
               </section>

     

       89
        
       

     

       90
        
               <div class="flex justify-start items-center gap-2 mt-4">

+1 -14

appview/pages/templates/repo/pulls/patch.html

···

       69
        
                 {{ end }}

     

       70
        
             </section>

     

       71
        
       

     

       72
       -
             <div id="diff-stat">

     

       73
       -
               <br>

     

       74
       -
               <strong class="text-sm uppercase mb-4">Changed files</strong>

     

       75
       -
               {{ range .Diff.Diff }}

     

       76
       -
               <ul>

     

       77
       -
                 {{ if .IsDelete }}

     

       78
       -
                 <li><a href="#file-{{ .Name.Old }}">{{ .Name.Old }}</a></li>

     

       79
       -
                 {{ else }}

     

       80
       -
                 <li><a href="#file-{{ .Name.New }}">{{ .Name.New }}</a></li>

     

       81
       -
                 {{ end }}

     

       82
       -
               </ul>

     

       83
       -
               {{ end }}

     

       84
       -
             </div>

     

       85
        
         </div>

     

       86
        
       

     

       87
        
         <section>

     

       88
       -
           {{ template "fragments/diff" (list .RepoInfo.FullName .Diff) }}

     

       89
        
         </section>

     

       90
        
       {{ end }}

···

       69
        
                 {{ end }}

     

       70
        
             </section>

     

       71
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       72
        
         </div>

     

       73
        
       

     

       74
        
         <section>

     

       75
       +
           {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff) }}

     

       76
        
         </section>

     

       77
        
       {{ end }}

+8 -8

appview/pages/templates/repo/pulls/pull.html

···

       21
        
               {{ $icon = "git-merge" }}

     

       22
        
           {{ end }}

     

       23
        
       

     

       24
       -
           <section>

     

       25
        
               <div class="flex items-center gap-2">

     

       26
        
                   <div

     

       27
        
                       id="state"

     
···

       45
        
                           <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Pull.TargetBranch }}" class="no-underline hover:underline">{{ .Pull.TargetBranch }}</a>

     

       46
        
                         </span>

     

       47
        
                       </span>

     

       48
       -
                       {{ if not .Pull.IsPatch }}

     

       49
        
                       <span>from

     

       50
       -
                         {{ if not .Pull.IsSameRepoBranch }}

     

       51
        
                           <a href="/{{ $owner }}/{{ .PullSourceRepo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSourceRepo.Name }}</a>

     

       52
        
                         {{ end }}

     

       53
        
       

     

       54
        
                         {{ $fullRepo := .RepoInfo.FullName }}

     

       55
       -
                         {{ if not .Pull.IsSameRepoBranch }}

     

       56
        
                           {{ $fullRepo = printf "%s/%s" $owner .PullSourceRepo.Name }}

     

       57
        
                         {{ end }}

     

       58
        
                         <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     
···

       64
        
               </div>

     

       65
        
       

     

       66
        
               {{ if .Pull.Body }}

     

       67
       -
                   <article id="body" class="mt-2 prose dark:prose-invert">

     

       68
        
                       {{ .Pull.Body | markdown }}

     

       69
        
                   </article>

     

       70
        
               {{ end }}

     
···

       127
        
               </summary>

     

       128
        
               <div class="md:pl-12 flex flex-col gap-2 mt-2 relative">

     

       129
        
                 {{ range .Comments }}

     

       130
       -
                   <div id="comment-{{.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-fit">

     

       131
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       132
        
                     <div class="text-sm text-gray-500 dark:text-gray-400">

     

       133
        
                       {{ $owner := index $.DidHandleMap .OwnerDid }} 

     
···

       147
        
                 {{ end }}

     

       148
        
       

     

       149
        
                 {{ if $.LoggedInUser }}

     

       150
       -
                   {{ template "fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck) }}

     

       151
        
                 {{ else }}

     

       152
        
                   <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm px-6 py-4 w-fit dark:text-white">

     

       153
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     
···

       156
        
                 {{ end }}

     

       157
        
               </div>

     

       158
        
           </details>

     

       159
       -
           <hr class="md:hidden"/>

     

       160
        
           {{ end }}

     

       161
        
         {{ end }}

     

       162
        
       {{ end }}

···

       21
        
               {{ $icon = "git-merge" }}

     

       22
        
           {{ end }}

     

       23
        
       

     

       24
       +
           <section class="mt-2">

     

       25
        
               <div class="flex items-center gap-2">

     

       26
        
                   <div

     

       27
        
                       id="state"

     
···

       45
        
                           <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Pull.TargetBranch }}" class="no-underline hover:underline">{{ .Pull.TargetBranch }}</a>

     

       46
        
                         </span>

     

       47
        
                       </span>

     

       48
       +
                       {{ if not .Pull.IsPatchBased }}

     

       49
        
                       <span>from

     

       50
       +
                         {{ if not .Pull.IsBranchBased }}

     

       51
        
                           <a href="/{{ $owner }}/{{ .PullSourceRepo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSourceRepo.Name }}</a>

     

       52
        
                         {{ end }}

     

       53
        
       

     

       54
        
                         {{ $fullRepo := .RepoInfo.FullName }}

     

       55
       +
                         {{ if not .Pull.IsBranchBased }}

     

       56
        
                           {{ $fullRepo = printf "%s/%s" $owner .PullSourceRepo.Name }}

     

       57
        
                         {{ end }}

     

       58
        
                         <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     
···

       64
        
               </div>

     

       65
        
       

     

       66
        
               {{ if .Pull.Body }}

     

       67
       +
                   <article id="body" class="mt-8 prose dark:prose-invert">

     

       68
        
                       {{ .Pull.Body | markdown }}

     

       69
        
                   </article>

     

       70
        
               {{ end }}

     
···

       127
        
               </summary>

     

       128
        
               <div class="md:pl-12 flex flex-col gap-2 mt-2 relative">

     

       129
        
                 {{ range .Comments }}

     

       130
       +
                   <div id="comment-{{.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit">

     

       131
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       132
        
                     <div class="text-sm text-gray-500 dark:text-gray-400">

     

       133
        
                       {{ $owner := index $.DidHandleMap .OwnerDid }} 

     
···

       147
        
                 {{ end }}

     

       148
        
       

     

       149
        
                 {{ if $.LoggedInUser }}

     

       150
       +
                   {{ template "repo/pulls/fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck) }}

     

       151
        
                 {{ else }}

     

       152
        
                   <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm px-6 py-4 w-fit dark:text-white">

     

       153
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     
···

       156
        
                 {{ end }}

     

       157
        
               </div>

     

       158
        
           </details>

     

       159
       +
           <hr class="md:hidden border-t border-gray-300 dark:border-gray-600"/>

     

       160
        
           {{ end }}

     

       161
        
         {{ end }}

     

       162
        
       {{ end }}

+10 -6

appview/pages/templates/repo/pulls/pulls.html

···

       5
        
               <p class="dark:text-white">

     

       6
        
                   filtering

     

       7
        
                   <select

     

       8
       -
                       class="border px-1 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-600 dark:text-white"

     

       9
        
                       onchange="window.location.href = '/{{ .RepoInfo.FullName }}/pulls?state=' + this.value"

     

       10
        
                   >

     

       11
        
                       <option value="open" {{ if .FilteringBy.IsOpen }}selected{{ end }}>

     
···

       22
        
               </p>

     

       23
        
               <a

     

       24
        
                   href="/{{ .RepoInfo.FullName }}/pulls/new"

     

       25
       -
                   class="btn text-sm flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:bg-gray-700 dark:hover:bg-gray-600"

     

       26
        
               >

     

       27
       -
                   {{ i "git-pull-request" "w-4 h-4" }}

     

       28
       -
                   <span>new pull request</span>

     

       29
        
               </a>

     

       30
        
           </div>

     

       31
        
           <div class="error" id="pulls"></div>

     
···

       78
        
                                 {{ .TargetBranch }}

     

       79
        
                               </span>

     

       80
        
                           </span>

     

       81
       -
                           {{ if not .IsPatch }}

     

       82
        
                           <span>from

     

       83
       -
                             {{ if not .IsSameRepoBranch }}

     

       0
        
       
     

       84
        
                               <a href="/{{ $owner }}/{{ .PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSource.Repo.Name }}</a>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       85
        
                             {{ end }}

     

       86
        
       

     

       87
        
                             <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

···

       5
        
               <p class="dark:text-white">

     

       6
        
                   filtering

     

       7
        
                   <select

     

       8
       +
                       class="border p-1 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-600 dark:text-white"

     

       9
        
                       onchange="window.location.href = '/{{ .RepoInfo.FullName }}/pulls?state=' + this.value"

     

       10
        
                   >

     

       11
        
                       <option value="open" {{ if .FilteringBy.IsOpen }}selected{{ end }}>

     
···

       22
        
               </p>

     

       23
        
               <a

     

       24
        
                   href="/{{ .RepoInfo.FullName }}/pulls/new"

     

       25
       +
                   class="btn text-sm flex items-center gap-2 no-underline hover:no-underline"

     

       26
        
               >

     

       27
       +
                   {{ i "git-pull-request-create" "w-4 h-4" }}

     

       28
       +
                   <span>new</span>

     

       29
        
               </a>

     

       30
        
           </div>

     

       31
        
           <div class="error" id="pulls"></div>

     
···

       78
        
                                 {{ .TargetBranch }}

     

       79
        
                               </span>

     

       80
        
                           </span>

     

       81
       +
                           {{ if not .IsPatchBased }}

     

       82
        
                           <span>from

     

       83
       +
                             {{ if .IsForkBased }}

     

       84
       +
                               {{ if .PullSource.Repo }}

     

       85
        
                               <a href="/{{ $owner }}/{{ .PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSource.Repo.Name }}</a>

     

       86
       +
                               {{ else }}

     

       87
       +
                               <span class="italic">[deleted fork]</span>

     

       88
       +
                               {{ end }}

     

       89
        
                             {{ end }}

     

       90
        
       

     

       91
        
                             <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

+14 -3

appview/pages/templates/repo/settings.html

···

       22
        
               {{ end }}

     

       23
        
           </div>

     

       24
        
       

     

       25
       -
           {{ if .IsCollaboratorInviteAllowed }}

     

       26
        
               <form hx-put="/{{ $.RepoInfo.FullName }}/settings/collaborator">

     

       27
        
                   <label for="collaborator" class="dark:text-white"

     

       28
        
                       >add collaborator</label

     
···

       45
        
           {{ end }}

     

       46
        
       

     

       47
        
           <form hx-put="/{{ $.RepoInfo.FullName }}/settings/branches/default" class="mt-6">

     

       48
       -
               <label for="branch">default branch:</label>

     

       49
       -
               <select id="branch" name="branch" required class="p-1 border border-gray-200 bg-white">

     

       50
        
                   {{ range .Branches }}

     

       51
        
                       <option

     

       52
        
                           value="{{ . }}"

     
···

       61
        
               </select>

     

       62
        
               <button class="btn my-2" type="text">save</button>

     

       63
        
           </form>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       64
        
       {{ end }}

···

       22
        
               {{ end }}

     

       23
        
           </div>

     

       24
        
       

     

       25
       +
           {{ if .RepoInfo.Roles.CollaboratorInviteAllowed }}

     

       26
        
               <form hx-put="/{{ $.RepoInfo.FullName }}/settings/collaborator">

     

       27
        
                   <label for="collaborator" class="dark:text-white"

     

       28
        
                       >add collaborator</label

     
···

       45
        
           {{ end }}

     

       46
        
       

     

       47
        
           <form hx-put="/{{ $.RepoInfo.FullName }}/settings/branches/default" class="mt-6">

     

       48
       +
               <label for="branch">default branch</label>

     

       49
       +
               <select id="branch" name="branch" required class="p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700">

     

       50
        
                   {{ range .Branches }}

     

       51
        
                       <option

     

       52
        
                           value="{{ . }}"

     
···

       61
        
               </select>

     

       62
        
               <button class="btn my-2" type="text">save</button>

     

       63
        
           </form>

     

       64
       +
       

     

       65
       +
           {{ if .RepoInfo.Roles.RepoDeleteAllowed }}

     

       66
       +
           <form hx-confirm="Are you sure you want to delete this repository?" hx-delete="/{{ $.RepoInfo.FullName }}/settings/delete" class="mt-6">

     

       67
       +
               <label for="branch">delete repository</label>

     

       68
       +
               <button class="btn my-2" type="text">delete</button>

     

       69
       +
               <span>

     

       70
       +
                 Deleting a repository is irreversible and permanent.

     

       71
       +
               </span>

     

       72
       +
           </form>

     

       73
       +
           {{ end }}

     

       74
       +
       

     

       75
        
       {{ end }}

+7 -6

appview/pages/templates/repo/tree.html

···

       17
        
           {{ $containerstyle := "py-1" }}

     

       18
        
           {{ $linkstyle := "no-underline hover:underline" }}

     

       19
        
       

     

       20
       -
           <div class="pb-2 mb-3 text-base border-b border-gray-200 dark:border-gray-500">

     

       21
        
             <div class="flex flex-col md:flex-row md:justify-between gap-2">

     

       22
       -
               <div id="breadcrumbs" class="overflow-x-auto whitespace-nowrap">

     

       23
        
                 {{ range .BreadCrumbs }}

     

       24
       -
                 <a href="{{ index . 1}}" class="text-bold text-gray-500 dark:text-gray-400 {{ $linkstyle }}">{{ index . 0 }}</a> /

     

       25
        
                 {{ end }}

     

       26
        
               </div>

     

       27
        
               <div id="dir-info" class="text-gray-500 dark:text-gray-400 text-xs md:text-sm flex flex-wrap items-center gap-1 md:gap-0">

     

       28
        
                 {{ $stats := .TreeStats }}

     

       29
        
       

     

       30
        
                 <span>at <a href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref }}">{{ $.Ref }}</a></span>

     

       31
       -
                 <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       32
        
                 {{ if eq $stats.NumFolders 1 }}

     

       33
       -
                   <span>{{ $stats.NumFolders }} folder</span>

     

       34
        
                   <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       0
        
       
     

       35
        
                 {{ else if gt $stats.NumFolders 1 }}

     

       36
       -
                   <span>{{ $stats.NumFolders }} folders</span>

     

       37
        
                   <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       0
        
       
     

       38
        
                 {{ end }}

     

       39
        
       

     

       40
        
                 {{ if eq $stats.NumFiles 1 }}

     

       0
        
       
     

       41
        
                   <span>{{ $stats.NumFiles }} file</span>

     

       42
        
                 {{ else if gt $stats.NumFiles 1 }}

     

       0
        
       
     

       43
        
                   <span>{{ $stats.NumFiles }} files</span>

     

       44
        
                 {{ end }}

     

       45

···

       17
        
           {{ $containerstyle := "py-1" }}

     

       18
        
           {{ $linkstyle := "no-underline hover:underline" }}

     

       19
        
       

     

       20
       +
           <div class="pb-2 mb-3 text-base border-b border-gray-200 dark:border-gray-700">

     

       21
        
             <div class="flex flex-col md:flex-row md:justify-between gap-2">

     

       22
       +
               <div id="breadcrumbs" class="overflow-x-auto whitespace-nowrap text-gray-400 dark:text-gray-500">

     

       23
        
                 {{ range .BreadCrumbs }}

     

       24
       +
                   <a href="{{ index . 1}}" class="text-bold text-gray-500 dark:text-gray-400 {{ $linkstyle }}">{{ index . 0 }}</a> /

     

       25
        
                 {{ end }}

     

       26
        
               </div>

     

       27
        
               <div id="dir-info" class="text-gray-500 dark:text-gray-400 text-xs md:text-sm flex flex-wrap items-center gap-1 md:gap-0">

     

       28
        
                 {{ $stats := .TreeStats }}

     

       29
        
       

     

       30
        
                 <span>at <a href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref }}">{{ $.Ref }}</a></span>

     

       0
        
       
     

       31
        
                 {{ if eq $stats.NumFolders 1 }}

     

       0
        
       
     

       32
        
                   <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       33
       +
                   <span>{{ $stats.NumFolders }} folder</span>

     

       34
        
                 {{ else if gt $stats.NumFolders 1 }}

     

       0
        
       
     

       35
        
                   <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       36
       +
                   <span>{{ $stats.NumFolders }} folders</span>

     

       37
        
                 {{ end }}

     

       38
        
       

     

       39
        
                 {{ if eq $stats.NumFiles 1 }}

     

       40
       +
                   <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       41
        
                   <span>{{ $stats.NumFiles }} file</span>

     

       42
        
                 {{ else if gt $stats.NumFiles 1 }}

     

       43
       +
                   <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       44
        
                   <span>{{ $stats.NumFiles }} files</span>

     

       45
        
                 {{ end }}

     

       46

+17

appview/pages/templates/user/fragments/follow.html

···

       1
       +
       {{ define "user/fragments/follow" }}

     

       2
       +
         <button id="followBtn"

     

       3
       +
           class="btn mt-2 w-full"

     

       4
       +
       

     

       5
       +
           {{ if eq .FollowStatus.String "IsNotFollowing" }}

     

       6
       +
           hx-post="/follow?subject={{.UserDid}}"

     

       7
       +
           {{ else }}

     

       8
       +
           hx-delete="/follow?subject={{.UserDid}}"

     

       9
       +
           {{ end }}

     

       10
       +
       

     

       11
       +
           hx-trigger="click"

     

       12
       +
           hx-target="#followBtn"

     

       13
       +
           hx-swap="outerHTML"

     

       14
       +
           >

     

       15
       +
           {{ if eq .FollowStatus.String "IsNotFollowing" }}Follow{{ else }}Unfollow{{ end }}

     

       16
       +
         </button>

     

       17
       +
       {{ end }}

+194 -70

appview/pages/templates/user/profile.html

···

       9
        
               {{ block "ownRepos" . }}{{ end }}

     

       10
        
               {{ block "collaboratingRepos" . }}{{ end }}

     

       11
        
           </div>

     

       12
       -
           

     

       13
        
           <div class="md:col-span-2 order-3 md:order-3">

     

       14
        
               {{ block "profileTimeline" . }}{{ end }}

     

       15
        
           </div>

     

       16
        
       </div>

     

       17
        
       {{ end }}

     

       18
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
       -
       {{ define "profileTimeline" }}

     

       21
       -
           <div class="flex flex-col gap-3 relative">

     

       22
       -
               <p class="px-6 text-sm font-bold py-2 dark:text-white">ACTIVITY</p>

     

       23
       -
               {{ range .ProfileTimeline }}

     

       24
       -
                 {{ if eq .Type "issue" }}

     

       25
       -
                 <div class="px-6 py-2 bg-white dark:bg-gray-800 rounded drop-shadow-sm w-fit max-w-full flex items-center gap-2">

     

       26
       -
                     {{ $textColor := "text-gray-800 dark:text-gray-400" }}

     

       27
       -
                     {{ $icon := "ban" }}

     

       28
       -
                     {{ if .Issue.Open }}

     

       29
       -
                         {{ $textColor = "text-green-600 dark:text-green-500" }}

     

       30
       -
                         {{ $icon = "circle-dot" }}

     

       31
       -
                     {{ end }}

     

       32
       -
                   <div class="p-1 {{ $textColor }}">

     

       33
       -
                       {{ i $icon "w-5 h-5" }}

     

       34
        
                   </div>

     

       35
       -
                   <div>

     

       36
       -
                     <p class="text-gray-600 dark:text-gray-300">

     

       37
       -
                     <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .Issue.IssueId }}" class="no-underline hover:underline">{{ .Issue.Title }} <span class="text-gray-500 dark:text-gray-400">#{{ .Issue.IssueId }}</span></a>

     

       38
       -
                     on 

     

       39
       -
                     <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">{{ index $.DidHandleMap .Repo.Did }}<span class="select-none">/</span>{{ .Repo.Name }}</a>

     

       40
       -
                     <time class="text-gray-700 dark:text-gray-400 text-xs ml-2">{{ .Issue.Created | shortTimeFmt }}</time>

     

       41
       -
                     </p>

     

       42
        
                   </div>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       43
        
                 </div>

     

       44
       -
                 {{ else if eq .Type "pull" }}

     

       45
       -
                 <div class="px-6 py-2 bg-white dark:bg-gray-800 rounded drop-shadow-sm w-fit flex items-center gap-3">

     

       46
       -
                   {{ $textColor := "text-gray-800 dark:text-gray-400" }}

     

       47
       -
                   {{ $icon := "git-pull-request-closed" }}

     

       48
       -
                   {{ if .Pull.State.IsOpen }}

     

       49
       -
                       {{ $textColor = "text-green-600 dark:text-green-500" }}

     

       50
       -
                       {{ $icon = "git-pull-request" }}

     

       51
       -
                   {{ else if .Pull.State.IsMerged }}

     

       52
       -
                       {{ $textColor = "text-purple-600 dark:text-purple-500" }}

     

       53
       -
                       {{ $icon = "git-merge" }}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       54
        
                   {{ end }}

     

       55
       -
                   <div class="{{ $textColor }} p-1">

     

       56
       -
                       {{ i $icon "w-5 h-5" }}

     

       57
        
                   </div>

     

       58
       -
                   <div>

     

       59
       -
                     <p class="text-gray-600 dark:text-gray-300">

     

       60
       -
                     <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}/pulls/{{ .Pull.PullId }}" class="no-underline hover:underline">{{ .Pull.Title }} <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span></a>

     

       0
        
       
     

       61
        
                     on

     

       62
       -
                     <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">

     

       63
       -
                         {{ index $.DidHandleMap .Repo.Did }}<span class="select-none">/</span>{{ .Repo.Name }}</a>

     

       64
       -
                     <time class="text-gray-700 dark:text-gray-400 text-xs ml-2">{{ .Pull.Created | shortTimeFmt }}</time>

     

       65
       -
                     </p>

     

       66
        
                   </div>

     

       67
        
                 </div>

     

       68
       -
                 {{ else if eq .Type "repo" }}

     

       69
       -
                 <div class="px-6 py-2 bg-white dark:bg-gray-800 rounded drop-shadow-sm w-fit flex items-center gap-3">

     

       70
       -
                   {{ if .Source }}

     

       71
       -
                   <div class="text-gray-800 dark:text-gray-400 p-1">

     

       72
       -
                     {{ i "git-fork" "w-5 h-5" }}

     

       73
       -
                   </div>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
                   {{ else }}

     

       75
       -
                   <div class="text-gray-800 dark:text-gray-400 p-1">

     

       76
       -
                     {{ i "book-plus" "w-5 h-5" }}

     

       77
       -
                   </div>

     

       78
        
                   {{ end }}

     

       79
       -
                   <div>

     

       80
       -
                     <p class="text-gray-600 dark:text-gray-300">

     

       81
       -
       

     

       82
       -
                     {{ if .Source }}

     

       83
       -
                       forked

     

       84
       -
                       <a href="/{{ index $.DidHandleMap .Source.Did }}/{{ .Source.Name }}" class="no-underline hover:underline">

     

       85
       -
                         {{ index $.DidHandleMap .Source.Did }}/{{ .Source.Name }}

     

       86
       -
                       </a>

     

       87
       -
                       to

     

       88
       -
                       <a href="/{{ didOrHandle $.UserHandle $.UserDid }}/{{ .Repo.Name }}" class="no-underline hover:underline">{{ .Repo.Name }}</a>

     

       89
       -
                     {{ else }}

     

       90
       -
                       created

     

       91
       -
                       <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">{{ .Repo.Name }}</a>

     

       92
       -
                     {{ end }}

     

       93
       -
                     <time class="text-gray-700 dark:text-gray-400 text-xs ml-2">{{ .Repo.Created | shortTimeFmt }}</time>

     

       94
       -
                     </p>

     

       95
        
                   </div>

     

       96
        
                 </div>

     

       97
       -
                 {{ end }}

     

       98
       -
               {{ else }}

     

       99
       -
                   <p class="px-6 dark:text-white">This user does not have any activity yet.</p>

     

       100
        
               {{ end }}

     

       101
        
             </div>

     

       0
        
       
     

       0
        
       
     

       102
        
       {{ end }}

     

       103
        
       

     

       104
        
       {{ define "profileCard" }}

     
···

       123
        
               </div>

     

       124
        
       

     

       125
        
               {{ if ne .FollowStatus.String "IsSelf" }}

     

       126
       -
                   {{ template "fragments/follow" . }}

     

       127
        
               {{ end }}

     

       128
        
           </div>

     

       129
        
       {{ end }}

···

       9
        
               {{ block "ownRepos" . }}{{ end }}

     

       10
        
               {{ block "collaboratingRepos" . }}{{ end }}

     

       11
        
           </div>

     

       0
        
       
     

       12
        
           <div class="md:col-span-2 order-3 md:order-3">

     

       13
        
               {{ block "profileTimeline" . }}{{ end }}

     

       14
        
           </div>

     

       15
        
       </div>

     

       16
        
       {{ end }}

     

       17
        
       

     

       18
       +
       {{ define "profileTimeline" }}

     

       19
       +
         <p class="text-sm font-bold py-2 dark:text-white px-6">ACTIVITY</p>

     

       20
       +
         <div class="flex flex-col gap-6 relative">

     

       21
       +
           {{ with .ProfileTimeline }}

     

       22
       +
             {{ range $idx, $byMonth := .ByMonth }}

     

       23
       +
               {{ with $byMonth }}

     

       24
       +
               <div class="bg-white dark:bg-gray-800 px-6 py-4 rounded drop-shadow-sm">

     

       25
       +
                 {{ if eq $idx 0 }}

     

       26
       +
       

     

       27
       +
                 {{ else }}

     

       28
       +
                   {{ $s := "s" }}

     

       29
       +
                   {{ if eq $idx 1 }}

     

       30
       +
                     {{ $s = "" }}

     

       31
       +
                   {{ end }}

     

       32
       +
                   <p class="text-sm font-bold dark:text-white mb-2">{{$idx}} month{{$s}} ago</p>

     

       33
       +
                 {{ end }}

     

       34
        
       

     

       35
       +
                 {{ if .IsEmpty }}

     

       36
       +
                   <div class="text-gray-500 dark:text-gray-400">

     

       37
       +
                     No activity for this month

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
                   </div>

     

       39
       +
                 {{ else }}

     

       40
       +
                   <div class="flex flex-col gap-1">

     

       41
       +
                     {{ block "repoEvents"  (list .RepoEvents  $.DidHandleMap) }} {{ end }}

     

       42
       +
                     {{ block "issueEvents" (list .IssueEvents $.DidHandleMap) }} {{ end }}

     

       43
       +
                     {{ block "pullEvents"  (list .PullEvents  $.DidHandleMap) }} {{ end }}

     

       0
        
       
     

       0
        
       
     

       44
        
                   </div>

     

       45
       +
                 {{ end }}

     

       46
       +
               </div>

     

       47
       +
       

     

       48
       +
               {{ end }}

     

       49
       +
             {{ else }}

     

       50
       +
               <p class="dark:text-white">This user does not have any activity yet.</p>

     

       51
       +
             {{ end }}

     

       52
       +
           {{ end }}

     

       53
       +
         </div>

     

       54
       +
       {{ end }}

     

       55
       +
       

     

       56
       +
       {{ define "repoEvents" }}

     

       57
       +
         {{ $items := index . 0 }}

     

       58
       +
         {{ $handleMap := index . 1 }}

     

       59
       +
       

     

       60
       +
         {{ if gt (len $items) 0 }}

     

       61
       +
           <details>

     

       62
       +
             <summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

       63
       +
               <div class="flex flex-wrap items-center gap-2">

     

       64
       +
                 {{ i "book-plus" "w-4 h-4" }}

     

       65
       +
                 created {{ len $items }} {{if eq (len $items) 1 }}repository{{else}}repositories{{end}}

     

       66
       +
               </div>

     

       67
       +
             </summary>

     

       68
       +
             <div class="py-2 text-sm flex flex-col gap-3 mb-2">

     

       69
       +
               {{ range $items }}

     

       70
       +
                 <div class="flex flex-wrap items-center gap-2">

     

       71
       +
                   <span class="text-gray-500 dark:text-gray-400">

     

       72
       +
                     {{ if .Source }}

     

       73
       +
                       {{ i "git-fork" "w-4 h-4" }}

     

       74
       +
                     {{ else }}

     

       75
       +
                       {{ i "book-plus" "w-4 h-4" }}

     

       76
       +
                     {{ end }}

     

       77
       +
                   </span>

     

       78
       +
                   <a href="/{{ index $handleMap .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">

     

       79
       +
                     {{- .Repo.Name -}}

     

       80
       +
                   </a>

     

       81
        
                 </div>

     

       82
       +
               {{ end }}

     

       83
       +
             </div>

     

       84
       +
           </details>

     

       85
       +
         {{ end }}

     

       86
       +
       {{ end }}

     

       87
       +
       

     

       88
       +
       {{ define "issueEvents" }}

     

       89
       +
         {{ $i := index . 0 }}

     

       90
       +
         {{ $items := $i.Items }}

     

       91
       +
         {{ $stats := $i.Stats }}

     

       92
       +
         {{ $handleMap := index . 1 }}

     

       93
       +
       

     

       94
       +
         {{ if gt (len $items) 0 }}

     

       95
       +
           <details>

     

       96
       +
             <summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

       97
       +
               <div class="flex flex-wrap items-center gap-2">

     

       98
       +
                 {{ i "circle-dot" "w-4 h-4" }}

     

       99
       +
       

     

       100
       +
                 <div>

     

       101
       +
                   created {{ len $items }} {{if eq (len $items) 1 }}issue{{else}}issues{{end}} 

     

       102
       +
                 </div>

     

       103
       +
       

     

       104
       +
                 {{ if gt $stats.Open 0 }}

     

       105
       +
                   <span class="px-2 py-1/2 text-sm rounded text-white bg-green-600 dark:bg-green-700">

     

       106
       +
                     {{$stats.Open}} open

     

       107
       +
                   </span>

     

       108
       +
                 {{ end }}

     

       109
       +
       

     

       110
       +
                 {{ if gt $stats.Closed 0 }}

     

       111
       +
                 <span class="px-2 py-1/2 text-sm rounded text-white bg-gray-800 dark:bg-gray-700">

     

       112
       +
                   {{$stats.Closed}} closed

     

       113
       +
                 </span>

     

       114
       +
                 {{ end }}

     

       115
       +
       

     

       116
       +
               </div>

     

       117
       +
             </summary>

     

       118
       +
             <div class="py-2 text-sm flex flex-col gap-3 mb-2">

     

       119
       +
               {{ range $items }}

     

       120
       +
                 {{ $repoOwner := index $handleMap .Metadata.Repo.Did }}

     

       121
       +
                 {{ $repoName := .Metadata.Repo.Name }}

     

       122
       +
                 {{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}

     

       123
       +
       

     

       124
       +
                 <div class="flex gap-2 text-gray-600 dark:text-gray-300">

     

       125
       +
                   {{ if .Open }}

     

       126
       +
                     <span class="text-green-600 dark:text-green-500">

     

       127
       +
                       {{ i "circle-dot" "w-4 h-4" }}

     

       128
       +
                     </span>

     

       129
       +
                   {{ else }}

     

       130
       +
                     <span class="text-gray-500 dark:text-gray-400">

     

       131
       +
                       {{ i "ban" "w-4 h-4" }}

     

       132
       +
                     </span>

     

       133
        
                   {{ end }}

     

       134
       +
                   <div class="flex-none min-w-8 text-right">

     

       135
       +
                     <span class="text-gray-500 dark:text-gray-400">#{{ .IssueId }}</span>

     

       136
        
                   </div>

     

       137
       +
                   <div class="break-words max-w-full">

     

       138
       +
                     <a href="/{{$repoUrl}}/issues/{{ .IssueId }}" class="no-underline hover:underline">

     

       139
       +
                       {{ .Title -}}

     

       140
       +
                     </a>

     

       141
        
                     on

     

       142
       +
                     <a href="/{{$repoUrl}}" class="no-underline hover:underline whitespace-nowrap">

     

       143
       +
                       {{$repoUrl}}

     

       144
       +
                     </a>

     

       0
        
       
     

       145
        
                   </div>

     

       146
        
                 </div>

     

       147
       +
               {{ end }}

     

       148
       +
             </div>

     

       149
       +
           </details>

     

       150
       +
         {{ end }}

     

       151
       +
       {{ end }}

     

       152
       +
       

     

       153
       +
       {{ define "pullEvents" }}

     

       154
       +
         {{ $i := index . 0 }}

     

       155
       +
         {{ $items := $i.Items }}

     

       156
       +
         {{ $stats := $i.Stats }}

     

       157
       +
         {{ $handleMap := index . 1 }}

     

       158
       +
         {{ if gt (len $items) 0 }}

     

       159
       +
           <details>

     

       160
       +
             <summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

       161
       +
               <div class="flex flex-wrap items-center gap-2">

     

       162
       +
                 {{ i "git-pull-request" "w-4 h-4" }}

     

       163
       +
       

     

       164
       +
                 <div>

     

       165
       +
                   created {{ len $items }} {{if eq (len $items) 1 }}pull request{{else}}pull requests{{end}} 

     

       166
       +
                 </div>

     

       167
       +
       

     

       168
       +
                 {{ if gt $stats.Open 0 }}

     

       169
       +
                   <span class="px-2 py-1/2 text-sm rounded text-white bg-green-600 dark:bg-green-700">

     

       170
       +
                     {{$stats.Open}} open

     

       171
       +
                   </span>

     

       172
       +
                 {{ end }}

     

       173
       +
       

     

       174
       +
                 {{ if gt $stats.Merged 0 }}

     

       175
       +
                   <span class="px-2 py-1/2 text-sm rounded text-white bg-purple-600 dark:bg-purple-700">

     

       176
       +
                     {{$stats.Merged}} merged

     

       177
       +
                   </span>

     

       178
       +
                 {{ end }}

     

       179
       +
       

     

       180
       +
       

     

       181
       +
                 {{ if gt $stats.Closed 0 }}

     

       182
       +
                 <span class="px-2 py-1/2 text-sm rounded text-black dark:text-white bg-gray-50 dark:bg-gray-700 ">

     

       183
       +
                   {{$stats.Closed}} closed

     

       184
       +
                 </span>

     

       185
       +
                 {{ end }}

     

       186
       +
       

     

       187
       +
               </div>

     

       188
       +
             </summary>

     

       189
       +
             <div class="py-2 text-sm flex flex-col gap-3 mb-2">

     

       190
       +
               {{ range $items }}

     

       191
       +
                 {{ $repoOwner := index $handleMap .Repo.Did }}

     

       192
       +
                 {{ $repoName := .Repo.Name }}

     

       193
       +
                 {{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}

     

       194
       +
       

     

       195
       +
                 <div class="flex gap-2 text-gray-600 dark:text-gray-300">

     

       196
       +
                   {{ if .State.IsOpen }}

     

       197
       +
                     <span class="text-green-600 dark:text-green-500">

     

       198
       +
                       {{ i "git-pull-request" "w-4 h-4" }}

     

       199
       +
                     </span>

     

       200
       +
                   {{ else if .State.IsMerged }}

     

       201
       +
                     <span class="text-purple-600 dark:text-purple-500">

     

       202
       +
                       {{ i "git-merge" "w-4 h-4" }}

     

       203
       +
                     </span>

     

       204
        
                   {{ else }}

     

       205
       +
                     <span class="text-gray-600 dark:text-gray-300">

     

       206
       +
                       {{ i "git-pull-request-closed" "w-4 h-4" }}

     

       207
       +
                     </span>

     

       208
        
                   {{ end }}

     

       209
       +
                   <div class="flex-none min-w-8 text-right">

     

       210
       +
                     <span class="text-gray-500 dark:text-gray-400">#{{ .PullId }}</span>

     

       211
       +
                   </div>

     

       212
       +
                   <div class="break-words max-w-full">

     

       213
       +
                     <a href="/{{$repoUrl}}/pulls/{{ .PullId }}" class="no-underline hover:underline">

     

       214
       +
                       {{ .Title -}}

     

       215
       +
                     </a>

     

       216
       +
                     on

     

       217
       +
                     <a href="/{{$repoUrl}}" class="no-underline hover:underline whitespace-nowrap">

     

       218
       +
                       {{$repoUrl}}

     

       219
       +
                     </a>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       220
        
                   </div>

     

       221
        
                 </div>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       222
        
               {{ end }}

     

       223
        
             </div>

     

       224
       +
           </details>

     

       225
       +
         {{ end }}

     

       226
        
       {{ end }}

     

       227
        
       

     

       228
        
       {{ define "profileCard" }}

     
···

       247
        
               </div>

     

       248
        
       

     

       249
        
               {{ if ne .FollowStatus.String "IsSelf" }}

     

       250
       +
                   {{ template "user/fragments/follow" . }}

     

       251
        
               {{ end }}

     

       252
        
           </div>

     

       253
        
       {{ end }}

+11 -5

appview/state/profile.go

···

       43
        
       	for _, r := range collaboratingRepos {

     

       44
        
       		didsToResolve = append(didsToResolve, r.Did)

     

       45
        
       	}

     

       46
       -
       	for _, evt := range timeline {

     

       47
       -
       		if evt.Repo != nil {

     

       48
       -
       			if evt.Repo.Source != "" {

     

       49
       -
       				didsToResolve = append(didsToResolve, evt.Source.Did)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
       			}

     

       51
        
       		}

     

       52
       -
       		didsToResolve = append(didsToResolve, evt.Repo.Did)

     

       53
        
       	}

     

       54
        
       

     

       55
        
       	resolvedIds := s.resolver.ResolveIdents(r.Context(), didsToResolve)

···

       43
        
       	for _, r := range collaboratingRepos {

     

       44
        
       		didsToResolve = append(didsToResolve, r.Did)

     

       45
        
       	}

     

       46
       +
       	for _, byMonth := range timeline.ByMonth {

     

       47
       +
       		for _, pe := range byMonth.PullEvents.Items {

     

       48
       +
       			didsToResolve = append(didsToResolve, pe.Repo.Did)

     

       49
       +
       		}

     

       50
       +
       		for _, ie := range byMonth.IssueEvents.Items {

     

       51
       +
       			didsToResolve = append(didsToResolve, ie.Metadata.Repo.Did)

     

       52
       +
       		}

     

       53
       +
       		for _, re := range byMonth.RepoEvents {

     

       54
       +
       			didsToResolve = append(didsToResolve, re.Repo.Did)

     

       55
       +
       			if re.Source != nil {

     

       56
       +
       				didsToResolve = append(didsToResolve, re.Source.Did)

     

       57
        
       			}

     

       58
        
       		}

     

       0
        
       
     

       59
        
       	}

     

       60
        
       

     

       61
        
       	resolvedIds := s.resolver.ResolveIdents(r.Context(), didsToResolve)

+348 -195

appview/state/pull.go

···

       116
        
       

     

       117
        
       	mergeCheckResponse := s.mergeCheck(f, pull)

     

       118
        
       	resubmitResult := pages.Unknown

     

       119
       -
       	if user.Did == pull.OwnerDid {

     

       120
        
       		resubmitResult = s.resubmitCheck(f, pull)

     

       121
        
       	}

     

       122
        
       

     
···

       369
        
       				pullSourceRepo, err = db.GetRepoByAtUri(s.db, p.PullSource.RepoAt.String())

     

       370
        
       				if err != nil {

     

       371
        
       					log.Printf("failed to get repo by at uri: %v", err)

     

       372
       -
       					return

     

       0
        
       
     

       0
        
       
     

       373
        
       				}

     

       374
        
       			}

     

       375
       -
       			p.PullSource.Repo = pullSourceRepo

     

       376
        
       		}

     

       377
        
       	}

     

       378
        
       

     
···

       634
        
       		return

     

       635
        
       	}

     

       636
        
       

     

       637
       -
       	resp, err := ksClient.Compare(f.OwnerDid(), f.RepoName, targetBranch, sourceBranch)

     

       638
       -
       	switch resp.StatusCode {

     

       639
       -
       	case 404:

     

       640
       -
       	case 400:

     

       641
       -
       		s.pages.Notice(w, "pull", "Branch based pull requests are not supported on this knot.")

     

       642
       -
       		return

     

       643
       -
       	}

     

       644
       -
       

     

       645
       -
       	respBody, err := io.ReadAll(resp.Body)

     

       646
       -
       	if err != nil {

     

       647
       -
       		log.Println("failed to compare across branches")

     

       648
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       649
       -
       		return

     

       650
       -
       	}

     

       651
       -
       	defer resp.Body.Close()

     

       652
       -
       

     

       653
       -
       	var diffTreeResponse types.RepoDiffTreeResponse

     

       654
       -
       	err = json.Unmarshal(respBody, &diffTreeResponse)

     

       655
        
       	if err != nil {

     

       656
       -
       		log.Println("failed to unmarshal diff tree response", err)

     

       657
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       658
        
       		return

     

       659
        
       	}

     

       660
        
       

     
···

       730
        
       	// hiddenRef: hidden/feature-1/main (on repo-fork)

     

       731
        
       	// targetBranch: main (on repo-1)

     

       732
        
       	// sourceBranch: feature-1 (on repo-fork)

     

       733
       -
       	diffResp, err := us.Compare(user.Did, fork.Name, hiddenRef, sourceBranch)

     

       734
        
       	if err != nil {

     

       735
        
       		log.Println("failed to compare across branches", err)

     

       736
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       737
       -
       		return

     

       738
       -
       	}

     

       739
       -
       

     

       740
       -
       	respBody, err := io.ReadAll(diffResp.Body)

     

       741
       -
       	if err != nil {

     

       742
       -
       		log.Println("failed to read response body", err)

     

       743
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       744
       -
       		return

     

       745
       -
       	}

     

       746
       -
       

     

       747
       -
       	defer resp.Body.Close()

     

       748
       -
       

     

       749
       -
       	var diffTreeResponse types.RepoDiffTreeResponse

     

       750
       -
       	err = json.Unmarshal(respBody, &diffTreeResponse)

     

       751
       -
       	if err != nil {

     

       752
       -
       		log.Println("failed to unmarshal diff tree response", err)

     

       753
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       754
        
       		return

     

       755
        
       	}

     

       756
        
       

     
···

       1015
        
       		})

     

       1016
        
       		return

     

       1017
        
       	case http.MethodPost:

     

       1018
       -
       		patch := r.FormValue("patch")

     

       1019
       -
       		var sourceRev string

     

       1020
       -
       		var recordPullSource *tangled.RepoPull_Source

     

       1021
       -
       

     

       1022
       -
       		var ownerDid, repoName, knotName string

     

       1023
       -
       		var isSameRepo bool = pull.IsSameRepoBranch()

     

       1024
       -
       		sourceBranch := pull.PullSource.Branch

     

       1025
       -
       		targetBranch := pull.TargetBranch

     

       1026
       -
       		recordPullSource = &tangled.RepoPull_Source{

     

       1027
       -
       			Branch: sourceBranch,

     

       1028
        
       		}

     

       0
        
       
     

       0
        
       
     

       1029
        
       

     

       1030
       -
       		isPushAllowed := f.RepoInfo(s, user).Roles.IsPushAllowed()

     

       1031
       -
       		if isSameRepo && isPushAllowed {

     

       1032
       -
       			ownerDid = f.OwnerDid()

     

       1033
       -
       			repoName = f.RepoName

     

       1034
       -
       			knotName = f.Knot

     

       1035
       -
       		} else if !isSameRepo {

     

       1036
       -
       			sourceRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())

     

       1037
       -
       			if err != nil {

     

       1038
       -
       				log.Println("failed to get source repo", err)

     

       1039
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1040
       -
       				return

     

       1041
       -
       			}

     

       1042
       -
       			ownerDid = sourceRepo.Did

     

       1043
       -
       			repoName = sourceRepo.Name

     

       1044
       -
       			knotName = sourceRepo.Knot

     

       1045
       -
       		}

     

       1046
        
       

     

       1047
       -
       		if sourceBranch != "" && knotName != "" {

     

       1048
       -
       			// extract patch by performing compare

     

       1049
       -
       			ksClient, err := NewUnsignedClient(knotName, s.config.Dev)

     

       1050
       -
       			if err != nil {

     

       1051
       -
       				log.Printf("failed to create client for %s: %s", knotName, err)

     

       1052
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1053
       -
       				return

     

       1054
       -
       			}

     

       1055
        
       

     

       1056
       -
       			if !isSameRepo {

     

       1057
       -
       				secret, err := db.GetRegistrationKey(s.db, knotName)

     

       1058
       -
       				if err != nil {

     

       1059
       -
       					log.Printf("failed to get registration key for %s: %s", knotName, err)

     

       1060
       -
       					s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1061
       -
       					return

     

       1062
       -
       				}

     

       1063
       -
       				// update the hidden tracking branch to latest

     

       1064
       -
       				signedClient, err := NewSignedClient(knotName, secret, s.config.Dev)

     

       1065
       -
       				if err != nil {

     

       1066
       -
       					log.Printf("failed to create signed client for %s: %s", knotName, err)

     

       1067
       -
       					s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1068
       -
       					return

     

       1069
       -
       				}

     

       1070
       -
       				resp, err := signedClient.NewHiddenRef(ownerDid, repoName, sourceBranch, targetBranch)

     

       1071
       -
       				if err != nil || resp.StatusCode != http.StatusNoContent {

     

       1072
       -
       					log.Printf("failed to update tracking branch: %s", err)

     

       1073
       -
       					s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1074
       -
       					return

     

       1075
       -
       				}

     

       1076
       -
       			}

     

       1077
        
       

     

       1078
       -
       			var compareResp *http.Response

     

       1079
       -
       			if !isSameRepo {

     

       1080
       -
       				hiddenRef := url.QueryEscape(fmt.Sprintf("hidden/%s/%s", sourceBranch, targetBranch))

     

       1081
       -
       				compareResp, err = ksClient.Compare(ownerDid, repoName, hiddenRef, sourceBranch)

     

       1082
       -
       			} else {

     

       1083
       -
       				compareResp, err = ksClient.Compare(ownerDid, repoName, targetBranch, sourceBranch)

     

       1084
       -
       			}

     

       1085
       -
       			if err != nil {

     

       1086
       -
       				log.Printf("failed to compare branches: %s", err)

     

       1087
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1088
       -
       				return

     

       1089
       -
       			}

     

       1090
       -
       			defer compareResp.Body.Close()

     

       1091
        
       

     

       1092
       -
       			switch compareResp.StatusCode {

     

       1093
       -
       			case 404:

     

       1094
       -
       			case 400:

     

       1095
       -
       				s.pages.Notice(w, "pull", "Branch based pull requests are not supported on this knot.")

     

       1096
       -
       				return

     

       1097
       -
       			}

     

       1098
        
       

     

       1099
       -
       			respBody, err := io.ReadAll(compareResp.Body)

     

       1100
       -
       			if err != nil {

     

       1101
       -
       				log.Println("failed to compare across branches")

     

       1102
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1103
       -
       				return

     

       1104
       -
       			}

     

       1105
       -
       			defer compareResp.Body.Close()

     

       1106
        
       

     

       1107
       -
       			var diffTreeResponse types.RepoDiffTreeResponse

     

       1108
       -
       			err = json.Unmarshal(respBody, &diffTreeResponse)

     

       1109
       -
       			if err != nil {

     

       1110
       -
       				log.Println("failed to unmarshal diff tree response", err)

     

       1111
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1112
       -
       				return

     

       1113
       -
       			}

     

       1114
        
       

     

       1115
       -
       			sourceRev = diffTreeResponse.DiffTree.Rev2

     

       1116
       -
       			patch = diffTreeResponse.DiffTree.Patch

     

       1117
       -
       		}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1118
        
       

     

       1119
       -
       		if patch == "" {

     

       1120
       -
       			s.pages.Notice(w, "resubmit-error", "Patch is empty.")

     

       1121
       -
       			return

     

       1122
       -
       		}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1123
        
       

     

       1124
       -
       		if patch == pull.LatestPatch() {

     

       1125
       -
       			s.pages.Notice(w, "resubmit-error", "Patch is identical to previous submission.")

     

       1126
       -
       			return

     

       1127
       -
       		}

     

       1128
        
       

     

       1129
       -
       		if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev {

     

       1130
       -
       			s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")

     

       1131
       -
       			return

     

       1132
       -
       		}

     

       1133
        
       

     

       1134
       -
       		if !isPatchValid(patch) {

     

       1135
       -
       			s.pages.Notice(w, "resubmit-error", "Invalid patch format. Please provide a valid diff.")

     

       1136
       -
       			return

     

       1137
       -
       		}

     

       1138
        
       

     

       1139
       -
       		tx, err := s.db.BeginTx(r.Context(), nil)

     

       1140
       -
       		if err != nil {

     

       1141
       -
       			log.Println("failed to start tx")

     

       1142
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1143
       -
       			return

     

       1144
       -
       		}

     

       1145
       -
       		defer tx.Rollback()

     

       1146
        
       

     

       1147
       -
       		err = db.ResubmitPull(tx, pull, patch, sourceRev)

     

       1148
       -
       		if err != nil {

     

       1149
       -
       			log.Println("failed to create pull request", err)

     

       1150
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1151
       -
       			return

     

       1152
       -
       		}

     

       1153
       -
       		client, _ := s.auth.AuthorizedClient(r)

     

       1154
        
       

     

       1155
       -
       		ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)

     

       1156
       -
       		if err != nil {

     

       1157
       -
       			// failed to get record

     

       1158
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")

     

       1159
       -
       			return

     

       1160
       -
       		}

     

       1161
        
       

     

       1162
       -
       		_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       1163
       -
       			Collection: tangled.RepoPullNSID,

     

       1164
       -
       			Repo:       user.Did,

     

       1165
       -
       			Rkey:       pull.Rkey,

     

       1166
       -
       			SwapRecord: ex.Cid,

     

       1167
       -
       			Record: &lexutil.LexiconTypeDecoder{

     

       1168
       -
       				Val: &tangled.RepoPull{

     

       1169
       -
       					Title:        pull.Title,

     

       1170
       -
       					PullId:       int64(pull.PullId),

     

       1171
       -
       					TargetRepo:   string(f.RepoAt),

     

       1172
       -
       					TargetBranch: pull.TargetBranch,

     

       1173
       -
       					Patch:        patch, // new patch

     

       1174
       -
       					Source:       recordPullSource,

     

       1175
       -
       				},

     

       0
        
       
     

       0
        
       
     

       1176
        
       			},

     

       1177
       -
       		})

     

       1178
       -
       		if err != nil {

     

       1179
       -
       			log.Println("failed to update record", err)

     

       1180
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")

     

       1181
       -
       			return

     

       1182
       -
       		}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1183
        
       

     

       1184
       -
       		if err = tx.Commit(); err != nil {

     

       1185
       -
       			log.Println("failed to commit transaction", err)

     

       1186
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")

     

       1187
       -
       			return

     

       1188
       -
       		}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1189
        
       

     

       1190
       -
       		s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       0
        
       
     

       0
        
       
     

       1191
        
       		return

     

       1192
        
       	}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1193
        
       }

     

       1194
        
       

     

       1195
        
       func (s *State) MergePull(w http.ResponseWriter, r *http.Request) {

···

       116
        
       

     

       117
        
       	mergeCheckResponse := s.mergeCheck(f, pull)

     

       118
        
       	resubmitResult := pages.Unknown

     

       119
       +
       	if user != nil && user.Did == pull.OwnerDid {

     

       120
        
       		resubmitResult = s.resubmitCheck(f, pull)

     

       121
        
       	}

     

       122
        
       

     
···

       369
        
       				pullSourceRepo, err = db.GetRepoByAtUri(s.db, p.PullSource.RepoAt.String())

     

       370
        
       				if err != nil {

     

       371
        
       					log.Printf("failed to get repo by at uri: %v", err)

     

       372
       +
       					continue

     

       373
       +
       				} else {

     

       374
       +
       					p.PullSource.Repo = pullSourceRepo

     

       375
        
       				}

     

       376
        
       			}

     

       0
        
       
     

       377
        
       		}

     

       378
        
       	}

     

       379
        
       

     
···

       635
        
       		return

     

       636
        
       	}

     

       637
        
       

     

       638
       +
       	diffTreeResponse, err := ksClient.Compare(f.OwnerDid(), f.RepoName, targetBranch, sourceBranch)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       639
        
       	if err != nil {

     

       640
       +
       		log.Println("failed to compare", err)

     

       641
       +
       		s.pages.Notice(w, "pull", err.Error())

     

       642
        
       		return

     

       643
        
       	}

     

       644
        
       

     
···

       714
        
       	// hiddenRef: hidden/feature-1/main (on repo-fork)

     

       715
        
       	// targetBranch: main (on repo-1)

     

       716
        
       	// sourceBranch: feature-1 (on repo-fork)

     

       717
       +
       	diffTreeResponse, err := us.Compare(user.Did, fork.Name, hiddenRef, sourceBranch)

     

       718
        
       	if err != nil {

     

       719
        
       		log.Println("failed to compare across branches", err)

     

       720
       +
       		s.pages.Notice(w, "pull", err.Error())

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       721
        
       		return

     

       722
        
       	}

     

       723
        
       

     
···

       982
        
       		})

     

       983
        
       		return

     

       984
        
       	case http.MethodPost:

     

       985
       +
       		if pull.IsPatchBased() {

     

       986
       +
       			s.resubmitPatch(w, r)

     

       987
       +
       			return

     

       988
       +
       		} else if pull.IsBranchBased() {

     

       989
       +
       			s.resubmitBranch(w, r)

     

       990
       +
       			return

     

       991
       +
       		} else if pull.IsForkBased() {

     

       992
       +
       			s.resubmitFork(w, r)

     

       993
       +
       			return

     

       0
        
       
     

       994
        
       		}

     

       995
       +
       	}

     

       996
       +
       }

     

       997
        
       

     

       998
       +
       func (s *State) resubmitPatch(w http.ResponseWriter, r *http.Request) {

     

       999
       +
       	user := s.auth.GetUser(r)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1000
        
       

     

       1001
       +
       	pull, ok := r.Context().Value("pull").(*db.Pull)

     

       1002
       +
       	if !ok {

     

       1003
       +
       		log.Println("failed to get pull")

     

       1004
       +
       		s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")

     

       1005
       +
       		return

     

       1006
       +
       	}

     

       0
        
       
     

       0
        
       
     

       1007
        
       

     

       1008
       +
       	f, err := fullyResolvedRepo(r)

     

       1009
       +
       	if err != nil {

     

       1010
       +
       		log.Println("failed to get repo and knot", err)

     

       1011
       +
       		return

     

       1012
       +
       	}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1013
        
       

     

       1014
       +
       	if user.Did != pull.OwnerDid {

     

       1015
       +
       		log.Println("unauthorized user")

     

       1016
       +
       		w.WriteHeader(http.StatusUnauthorized)

     

       1017
       +
       		return

     

       1018
       +
       	}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1019
        
       

     

       1020
       +
       	patch := r.FormValue("patch")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1021
        
       

     

       1022
       +
       	if err = validateResubmittedPatch(pull, patch); err != nil {

     

       1023
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1024
       +
       	}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1025
        
       

     

       1026
       +
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       1027
       +
       	if err != nil {

     

       1028
       +
       		log.Println("failed to start tx")

     

       1029
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1030
       +
       		return

     

       1031
       +
       	}

     

       1032
       +
       	defer tx.Rollback()

     

       1033
        
       

     

       1034
       +
       	err = db.ResubmitPull(tx, pull, patch, "")

     

       1035
       +
       	if err != nil {

     

       1036
       +
       		log.Println("failed to resubmit pull request", err)

     

       1037
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull request. Try again later.")

     

       1038
       +
       		return

     

       1039
       +
       	}

     

       1040
       +
       	client, _ := s.auth.AuthorizedClient(r)

     

       1041
       +
       

     

       1042
       +
       	ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)

     

       1043
       +
       	if err != nil {

     

       1044
       +
       		// failed to get record

     

       1045
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")

     

       1046
       +
       		return

     

       1047
       +
       	}

     

       1048
        
       

     

       1049
       +
       	_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       1050
       +
       		Collection: tangled.RepoPullNSID,

     

       1051
       +
       		Repo:       user.Did,

     

       1052
       +
       		Rkey:       pull.Rkey,

     

       1053
       +
       		SwapRecord: ex.Cid,

     

       1054
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       1055
       +
       			Val: &tangled.RepoPull{

     

       1056
       +
       				Title:        pull.Title,

     

       1057
       +
       				PullId:       int64(pull.PullId),

     

       1058
       +
       				TargetRepo:   string(f.RepoAt),

     

       1059
       +
       				TargetBranch: pull.TargetBranch,

     

       1060
       +
       				Patch:        patch, // new patch

     

       1061
       +
       			},

     

       1062
       +
       		},

     

       1063
       +
       	})

     

       1064
       +
       	if err != nil {

     

       1065
       +
       		log.Println("failed to update record", err)

     

       1066
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")

     

       1067
       +
       		return

     

       1068
       +
       	}

     

       1069
       +
       

     

       1070
       +
       	if err = tx.Commit(); err != nil {

     

       1071
       +
       		log.Println("failed to commit transaction", err)

     

       1072
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")

     

       1073
       +
       		return

     

       1074
       +
       	}

     

       1075
       +
       

     

       1076
       +
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       1077
       +
       	return

     

       1078
       +
       }

     

       1079
       +
       

     

       1080
       +
       func (s *State) resubmitBranch(w http.ResponseWriter, r *http.Request) {

     

       1081
       +
       	user := s.auth.GetUser(r)

     

       1082
       +
       

     

       1083
       +
       	pull, ok := r.Context().Value("pull").(*db.Pull)

     

       1084
       +
       	if !ok {

     

       1085
       +
       		log.Println("failed to get pull")

     

       1086
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.")

     

       1087
       +
       		return

     

       1088
       +
       	}

     

       1089
       +
       

     

       1090
       +
       	f, err := fullyResolvedRepo(r)

     

       1091
       +
       	if err != nil {

     

       1092
       +
       		log.Println("failed to get repo and knot", err)

     

       1093
       +
       		return

     

       1094
       +
       	}

     

       1095
       +
       

     

       1096
       +
       	if user.Did != pull.OwnerDid {

     

       1097
       +
       		log.Println("unauthorized user")

     

       1098
       +
       		w.WriteHeader(http.StatusUnauthorized)

     

       1099
       +
       		return

     

       1100
       +
       	}

     

       1101
       +
       

     

       1102
       +
       	if !f.RepoInfo(s, user).Roles.IsPushAllowed() {

     

       1103
       +
       		log.Println("unauthorized user")

     

       1104
       +
       		w.WriteHeader(http.StatusUnauthorized)

     

       1105
       +
       		return

     

       1106
       +
       	}

     

       1107
       +
       

     

       1108
       +
       	ksClient, err := NewUnsignedClient(f.Knot, s.config.Dev)

     

       1109
       +
       	if err != nil {

     

       1110
       +
       		log.Printf("failed to create client for %s: %s", f.Knot, err)

     

       1111
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1112
       +
       		return

     

       1113
       +
       	}

     

       1114
       +
       

     

       1115
       +
       	diffTreeResponse, err := ksClient.Compare(f.OwnerDid(), f.RepoName, pull.TargetBranch, pull.PullSource.Branch)

     

       1116
       +
       	if err != nil {

     

       1117
       +
       		log.Printf("compare request failed: %s", err)

     

       1118
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1119
       +
       		return

     

       1120
       +
       	}

     

       1121
        
       

     

       1122
       +
       	sourceRev := diffTreeResponse.DiffTree.Rev2

     

       1123
       +
       	patch := diffTreeResponse.DiffTree.Patch

     

       0
        
       
     

       0
        
       
     

       1124
        
       

     

       1125
       +
       	if err = validateResubmittedPatch(pull, patch); err != nil {

     

       1126
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1127
       +
       	}

     

       0
        
       
     

       1128
        
       

     

       1129
       +
       	if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev {

     

       1130
       +
       		s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")

     

       1131
       +
       		return

     

       1132
       +
       	}

     

       1133
        
       

     

       1134
       +
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       1135
       +
       	if err != nil {

     

       1136
       +
       		log.Println("failed to start tx")

     

       1137
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1138
       +
       		return

     

       1139
       +
       	}

     

       1140
       +
       	defer tx.Rollback()

     

       1141
        
       

     

       1142
       +
       	err = db.ResubmitPull(tx, pull, patch, sourceRev)

     

       1143
       +
       	if err != nil {

     

       1144
       +
       		log.Println("failed to create pull request", err)

     

       1145
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1146
       +
       		return

     

       1147
       +
       	}

     

       1148
       +
       	client, _ := s.auth.AuthorizedClient(r)

     

       1149
        
       

     

       1150
       +
       	ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)

     

       1151
       +
       	if err != nil {

     

       1152
       +
       		// failed to get record

     

       1153
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")

     

       1154
       +
       		return

     

       1155
       +
       	}

     

       1156
        
       

     

       1157
       +
       	recordPullSource := &tangled.RepoPull_Source{

     

       1158
       +
       		Branch: pull.PullSource.Branch,

     

       1159
       +
       	}

     

       1160
       +
       	_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       1161
       +
       		Collection: tangled.RepoPullNSID,

     

       1162
       +
       		Repo:       user.Did,

     

       1163
       +
       		Rkey:       pull.Rkey,

     

       1164
       +
       		SwapRecord: ex.Cid,

     

       1165
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       1166
       +
       			Val: &tangled.RepoPull{

     

       1167
       +
       				Title:        pull.Title,

     

       1168
       +
       				PullId:       int64(pull.PullId),

     

       1169
       +
       				TargetRepo:   string(f.RepoAt),

     

       1170
       +
       				TargetBranch: pull.TargetBranch,

     

       1171
       +
       				Patch:        patch, // new patch

     

       1172
       +
       				Source:       recordPullSource,

     

       1173
        
       			},

     

       1174
       +
       		},

     

       1175
       +
       	})

     

       1176
       +
       	if err != nil {

     

       1177
       +
       		log.Println("failed to update record", err)

     

       1178
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")

     

       1179
       +
       		return

     

       1180
       +
       	}

     

       1181
       +
       

     

       1182
       +
       	if err = tx.Commit(); err != nil {

     

       1183
       +
       		log.Println("failed to commit transaction", err)

     

       1184
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")

     

       1185
       +
       		return

     

       1186
       +
       	}

     

       1187
       +
       

     

       1188
       +
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       1189
       +
       	return

     

       1190
       +
       }

     

       1191
       +
       

     

       1192
       +
       func (s *State) resubmitFork(w http.ResponseWriter, r *http.Request) {

     

       1193
       +
       	user := s.auth.GetUser(r)

     

       1194
       +
       

     

       1195
       +
       	pull, ok := r.Context().Value("pull").(*db.Pull)

     

       1196
       +
       	if !ok {

     

       1197
       +
       		log.Println("failed to get pull")

     

       1198
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.")

     

       1199
       +
       		return

     

       1200
       +
       	}

     

       1201
       +
       

     

       1202
       +
       	f, err := fullyResolvedRepo(r)

     

       1203
       +
       	if err != nil {

     

       1204
       +
       		log.Println("failed to get repo and knot", err)

     

       1205
       +
       		return

     

       1206
       +
       	}

     

       1207
       +
       

     

       1208
       +
       	if user.Did != pull.OwnerDid {

     

       1209
       +
       		log.Println("unauthorized user")

     

       1210
       +
       		w.WriteHeader(http.StatusUnauthorized)

     

       1211
       +
       		return

     

       1212
       +
       	}

     

       1213
       +
       

     

       1214
       +
       	forkRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())

     

       1215
       +
       	if err != nil {

     

       1216
       +
       		log.Println("failed to get source repo", err)

     

       1217
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1218
       +
       		return

     

       1219
       +
       	}

     

       1220
       +
       

     

       1221
       +
       	// extract patch by performing compare

     

       1222
       +
       	ksClient, err := NewUnsignedClient(forkRepo.Knot, s.config.Dev)

     

       1223
       +
       	if err != nil {

     

       1224
       +
       		log.Printf("failed to create client for %s: %s", forkRepo.Knot, err)

     

       1225
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1226
       +
       		return

     

       1227
       +
       	}

     

       1228
       +
       

     

       1229
       +
       	secret, err := db.GetRegistrationKey(s.db, forkRepo.Knot)

     

       1230
       +
       	if err != nil {

     

       1231
       +
       		log.Printf("failed to get registration key for %s: %s", forkRepo.Knot, err)

     

       1232
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1233
       +
       		return

     

       1234
       +
       	}

     

       1235
       +
       

     

       1236
       +
       	// update the hidden tracking branch to latest

     

       1237
       +
       	signedClient, err := NewSignedClient(forkRepo.Knot, secret, s.config.Dev)

     

       1238
       +
       	if err != nil {

     

       1239
       +
       		log.Printf("failed to create signed client for %s: %s", forkRepo.Knot, err)

     

       1240
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1241
       +
       		return

     

       1242
       +
       	}

     

       1243
       +
       

     

       1244
       +
       	resp, err := signedClient.NewHiddenRef(forkRepo.Did, forkRepo.Name, pull.PullSource.Branch, pull.TargetBranch)

     

       1245
       +
       	if err != nil || resp.StatusCode != http.StatusNoContent {

     

       1246
       +
       		log.Printf("failed to update tracking branch: %s", err)

     

       1247
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1248
       +
       		return

     

       1249
       +
       	}

     

       1250
       +
       

     

       1251
       +
       	hiddenRef := url.QueryEscape(fmt.Sprintf("hidden/%s/%s", pull.PullSource.Branch, pull.TargetBranch))

     

       1252
       +
       	diffTreeResponse, err := ksClient.Compare(forkRepo.Did, forkRepo.Name, hiddenRef, pull.PullSource.Branch)

     

       1253
       +
       	if err != nil {

     

       1254
       +
       		log.Printf("failed to compare branches: %s", err)

     

       1255
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1256
       +
       		return

     

       1257
       +
       	}

     

       1258
       +
       

     

       1259
       +
       	sourceRev := diffTreeResponse.DiffTree.Rev2

     

       1260
       +
       	patch := diffTreeResponse.DiffTree.Patch

     

       1261
       +
       

     

       1262
       +
       	if err = validateResubmittedPatch(pull, patch); err != nil {

     

       1263
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1264
       +
       	}

     

       1265
       +
       

     

       1266
       +
       	if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev {

     

       1267
       +
       		s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")

     

       1268
       +
       		return

     

       1269
       +
       	}

     

       1270
       +
       

     

       1271
       +
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       1272
       +
       	if err != nil {

     

       1273
       +
       		log.Println("failed to start tx")

     

       1274
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1275
       +
       		return

     

       1276
       +
       	}

     

       1277
       +
       	defer tx.Rollback()

     

       1278
       +
       

     

       1279
       +
       	err = db.ResubmitPull(tx, pull, patch, sourceRev)

     

       1280
       +
       	if err != nil {

     

       1281
       +
       		log.Println("failed to create pull request", err)

     

       1282
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1283
       +
       		return

     

       1284
       +
       	}

     

       1285
       +
       	client, _ := s.auth.AuthorizedClient(r)

     

       1286
       +
       

     

       1287
       +
       	ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)

     

       1288
       +
       	if err != nil {

     

       1289
       +
       		// failed to get record

     

       1290
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")

     

       1291
       +
       		return

     

       1292
       +
       	}

     

       1293
        
       

     

       1294
       +
       	repoAt := pull.PullSource.RepoAt.String()

     

       1295
       +
       	recordPullSource := &tangled.RepoPull_Source{

     

       1296
       +
       		Branch: pull.PullSource.Branch,

     

       1297
       +
       		Repo:   &repoAt,

     

       1298
       +
       	}

     

       1299
       +
       	_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       1300
       +
       		Collection: tangled.RepoPullNSID,

     

       1301
       +
       		Repo:       user.Did,

     

       1302
       +
       		Rkey:       pull.Rkey,

     

       1303
       +
       		SwapRecord: ex.Cid,

     

       1304
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       1305
       +
       			Val: &tangled.RepoPull{

     

       1306
       +
       				Title:        pull.Title,

     

       1307
       +
       				PullId:       int64(pull.PullId),

     

       1308
       +
       				TargetRepo:   string(f.RepoAt),

     

       1309
       +
       				TargetBranch: pull.TargetBranch,

     

       1310
       +
       				Patch:        patch, // new patch

     

       1311
       +
       				Source:       recordPullSource,

     

       1312
       +
       			},

     

       1313
       +
       		},

     

       1314
       +
       	})

     

       1315
       +
       	if err != nil {

     

       1316
       +
       		log.Println("failed to update record", err)

     

       1317
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")

     

       1318
       +
       		return

     

       1319
       +
       	}

     

       1320
        
       

     

       1321
       +
       	if err = tx.Commit(); err != nil {

     

       1322
       +
       		log.Println("failed to commit transaction", err)

     

       1323
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")

     

       1324
        
       		return

     

       1325
        
       	}

     

       1326
       +
       

     

       1327
       +
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       1328
       +
       	return

     

       1329
       +
       }

     

       1330
       +
       

     

       1331
       +
       // validate a resubmission against a pull request

     

       1332
       +
       func validateResubmittedPatch(pull *db.Pull, patch string) error {

     

       1333
       +
       	if patch == "" {

     

       1334
       +
       		return fmt.Errorf("Patch is empty.")

     

       1335
       +
       	}

     

       1336
       +
       

     

       1337
       +
       	if patch == pull.LatestPatch() {

     

       1338
       +
       		return fmt.Errorf("Patch is identical to previous submission.")

     

       1339
       +
       	}

     

       1340
       +
       

     

       1341
       +
       	if !isPatchValid(patch) {

     

       1342
       +
       		return fmt.Errorf("Invalid patch format. Please provide a valid diff.")

     

       1343
       +
       	}

     

       1344
       +
       

     

       1345
       +
       	return nil

     

       1346
        
       }

     

       1347
        
       

     

       1348
        
       func (s *State) MergePull(w http.ResponseWriter, r *http.Request) {

+138 -4

appview/state/repo.go

···

       21
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       22
        
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       23
        
       	"github.com/go-chi/chi/v5"

     

       0
        
       
     

       24
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       25
        
       	"tangled.sh/tangled.sh/core/appview/auth"

     

       26
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       27
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       0
        
       
     

       28
        
       	"tangled.sh/tangled.sh/core/types"

     

       29
        
       

     

       30
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     
···

       247
        
       	if !s.config.Dev {

     

       248
        
       		protocol = "https"

     

       249
        
       	}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       250
        
       	resp, err := http.Get(fmt.Sprintf("%s://%s/%s/%s/commit/%s", protocol, f.Knot, f.OwnerDid(), f.RepoName, ref))

     

       251
        
       	if err != nil {

     

       252
        
       		log.Println("failed to reach knotserver", err)

     
···

       451
        
       		for idx, elem := range strings.Split(filePath, "/") {

     

       452
        
       			breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], elem)})

     

       453
        
       		}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       454
        
       	}

     

       455
        
       

     

       456
        
       	user := s.auth.GetUser(r)

     
···

       459
        
       		RepoInfo:         f.RepoInfo(s, user),

     

       460
        
       		RepoBlobResponse: result,

     

       461
        
       		BreadCrumbs:      breadcrumbs,

     

       0
        
       
     

       0
        
       
     

       462
        
       	})

     

       463
        
       	return

     

       464
        
       }

     
···

       594
        
       

     

       595
        
       	w.Write([]byte(fmt.Sprint("added collaborator: ", collaboratorIdent.Handle.String())))

     

       596
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       597
        
       }

     

       598
        
       

     

       599
        
       func (s *State) SetDefaultBranch(w http.ResponseWriter, r *http.Request) {

     
···

       1581
        
       

     

       1582
        
       		forkName := fmt.Sprintf("%s", f.RepoName)

     

       1583
        
       

     

       0
        
       
     

       0
        
       
     

       1584
        
       		existingRepo, err := db.GetRepo(s.db, user.Did, f.RepoName)

     

       1585
       -
       		if err == nil && existingRepo != nil {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1586
        
       			forkName = fmt.Sprintf("%s-%s", forkName, randomString(3))

     

       1587
        
       		}

     

       1588
       -
       

     

       1589
        
       		secret, err := db.GetRegistrationKey(s.db, knot)

     

       1590
        
       		if err != nil {

     

       1591
        
       			s.pages.Notice(w, "repo", fmt.Sprintf("No registration key found for knot %s.", knot))

     
···

       1594
        
       

     

       1595
        
       		client, err := NewSignedClient(knot, secret, s.config.Dev)

     

       1596
        
       		if err != nil {

     

       1597
       -
       			s.pages.Notice(w, "repo", "Failed to connect to knot server.")

     

       1598
        
       			return

     

       1599
        
       		}

     

       1600
        
       

     
···

       1604
        
       		} else {

     

       1605
        
       			uri = "https"

     

       1606
        
       		}

     

       1607
       -
       		sourceUrl := fmt.Sprintf("%s://%s/%s/%s", uri, knot, f.OwnerDid(), f.RepoName)

     

       1608
        
       		sourceAt := f.RepoAt.String()

     

       1609
        
       

     

       1610
        
       		rkey := s.TID()

···

       21
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       22
        
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       23
        
       	"github.com/go-chi/chi/v5"

     

       24
       +
       	"github.com/go-git/go-git/v5/plumbing"

     

       25
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       26
        
       	"tangled.sh/tangled.sh/core/appview/auth"

     

       27
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       28
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       29
       +
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       30
        
       	"tangled.sh/tangled.sh/core/types"

     

       31
        
       

     

       32
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     
···

       249
        
       	if !s.config.Dev {

     

       250
        
       		protocol = "https"

     

       251
        
       	}

     

       252
       +
       

     

       253
       +
       	if !plumbing.IsHash(ref) {

     

       254
       +
       		s.pages.Error404(w)

     

       255
       +
       		return

     

       256
       +
       	}

     

       257
       +
       

     

       258
        
       	resp, err := http.Get(fmt.Sprintf("%s://%s/%s/%s/commit/%s", protocol, f.Knot, f.OwnerDid(), f.RepoName, ref))

     

       259
        
       	if err != nil {

     

       260
        
       		log.Println("failed to reach knotserver", err)

     
···

       459
        
       		for idx, elem := range strings.Split(filePath, "/") {

     

       460
        
       			breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], elem)})

     

       461
        
       		}

     

       462
       +
       	}

     

       463
       +
       

     

       464
       +
       	showRendered := false

     

       465
       +
       	renderToggle := false

     

       466
       +
       

     

       467
       +
       	if markup.GetFormat(result.Path) == markup.FormatMarkdown {

     

       468
       +
       		renderToggle = true

     

       469
       +
       		showRendered = r.URL.Query().Get("code") != "true"

     

       470
        
       	}

     

       471
        
       

     

       472
        
       	user := s.auth.GetUser(r)

     
···

       475
        
       		RepoInfo:         f.RepoInfo(s, user),

     

       476
        
       		RepoBlobResponse: result,

     

       477
        
       		BreadCrumbs:      breadcrumbs,

     

       478
       +
       		ShowRendered:     showRendered,

     

       479
       +
       		RenderToggle:     renderToggle,

     

       480
        
       	})

     

       481
        
       	return

     

       482
        
       }

     
···

       612
        
       

     

       613
        
       	w.Write([]byte(fmt.Sprint("added collaborator: ", collaboratorIdent.Handle.String())))

     

       614
        
       

     

       615
       +
       }

     

       616
       +
       

     

       617
       +
       func (s *State) DeleteRepo(w http.ResponseWriter, r *http.Request) {

     

       618
       +
       	user := s.auth.GetUser(r)

     

       619
       +
       

     

       620
       +
       	f, err := fullyResolvedRepo(r)

     

       621
       +
       	if err != nil {

     

       622
       +
       		log.Println("failed to get repo and knot", err)

     

       623
       +
       		return

     

       624
       +
       	}

     

       625
       +
       

     

       626
       +
       	// remove record from pds

     

       627
       +
       	xrpcClient, _ := s.auth.AuthorizedClient(r)

     

       628
       +
       	repoRkey := f.RepoAt.RecordKey().String()

     

       629
       +
       	_, err = comatproto.RepoDeleteRecord(r.Context(), xrpcClient, &comatproto.RepoDeleteRecord_Input{

     

       630
       +
       		Collection: tangled.RepoNSID,

     

       631
       +
       		Repo:       user.Did,

     

       632
       +
       		Rkey:       repoRkey,

     

       633
       +
       	})

     

       634
       +
       	if err != nil {

     

       635
       +
       		log.Printf("failed to delete record: %s", err)

     

       636
       +
       		s.pages.Notice(w, "settings-delete", "Failed to delete repository from PDS.")

     

       637
       +
       		return

     

       638
       +
       	}

     

       639
       +
       	log.Println("removed repo record ", f.RepoAt.String())

     

       640
       +
       

     

       641
       +
       	secret, err := db.GetRegistrationKey(s.db, f.Knot)

     

       642
       +
       	if err != nil {

     

       643
       +
       		log.Printf("no key found for domain %s: %s\n", f.Knot, err)

     

       644
       +
       		return

     

       645
       +
       	}

     

       646
       +
       

     

       647
       +
       	ksClient, err := NewSignedClient(f.Knot, secret, s.config.Dev)

     

       648
       +
       	if err != nil {

     

       649
       +
       		log.Println("failed to create client to ", f.Knot)

     

       650
       +
       		return

     

       651
       +
       	}

     

       652
       +
       

     

       653
       +
       	ksResp, err := ksClient.RemoveRepo(f.OwnerDid(), f.RepoName)

     

       654
       +
       	if err != nil {

     

       655
       +
       		log.Printf("failed to make request to %s: %s", f.Knot, err)

     

       656
       +
       		return

     

       657
       +
       	}

     

       658
       +
       

     

       659
       +
       	if ksResp.StatusCode != http.StatusNoContent {

     

       660
       +
       		log.Println("failed to remove repo from knot, continuing anyway ", f.Knot)

     

       661
       +
       	} else {

     

       662
       +
       		log.Println("removed repo from knot ", f.Knot)

     

       663
       +
       	}

     

       664
       +
       

     

       665
       +
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       666
       +
       	if err != nil {

     

       667
       +
       		log.Println("failed to start tx")

     

       668
       +
       		w.Write([]byte(fmt.Sprint("failed to add collaborator: ", err)))

     

       669
       +
       		return

     

       670
       +
       	}

     

       671
       +
       	defer func() {

     

       672
       +
       		tx.Rollback()

     

       673
       +
       		err = s.enforcer.E.LoadPolicy()

     

       674
       +
       		if err != nil {

     

       675
       +
       			log.Println("failed to rollback policies")

     

       676
       +
       		}

     

       677
       +
       	}()

     

       678
       +
       

     

       679
       +
       	// remove collaborator RBAC

     

       680
       +
       	repoCollaborators, err := s.enforcer.E.GetImplicitUsersForResourceByDomain(f.OwnerSlashRepo(), f.Knot)

     

       681
       +
       	if err != nil {

     

       682
       +
       		s.pages.Notice(w, "settings-delete", "Failed to remove collaborators")

     

       683
       +
       		return

     

       684
       +
       	}

     

       685
       +
       	for _, c := range repoCollaborators {

     

       686
       +
       		did := c[0]

     

       687
       +
       		s.enforcer.RemoveCollaborator(did, f.Knot, f.OwnerSlashRepo())

     

       688
       +
       	}

     

       689
       +
       	log.Println("removed collaborators")

     

       690
       +
       

     

       691
       +
       	// remove repo RBAC

     

       692
       +
       	err = s.enforcer.RemoveRepo(f.OwnerDid(), f.Knot, f.OwnerSlashRepo())

     

       693
       +
       	if err != nil {

     

       694
       +
       		s.pages.Notice(w, "settings-delete", "Failed to update RBAC rules")

     

       695
       +
       		return

     

       696
       +
       	}

     

       697
       +
       

     

       698
       +
       	// remove repo from db

     

       699
       +
       	err = db.RemoveRepo(tx, f.OwnerDid(), f.RepoName)

     

       700
       +
       	if err != nil {

     

       701
       +
       		s.pages.Notice(w, "settings-delete", "Failed to update appview")

     

       702
       +
       		return

     

       703
       +
       	}

     

       704
       +
       	log.Println("removed repo from db")

     

       705
       +
       

     

       706
       +
       	err = tx.Commit()

     

       707
       +
       	if err != nil {

     

       708
       +
       		log.Println("failed to commit changes", err)

     

       709
       +
       		http.Error(w, err.Error(), http.StatusInternalServerError)

     

       710
       +
       		return

     

       711
       +
       	}

     

       712
       +
       

     

       713
       +
       	err = s.enforcer.E.SavePolicy()

     

       714
       +
       	if err != nil {

     

       715
       +
       		log.Println("failed to update ACLs", err)

     

       716
       +
       		http.Error(w, err.Error(), http.StatusInternalServerError)

     

       717
       +
       		return

     

       718
       +
       	}

     

       719
       +
       

     

       720
       +
       	s.pages.HxRedirect(w, fmt.Sprintf("/%s", f.OwnerDid()))

     

       721
        
       }

     

       722
        
       

     

       723
        
       func (s *State) SetDefaultBranch(w http.ResponseWriter, r *http.Request) {

     
···

       1705
        
       

     

       1706
        
       		forkName := fmt.Sprintf("%s", f.RepoName)

     

       1707
        
       

     

       1708
       +
       		// this check is *only* to see if the forked repo name already exists

     

       1709
       +
       		// in the user's account.

     

       1710
        
       		existingRepo, err := db.GetRepo(s.db, user.Did, f.RepoName)

     

       1711
       +
       		if err != nil {

     

       1712
       +
       			if errors.Is(err, sql.ErrNoRows) {

     

       1713
       +
       				// no existing repo with this name found, we can use the name as is

     

       1714
       +
       			} else {

     

       1715
       +
       				log.Println("error fetching existing repo from db", err)

     

       1716
       +
       				s.pages.Notice(w, "repo", "Failed to fork this repository. Try again later.")

     

       1717
       +
       				return

     

       1718
       +
       			}

     

       1719
       +
       		} else if existingRepo != nil {

     

       1720
       +
       			// repo with this name already exists, append random string

     

       1721
        
       			forkName = fmt.Sprintf("%s-%s", forkName, randomString(3))

     

       1722
        
       		}

     

       0
        
       
     

       1723
        
       		secret, err := db.GetRegistrationKey(s.db, knot)

     

       1724
        
       		if err != nil {

     

       1725
        
       			s.pages.Notice(w, "repo", fmt.Sprintf("No registration key found for knot %s.", knot))

     
···

       1728
        
       

     

       1729
        
       		client, err := NewSignedClient(knot, secret, s.config.Dev)

     

       1730
        
       		if err != nil {

     

       1731
       +
       			s.pages.Notice(w, "repo", "Failed to reach knot server.")

     

       1732
        
       			return

     

       1733
        
       		}

     

       1734
        
       

     
···

       1738
        
       		} else {

     

       1739
        
       			uri = "https"

     

       1740
        
       		}

     

       1741
       +
       		sourceUrl := fmt.Sprintf("%s://%s/%s/%s", uri, f.Knot, f.OwnerDid(), f.RepoName)

     

       1742
        
       		sourceAt := f.RepoAt.String()

     

       1743
        
       

     

       1744
        
       		rkey := s.TID()

appview/state/router.go

···

       153
        
       				r.With(RepoPermissionMiddleware(s, "repo:settings")).Route("/settings", func(r chi.Router) {

     

       154
        
       					r.Get("/", s.RepoSettings)

     

       155
        
       					r.With(RepoPermissionMiddleware(s, "repo:invite")).Put("/collaborator", s.AddCollaborator)

     

       0
        
       
     

       156
        
       					r.Put("/branches/default", s.SetDefaultBranch)

     

       157
        
       				})

     

       158
        
       			})

···

       153
        
       				r.With(RepoPermissionMiddleware(s, "repo:settings")).Route("/settings", func(r chi.Router) {

     

       154
        
       					r.Get("/", s.RepoSettings)

     

       155
        
       					r.With(RepoPermissionMiddleware(s, "repo:invite")).Put("/collaborator", s.AddCollaborator)

     

       156
       +
       					r.With(RepoPermissionMiddleware(s, "repo:delete")).Delete("/delete", s.DeleteRepo)

     

       157
        
       					r.Put("/branches/default", s.SetDefaultBranch)

     

       158
        
       				})

     

       159
        
       			})

+31 -3

appview/state/signer.go

···

       7
        
       	"encoding/hex"

     

       8
        
       	"encoding/json"

     

       9
        
       	"fmt"

     

       0
        
       
     

       0
        
       
     

       10
        
       	"net/http"

     

       11
        
       	"net/url"

     

       12
        
       	"time"

     
···

       376
        
       	return &capabilities, nil

     

       377
        
       }

     

       378
        
       

     

       379
       -
       func (us *UnsignedClient) Compare(ownerDid, repoName, rev1, rev2 string) (*http.Response, error) {

     

       380
        
       	const (

     

       381
        
       		Method = "GET"

     

       382
        
       	)

     
···

       385
        
       

     

       386
        
       	req, err := us.newRequest(Method, endpoint, nil)

     

       387
        
       	if err != nil {

     

       388
       -
       		return nil, err

     

       389
        
       	}

     

       390
        
       

     

       391
       -
       	return us.client.Do(req)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       392
        
       }

···

       7
        
       	"encoding/hex"

     

       8
        
       	"encoding/json"

     

       9
        
       	"fmt"

     

       10
       +
       	"io"

     

       11
       +
       	"log"

     

       12
        
       	"net/http"

     

       13
        
       	"net/url"

     

       14
        
       	"time"

     
···

       378
        
       	return &capabilities, nil

     

       379
        
       }

     

       380
        
       

     

       381
       +
       func (us *UnsignedClient) Compare(ownerDid, repoName, rev1, rev2 string) (*types.RepoDiffTreeResponse, error) {

     

       382
        
       	const (

     

       383
        
       		Method = "GET"

     

       384
        
       	)

     
···

       387
        
       

     

       388
        
       	req, err := us.newRequest(Method, endpoint, nil)

     

       389
        
       	if err != nil {

     

       390
       +
       		return nil, fmt.Errorf("Failed to create request.")

     

       391
        
       	}

     

       392
        
       

     

       393
       +
       	compareResp, err := us.client.Do(req)

     

       394
       +
       	if err != nil {

     

       395
       +
       		return nil, fmt.Errorf("Failed to create request.")

     

       396
       +
       	}

     

       397
       +
       	defer compareResp.Body.Close()

     

       398
       +
       

     

       399
       +
       	switch compareResp.StatusCode {

     

       400
       +
       	case 404:

     

       401
       +
       	case 400:

     

       402
       +
       		return nil, fmt.Errorf("Branch comparisons not supported on this knot.")

     

       403
       +
       	}

     

       404
       +
       

     

       405
       +
       	respBody, err := io.ReadAll(compareResp.Body)

     

       406
       +
       	if err != nil {

     

       407
       +
       		log.Println("failed to compare across branches")

     

       408
       +
       		return nil, fmt.Errorf("Failed to compare branches.")

     

       409
       +
       	}

     

       410
       +
       	defer compareResp.Body.Close()

     

       411
       +
       

     

       412
       +
       	var diffTreeResponse types.RepoDiffTreeResponse

     

       413
       +
       	err = json.Unmarshal(respBody, &diffTreeResponse)

     

       414
       +
       	if err != nil {

     

       415
       +
       		log.Println("failed to unmarshal diff tree response", err)

     

       416
       +
       		return nil, fmt.Errorf("Failed to compare branches.")

     

       417
       +
       	}

     

       418
       +
       

     

       419
       +
       	return &diffTreeResponse, nil

     

       420
        
       }

+52

docker/Dockerfile

···

       1
       +
       FROM docker.io/golang:1.24-alpine3.21 AS build

     

       2
       +
       

     

       3
       +
       ENV CGO_ENABLED=1

     

       4
       +
       

     

       5
       +
       RUN apk add --no-cache gcc musl-dev

     

       6
       +
       

     

       7
       +
       WORKDIR /usr/src/app

     

       8
       +
       

     

       9
       +
       COPY go.mod go.sum ./

     

       10
       +
       RUN go mod download

     

       11
       +
       

     

       12
       +
       COPY . .

     

       13
       +
       RUN go build -v \

     

       14
       +
           -o /usr/local/bin/knotserver \

     

       15
       +
           -ldflags='-s -w -extldflags "-static"' \

     

       16
       +
           ./cmd/knotserver && \

     

       17
       +
           go build -v \

     

       18
       +
           -o /usr/local/bin/keyfetch \

     

       19
       +
           ./cmd/keyfetch && \

     

       20
       +
           go build -v \

     

       21
       +
           -o /usr/local/bin/repoguard \

     

       22
       +
           ./cmd/repoguard

     

       23
       +
       

     

       24
       +
       FROM docker.io/alpine:3.21

     

       25
       +
       

     

       26
       +
       LABEL org.opencontainers.image.title=Tangled

     

       27
       +
       LABEL org.opencontainers.image.description="Tangled is a decentralized and open code collaboration platform, built on atproto."

     

       28
       +
       LABEL org.opencontainers.image.vendor=Tangled.sh

     

       29
       +
       LABEL org.opencontainers.image.licenses=MIT

     

       30
       +
       LABEL org.opencontainers.image.url=https://tangled.sh

     

       31
       +
       LABEL org.opencontainers.image.source=https://tangled.sh/@tangled.sh/core

     

       32
       +
       

     

       33
       +
       RUN apk add --no-cache shadow s6-overlay execline openssh git && \

     

       34
       +
           adduser --disabled-password git && \

     

       35
       +
           # We need to set password anyway since otherwise ssh won't work

     

       36
       +
           head -c 32 /dev/random | base64 | tr -dc 'a-zA-Z0-9' | passwd git --stdin && \

     

       37
       +
           mkdir /app && mkdir /home/git/repositories

     

       38
       +
       

     

       39
       +
       COPY --from=build /usr/local/bin/knotserver /usr/local/bin

     

       40
       +
       COPY --from=build /usr/local/bin/keyfetch /usr/local/libexec/tangled-keyfetch

     

       41
       +
       COPY --from=build /usr/local/bin/repoguard /home/git/repoguard

     

       42
       +
       COPY docker/rootfs/ .

     

       43
       +
       

     

       44
       +
       RUN chown root:root /usr/local/libexec/tangled-keyfetch && \

     

       45
       +
           chmod 755 /usr/local/libexec/tangled-keyfetch && \

     

       46
       +
           chown git:git /home/git/repoguard && \

     

       47
       +
           chown git:git /app && chown git:git /home/git/repositories

     

       48
       +
       

     

       49
       +
       EXPOSE 22

     

       50
       +
       EXPOSE 5555

     

       51
       +
       

     

       52
       +
       ENTRYPOINT ["/init"]

+17

docker/docker-compose.yml

···

       1
       +
       services:

     

       2
       +
         knot:

     

       3
       +
           build:

     

       4
       +
             context: ..

     

       5
       +
             dockerfile: docker/Dockerfile

     

       6
       +
           environment:

     

       7
       +
             KNOT_SERVER_HOSTNAME: "knot.example.org"

     

       8
       +
             KNOT_SERVER_SECRET: "secret"

     

       9
       +
             KNOT_SERVER_DB_PATH: "/app/knotserver.db"

     

       10
       +
             KNOT_REPO_SCAN_PATH: "/home/git/repositories"

     

       11
       +
           volumes:

     

       12
       +
             - "./keys:/etc/ssh/keys"

     

       13
       +
             - "./repositories:/home/git/repositories"

     

       14
       +
             - "./server:/app"

     

       15
       +
           ports:

     

       16
       +
             - "5555:5555"

     

       17
       +
             - "2222:22"

docker/rootfs/etc/s6-overlay/s6-rc.d/create-sshd-host-keys/type

···

       0

···

       1
       +
       oneshot

docker/rootfs/etc/s6-overlay/s6-rc.d/create-sshd-host-keys/up

···

       0

···

       1
       +
       /etc/s6-overlay/scripts/create-sshd-host-keys

docker/rootfs/etc/s6-overlay/s6-rc.d/knotserver/dependencies.d/base

This is a binary file and will not be displayed.

docker/rootfs/etc/s6-overlay/s6-rc.d/knotserver/run

···

       1
       +
       #!/command/with-contenv ash

     

       2
       +
       

     

       3
       +
       exec s6-setuidgid git /usr/local/bin/knotserver

docker/rootfs/etc/s6-overlay/s6-rc.d/knotserver/type

···

       0

···

       1
       +
       longrun

docker/rootfs/etc/s6-overlay/s6-rc.d/sshd/dependencies.d/base

This is a binary file and will not be displayed.

docker/rootfs/etc/s6-overlay/s6-rc.d/sshd/dependencies.d/create-sshd-host-keys

This is a binary file and will not be displayed.

docker/rootfs/etc/s6-overlay/s6-rc.d/sshd/run

···

       1
       +
       #!/usr/bin/execlineb -P

     

       2
       +
       

     

       3
       +
       /usr/sbin/sshd -e -D

docker/rootfs/etc/s6-overlay/s6-rc.d/sshd/type

···

       0

···

       1
       +
       longrun

docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/knotserver

This is a binary file and will not be displayed.

docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/sshd

This is a binary file and will not be displayed.

+21

docker/rootfs/etc/s6-overlay/scripts/create-sshd-host-keys

···

       1
       +
       #!/usr/bin/execlineb -P

     

       2
       +
       

     

       3
       +
       foreground {

     

       4
       +
         if -n { test -d /etc/ssh/keys }

     

       5
       +
         mkdir /etc/ssh/keys

     

       6
       +
       }

     

       7
       +
       

     

       8
       +
       foreground {

     

       9
       +
         if -n { test -f /etc/ssh/keys/ssh_host_rsa_key }

     

       10
       +
         ssh-keygen -t rsa -f /etc/ssh/keys/ssh_host_rsa_key -q -N ""

     

       11
       +
       }

     

       12
       +
       

     

       13
       +
       foreground {

     

       14
       +
         if -n { test -f /etc/ssh/keys/ssh_host_ecdsa_key }

     

       15
       +
         ssh-keygen -t rsa -f /etc/ssh/keys/ssh_host_ecdsa_key -q -N ""

     

       16
       +
       }

     

       17
       +
       

     

       18
       +
       foreground {

     

       19
       +
         if -n { test -f /etc/ssh/keys/ssh_host_ed25519_key }

     

       20
       +
         ssh-keygen -t rsa -f /etc/ssh/keys/ssh_host_ed25519_key -q -N ""

     

       21
       +
       }

docker/rootfs/etc/ssh/sshd_config.d/tangled_sshd.conf

···

       1
       +
       HostKey /etc/ssh/keys/ssh_host_rsa_key

     

       2
       +
       HostKey /etc/ssh/keys/ssh_host_ecdsa_key

     

       3
       +
       HostKey /etc/ssh/keys/ssh_host_ed25519_key

     

       4
       +
       

     

       5
       +
       PasswordAuthentication no

     

       6
       +
       

     

       7
       +
       Match User git

     

       8
       +
         AuthorizedKeysCommand /usr/local/libexec/tangled-keyfetch -git-dir /home/git/repositories

     

       9
       +
         AuthorizedKeysCommandUser nobody

+74

docs/contributing.md

···

       1
       +
       # tangled contributing guide

     

       2
       +
       

     

       3
       +
       ## commit guidelines

     

       4
       +
       

     

       5
       +
       We follow a commit style similar to the Go project. Please keep commits:

     

       6
       +
       

     

       7
       +
       * **atomic**: each commit should represent one logical change  

     

       8
       +
       * **descriptive**: the commit message should clearly describe what the

     

       9
       +
       change does and why it's needed

     

       10
       +
       

     

       11
       +
       ### message format

     

       12
       +
       

     

       13
       +
       ``` 

     

       14
       +
       <service/top-level directory>: <package/path>: <short summary of change>

     

       15
       +
       

     

       16
       +
       

     

       17
       +
       Optional longer description, if needed. Explain what the change does and

     

       18
       +
       why, especially if not obvious. Reference relevant issues or PRs when

     

       19
       +
       applicable. These can be links for now since we don't auto-link

     

       20
       +
       issues/PRs yet. 

     

       21
       +
       ```

     

       22
       +
       

     

       23
       +
       Here are some examples:

     

       24
       +
       

     

       25
       +
       ```

     

       26
       +
       appview: state: fix token expiry check in middleware

     

       27
       +
       

     

       28
       +
       The previous check did not account for clock drift, leading to premature

     

       29
       +
       token invalidation. 

     

       30
       +
       ```

     

       31
       +
       

     

       32
       +
       ```

     

       33
       +
       knotserver: git/service: improve error checking in upload-pack

     

       34
       +
       ```

     

       35
       +
       

     

       36
       +
       ### general notes

     

       37
       +
       

     

       38
       +
       - PRs get merged as a single commit, so keep PRs small and focused. Use

     

       39
       +
       the above guidelines for the PR title and description.

     

       40
       +
       - Use the imperative mood in the summary line (e.g., "fix bug" not

     

       41
       +
       "fixed bug" or "fixes bug").

     

       42
       +
       - Try to keep the summary line under 72 characters, but we aren't too

     

       43
       +
       fussed about this.

     

       44
       +
       - Don't include unrelated changes in the same commit.

     

       45
       +
       - Avoid noisy commit messages like "wip" or "final fix"—rewrite history

     

       46
       +
       before submitting if necessary.

     

       47
       +
       

     

       48
       +
       ## proposals for bigger changes

     

       49
       +
       

     

       50
       +
       Small fixes like typos, minor bugs, or trivial refactors can be

     

       51
       +
       submitted directly as PRs.

     

       52
       +
       

     

       53
       +
       For larger changes—especially those introducing new features,

     

       54
       +
       significant refactoring, or altering system behavior—please open a

     

       55
       +
       proposal first. This helps us evaluate the scope, design, and potential

     

       56
       +
       impact before implementation.

     

       57
       +
       

     

       58
       +
       ### proposal format

     

       59
       +
       

     

       60
       +
       Create a new issue titled:

     

       61
       +
       

     

       62
       +
       ``` 

     

       63
       +
       proposal: <affected scope>: <summary of change> 

     

       64
       +
       ```

     

       65
       +
       

     

       66
       +
       In the description, explain:

     

       67
       +
       

     

       68
       +
       - What the change is

     

       69
       +
       - Why it's needed

     

       70
       +
       - How you plan to implement it (roughly)

     

       71
       +
       - Any open questions or tradeoffs

     

       72
       +
       

     

       73
       +
       We'll use the issue thread to discuss and refine the idea before moving

     

       74
       +
       forward.

+108

docs/knot-hosting.md

···

       1
       +
       # knot self-hosting guide

     

       2
       +
       

     

       3
       +
       So you want to run your own knot server? Great! Here are a few prerequisites:

     

       4
       +
       

     

       5
       +
       1. A server of some kind (a VPS, a Raspberry Pi, etc.). Preferably running a Linux of some kind.

     

       6
       +
       2. A (sub)domain name. People generally use `knot.example.com`.

     

       7
       +
       3. A valid SSL certificate for your domain.

     

       8
       +
       

     

       9
       +
       There's a couple of ways to get started:

     

       10
       +
       * NixOS: refer to [flake.nix](https://tangled.sh/@tangled.sh/core/blob/master/flake.nix)

     

       11
       +
       * Docker: Documented below.

     

       12
       +
       * Manual: Documented below.

     

       13
       +
       

     

       14
       +
       ## docker setup

     

       15
       +
       

     

       16
       +
       Clone this repository:

     

       17
       +
       

     

       18
       +
       ```

     

       19
       +
       git clone https://tangled.sh/@tangled.sh/core

     

       20
       +
       ```

     

       21
       +
       

     

       22
       +
       Modify the `docker/docker-compose.yml`, specifically the

     

       23
       +
       `KNOT_SERVER_SECRET` and `KNOT_SERVER_HOSTNAME` env vars. Then run:

     

       24
       +
       

     

       25
       +
       ```

     

       26
       +
       docker compose -f docker/docker-compose.yml up

     

       27
       +
       ```

     

       28
       +
       

     

       29
       +
       ## manual setup

     

       30
       +
       

     

       31
       +
       First, clone this repository:

     

       32
       +
       

     

       33
       +
       ```

     

       34
       +
       git clone https://tangled.sh/@tangled.sh/core

     

       35
       +
       ```

     

       36
       +
       

     

       37
       +
       Then, build our binaries (you need to have Go installed):

     

       38
       +
       * `knotserver`: the main server program

     

       39
       +
       * `keyfetch`: utility to fetch ssh pubkeys

     

       40
       +
       * `repoguard`: enforces repository access control

     

       41
       +
       

     

       42
       +
       ```

     

       43
       +
       cd core

     

       44
       +
       export CGO_ENABLED=1

     

       45
       +
       go build -o knot ./cmd/knotserver

     

       46
       +
       go build -o keyfetch ./cmd/keyfetch

     

       47
       +
       go build -o repoguard ./cmd/repoguard

     

       48
       +
       ```

     

       49
       +
       

     

       50
       +
       Next, move the `keyfetch` binary to a location owned by `root` --

     

       51
       +
       `/usr/local/libexec/tangled-keyfetch` is a good choice:

     

       52
       +
       

     

       53
       +
       ```

     

       54
       +
       sudo mv keyfetch /usr/local/libexec/tangled-keyfetch

     

       55
       +
       sudo chown root:root /usr/local/libexec/tangled-keyfetch

     

       56
       +
       sudo chmod 755 /usr/local/libexec/tangled-keyfetch

     

       57
       +
       ```

     

       58
       +
       

     

       59
       +
       This is necessary because SSH `AuthorizedKeysCommand` requires [really specific

     

       60
       +
       permissions](https://stackoverflow.com/a/27638306). Let's set that up:

     

       61
       +
       

     

       62
       +
       ```

     

       63
       +
       sudo tee /etc/ssh/sshd_config.d/authorized_keys_command.conf <<EOF

     

       64
       +
       Match User git

     

       65
       +
         AuthorizedKeysCommand /usr/local/libexec/tangled-keyfetch

     

       66
       +
         AuthorizedKeysCommandUser nobody

     

       67
       +
       EOF

     

       68
       +
       ```

     

       69
       +
       

     

       70
       +
       Next, create the `git` user:

     

       71
       +
       

     

       72
       +
       ```

     

       73
       +
       sudo adduser git

     

       74
       +
       ```

     

       75
       +
       

     

       76
       +
       Copy the `repoguard` binary to the `git` user's home directory:

     

       77
       +
       

     

       78
       +
       ```

     

       79
       +
       sudo cp repoguard /home/git

     

       80
       +
       sudo chown git:git /home/git/repoguard

     

       81
       +
       ```

     

       82
       +
       

     

       83
       +
       Now, let's set up the server. Copy the `knot` binary to

     

       84
       +
       `/usr/local/bin/knotserver`. Then, create `/home/git/.knot.env` with the

     

       85
       +
       following, updating the values as necessary. The `KNOT_SERVER_SECRET` can be

     

       86
       +
       obtaind from the [/knots](/knots) page on Tangled.

     

       87
       +
       

     

       88
       +
       ```

     

       89
       +
       KNOT_REPO_SCAN_PATH=/home/git

     

       90
       +
       KNOT_SERVER_HOSTNAME=knot.example.com

     

       91
       +
       APPVIEW_ENDPOINT=https://tangled.sh

     

       92
       +
       KNOT_SERVER_SECRET=secret

     

       93
       +
       KNOT_SERVER_INTERNAL_LISTEN_ADDR=127.0.0.1:5444

     

       94
       +
       KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555

     

       95
       +
       ```

     

       96
       +
       

     

       97
       +
       If you run a Linux distribution that uses systemd, you can use the provided

     

       98
       +
       service file to run the server. Copy

     

       99
       +
       [`knotserver.service`](https://tangled.sh/did:plc:wshs7t2adsemcrrd4snkeqli/core/blob/master/systemd/knotserver.service)

     

       100
       +
       to `/etc/systemd/system/`. Then, run:

     

       101
       +
       

     

       102
       +
       ```

     

       103
       +
       systemctl enable knotserver

     

       104
       +
       systemctl start knotserver

     

       105
       +
       ```

     

       106
       +
       

     

       107
       +
       You should now have a running knot server! You can finalize your registration by hitting the

     

       108
       +
       `initialize` button on the [/knots](/knots) page.

+25 -14

flake.lock

···

       32
        
               "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js"

     

       33
        
             }

     

       34
        
           },

     

       35
       -
           "ia-fonts-src": {

     

       36
        
             "flake": false,

     

       37
        
             "locked": {

     

       38
       -
               "lastModified": 1686932517,

     

       39
       -
               "narHash": "sha256-2T165nFfCzO65/PIHauJA//S+zug5nUwPcg8NUEydfc=",

     

       40
       -
               "owner": "iaolo",

     

       41
       -
               "repo": "iA-Fonts",

     

       42
       -
               "rev": "f32c04c3058a75d7ce28919ce70fe8800817491b",

     

       43
       -
               "type": "github"

     

       44
        
             },

     

       45
        
             "original": {

     

       46
       -
               "owner": "iaolo",

     

       47
       -
               "repo": "iA-Fonts",

     

       48
       -
               "type": "github"

     

       49
        
             }

     

       50
        
           },

     

       51
        
           "indigo": {

     
···

       64
        
               "type": "github"

     

       65
        
             }

     

       66
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       67
        
           "lucide-src": {

     

       68
        
             "flake": false,

     

       69
        
             "locked": {

     
···

       79
        
           },

     

       80
        
           "nixpkgs": {

     

       81
        
             "locked": {

     

       82
       -
               "lastModified": 1742268799,

     

       83
       -
               "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",

     

       84
        
               "owner": "nixos",

     

       85
        
               "repo": "nixpkgs",

     

       86
       -
               "rev": "da044451c6a70518db5b730fe277b70f494188f1",

     

       87
        
               "type": "github"

     

       88
        
             },

     

       89
        
             "original": {

     
···

       97
        
             "inputs": {

     

       98
        
               "gitignore": "gitignore",

     

       99
        
               "htmx-src": "htmx-src",

     

       100
       -
               "ia-fonts-src": "ia-fonts-src",

     

       101
        
               "indigo": "indigo",

     

       0
        
       
     

       102
        
               "lucide-src": "lucide-src",

     

       103
        
               "nixpkgs": "nixpkgs"

     

       104
        
             }

···

       32
        
               "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js"

     

       33
        
             }

     

       34
        
           },

     

       35
       +
           "ibm-plex-mono-src": {

     

       36
        
             "flake": false,

     

       37
        
             "locked": {

     

       38
       +
               "lastModified": 1731402384,

     

       39
       +
               "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=",

     

       40
       +
               "type": "tarball",

     

       41
       +
               "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"

     

       0
        
       
     

       0
        
       
     

       42
        
             },

     

       43
        
             "original": {

     

       44
       +
               "type": "tarball",

     

       45
       +
               "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"

     

       0
        
       
     

       46
        
             }

     

       47
        
           },

     

       48
        
           "indigo": {

     
···

       61
        
               "type": "github"

     

       62
        
             }

     

       63
        
           },

     

       64
       +
           "inter-fonts-src": {

     

       65
       +
             "flake": false,

     

       66
       +
             "locked": {

     

       67
       +
               "lastModified": 1731687360,

     

       68
       +
               "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=",

     

       69
       +
               "type": "tarball",

     

       70
       +
               "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"

     

       71
       +
             },

     

       72
       +
             "original": {

     

       73
       +
               "type": "tarball",

     

       74
       +
               "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"

     

       75
       +
             }

     

       76
       +
           },

     

       77
        
           "lucide-src": {

     

       78
        
             "flake": false,

     

       79
        
             "locked": {

     
···

       89
        
           },

     

       90
        
           "nixpkgs": {

     

       91
        
             "locked": {

     

       92
       +
               "lastModified": 1743813633,

     

       93
       +
               "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",

     

       94
        
               "owner": "nixos",

     

       95
        
               "repo": "nixpkgs",

     

       96
       +
               "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",

     

       97
        
               "type": "github"

     

       98
        
             },

     

       99
        
             "original": {

     
···

       107
        
             "inputs": {

     

       108
        
               "gitignore": "gitignore",

     

       109
        
               "htmx-src": "htmx-src",

     

       110
       +
               "ibm-plex-mono-src": "ibm-plex-mono-src",

     

       111
        
               "indigo": "indigo",

     

       112
       +
               "inter-fonts-src": "inter-fonts-src",

     

       113
        
               "lucide-src": "lucide-src",

     

       114
        
               "nixpkgs": "nixpkgs"

     

       115
        
             }

+20 -9

flake.nix

···

       15
        
             url = "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip";

     

       16
        
             flake = false;

     

       17
        
           };

     

       18
       -
           ia-fonts-src = {

     

       19
       -
             url = "github:iaolo/iA-Fonts";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
             flake = false;

     

       21
        
           };

     

       22
        
           gitignore = {

     
···

       32
        
           htmx-src,

     

       33
        
           lucide-src,

     

       34
        
           gitignore,

     

       35
       -
           ia-fonts-src,

     

       0
        
       
     

       36
        
         }: let

     

       37
        
           supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];

     

       38
        
           forAllSystems = nixpkgs.lib.genAttrs supportedSystems;

     
···

       74
        
                   mkdir -p appview/pages/static/{fonts,icons}

     

       75
        
                   cp -f ${htmx-src} appview/pages/static/htmx.min.js

     

       76
        
                   cp -rf ${lucide-src}/*.svg appview/pages/static/icons/

     

       77
       -
                   cp -f ${ia-fonts-src}/"iA Writer Quattro"/Static/*.ttf appview/pages/static/fonts/

     

       78
       -
                   cp -f ${ia-fonts-src}/"iA Writer Mono"/Static/*.ttf appview/pages/static/fonts/

     

       0
        
       
     

       79
        
                   ${pkgs.tailwindcss}/bin/tailwindcss -i input.css -o appview/pages/static/tw.css

     

       80
        
                   popd

     

       81
        
                 '';

     
···

       153
        
                 mkdir -p appview/pages/static/{fonts,icons}

     

       154
        
                 cp -f ${htmx-src} appview/pages/static/htmx.min.js

     

       155
        
                 cp -rf ${lucide-src}/*.svg appview/pages/static/icons/

     

       156
       -
                 cp -f ${ia-fonts-src}/"iA Writer Quattro"/Static/*.ttf appview/pages/static/fonts/

     

       157
       -
                 cp -f ${ia-fonts-src}/"iA Writer Mono"/Static/*.ttf appview/pages/static/fonts/

     

       0
        
       
     

       158
        
               '';

     

       159
        
             };

     

       160
        
           });

     
···

       408
        
                 virtualisation.cores = 2;

     

       409
        
                 services.getty.autologinUser = "root";

     

       410
        
                 environment.systemPackages = with pkgs; [curl vim git];

     

       411
       -
                 systemd.tmpfiles.rules = [

     

       412
       -
                   "w /var/lib/knotserver/secret 0660 git git - KNOT_SERVER_SECRET=6995e040e80e2d593b5e5e9ca611a70140b9ef8044add0a28b48b1ee34aa3e85"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       413
        
                 ];

     

       414
        
                 services.tangled-knotserver = {

     

       415
        
                   enable = true;

···

       15
        
             url = "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip";

     

       16
        
             flake = false;

     

       17
        
           };

     

       18
       +
           inter-fonts-src = {

     

       19
       +
             url = "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip";

     

       20
       +
             flake = false;

     

       21
       +
           };

     

       22
       +
           ibm-plex-mono-src = {

     

       23
       +
             url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-mono%401.1.0/ibm-plex-mono.zip";

     

       24
        
             flake = false;

     

       25
        
           };

     

       26
        
           gitignore = {

     
···

       36
        
           htmx-src,

     

       37
        
           lucide-src,

     

       38
        
           gitignore,

     

       39
       +
           inter-fonts-src,

     

       40
       +
           ibm-plex-mono-src,

     

       41
        
         }: let

     

       42
        
           supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];

     

       43
        
           forAllSystems = nixpkgs.lib.genAttrs supportedSystems;

     
···

       79
        
                   mkdir -p appview/pages/static/{fonts,icons}

     

       80
        
                   cp -f ${htmx-src} appview/pages/static/htmx.min.js

     

       81
        
                   cp -rf ${lucide-src}/*.svg appview/pages/static/icons/

     

       82
       +
                   cp -f ${inter-fonts-src}/web/InterVariable*.woff2 appview/pages/static/fonts/

     

       83
       +
                   cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/

     

       84
       +
                   cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 appview/pages/static/fonts/

     

       85
        
                   ${pkgs.tailwindcss}/bin/tailwindcss -i input.css -o appview/pages/static/tw.css

     

       86
        
                   popd

     

       87
        
                 '';

     
···

       159
        
                 mkdir -p appview/pages/static/{fonts,icons}

     

       160
        
                 cp -f ${htmx-src} appview/pages/static/htmx.min.js

     

       161
        
                 cp -rf ${lucide-src}/*.svg appview/pages/static/icons/

     

       162
       +
                 cp -f ${inter-fonts-src}/web/InterVariable*.woff2 appview/pages/static/fonts/

     

       163
       +
                 cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/

     

       164
       +
                 cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 appview/pages/static/fonts/

     

       165
        
               '';

     

       166
        
             };

     

       167
        
           });

     
···

       415
        
                 virtualisation.cores = 2;

     

       416
        
                 services.getty.autologinUser = "root";

     

       417
        
                 environment.systemPackages = with pkgs; [curl vim git];

     

       418
       +
                 systemd.tmpfiles.rules = let

     

       419
       +
                   u = config.services.tangled-knotserver.gitUser;

     

       420
       +
                   g = config.services.tangled-knotserver.gitUser;

     

       421
       +
                 in [

     

       422
       +
                   "d /var/lib/knotserver 0770 ${u} ${g} - -" # Create the directory first

     

       423
       +
                   "f+ /var/lib/knotserver/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=5b42390da4c6659f34c9a545adebd8af82c4a19960d735f651e3d582623ba9f2"

     

       424
        
                 ];

     

       425
        
                 services.tangled-knotserver = {

     

       426
        
                   enable = true;

+1 -1

go.mod

···

       26
        
       	github.com/sethvargo/go-envconfig v1.1.0

     

       27
        
       	github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e

     

       28
        
       	github.com/yuin/goldmark v1.4.13

     

       29
       -
       	golang.org/x/crypto v0.36.0

     

       30
        
       	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028

     

       31
        
       )

     

       32
        
       

     
···

       107
        
       	go.uber.org/atomic v1.11.0 // indirect

     

       108
        
       	go.uber.org/multierr v1.11.0 // indirect

     

       109
        
       	go.uber.org/zap v1.26.0 // indirect

     

       0
        
       
     

       110
        
       	golang.org/x/net v0.37.0 // indirect

     

       111
        
       	golang.org/x/sys v0.31.0 // indirect

     

       112
        
       	golang.org/x/time v0.5.0 // indirect

···

       26
        
       	github.com/sethvargo/go-envconfig v1.1.0

     

       27
        
       	github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e

     

       28
        
       	github.com/yuin/goldmark v1.4.13

     

       0
        
       
     

       29
        
       	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028

     

       30
        
       )

     

       31
        
       

     
···

       106
        
       	go.uber.org/atomic v1.11.0 // indirect

     

       107
        
       	go.uber.org/multierr v1.11.0 // indirect

     

       108
        
       	go.uber.org/zap v1.26.0 // indirect

     

       109
       +
       	golang.org/x/crypto v0.36.0 // indirect

     

       110
        
       	golang.org/x/net v0.37.0 // indirect

     

       111
        
       	golang.org/x/sys v0.31.0 // indirect

     

       112
        
       	golang.org/x/time v0.5.0 // indirect

+14 -80

input.css

···

       3
        
       @tailwind utilities;

     

       4
        
       @layer base {

     

       5
        
           @font-face {

     

       6
       -
               font-family: "iA Writer Quattro S";

     

       7
       -
               src: url("/static/fonts/iAWriterQuattroS-Regular.ttf")

     

       8
       -
                   format("truetype");

     

       9
        
               font-weight: normal;

     

       10
        
               font-style: normal;

     

       11
        
               font-display: swap;

     

       12
       -
               font-feature-settings:

     

       13
       -
                   "calt" 1,

     

       14
       -
                   "kern" 1;

     

       15
        
           }

     

       16
       -
           @font-face {

     

       17
       -
               font-family: "iA Writer Quattro S";

     

       18
       -
               src: url("/static/fonts/iAWriterQuattroS-Bold.ttf") format("truetype");

     

       19
       -
               font-weight: bold;

     

       20
       -
               font-style: normal;

     

       21
       -
               font-display: swap;

     

       22
       -
               font-feature-settings:

     

       23
       -
                   "calt" 1,

     

       24
       -
                   "kern" 1;

     

       25
       -
           }

     

       26
        
           @font-face {

     

       27
       -
               font-family: "iA Writer Quattro S";

     

       28
       -
               src: url("/static/fonts/iAWriterQuattroS-Italic.ttf") format("truetype");

     

       29
        
               font-weight: normal;

     

       30
        
               font-style: italic;

     

       31
        
               font-display: swap;

     

       32
       -
               font-feature-settings:

     

       33
       -
                   "calt" 1,

     

       34
       -
                   "kern" 1;

     

       35
       -
           }

     

       36
       -
           @font-face {

     

       37
       -
               font-family: "iA Writer Quattro S";

     

       38
       -
               src: url("/static/fonts/iAWriterQuattroS-BoldItalic.ttf")

     

       39
       -
                   format("truetype");

     

       40
       -
               font-weight: bold;

     

       41
       -
               font-style: italic;

     

       42
       -
               font-display: swap;

     

       43
       -
               font-feature-settings:

     

       44
       -
                   "calt" 1,

     

       45
       -
                   "kern" 1;

     

       46
        
           }

     

       47
        
       

     

       48
        
           @font-face {

     

       49
       -
               font-family: "iA Writer Mono S";

     

       50
       -
               src: url("/static/fonts/iAWriterMonoS-Regular.ttf") format("truetype");

     

       51
       -
               font-weight: normal;

     

       52
       -
               font-style: normal;

     

       53
       -
               font-display: swap;

     

       54
       -
               font-feature-settings:

     

       55
       -
                   "calt" 1,

     

       56
       -
                   "kern" 1;

     

       57
       -
           }

     

       58
       -
           @font-face {

     

       59
       -
               font-family: "iA Writer Mono S";

     

       60
       -
               src: url("/static/fonts/iAWriterMonoS-Bold.ttf") format("truetype");

     

       61
       -
               font-weight: bold;

     

       62
       -
               font-style: normal;

     

       63
       -
               font-display: swap;

     

       64
       -
               font-feature-settings:

     

       65
       -
                   "calt" 1,

     

       66
       -
                   "kern" 1;

     

       67
       -
           }

     

       68
       -
           @font-face {

     

       69
       -
               font-family: "iA Writer Mono S";

     

       70
       -
               src: url("/static/fonts/iAWriterMonoS-Italic.ttf") format("truetype");

     

       71
        
               font-weight: normal;

     

       72
        
               font-style: italic;

     

       73
        
               font-display: swap;

     

       74
       -
               font-feature-settings:

     

       75
       -
                   "calt" 1,

     

       76
       -
                   "kern" 1;

     

       77
       -
           }

     

       78
       -
           @font-face {

     

       79
       -
               font-family: "iA Writer Mono S";

     

       80
       -
               src: url("/static/fonts/iAWriterMonoS-BoldItalic.ttf")

     

       81
       -
                   format("truetype");

     

       82
       -
               font-weight: bold;

     

       83
       -
               font-style: italic;

     

       84
       -
               font-display: swap;

     

       85
       -
               font-feature-settings:

     

       86
       -
                   "calt" 1,

     

       87
       -
                   "kern" 1;

     

       88
        
           }

     

       89
        
       

     

       90
       -
           @font-face {

     

       91
       -
               font-family: "Inter";

     

       92
       -
               font-style: normal;

     

       93
       -
               font-weight: 400;

     

       94
       -
               font-display: swap;

     

       95
       -
               font-feature-settings:

     

       96
       -
                   "calt" 1,

     

       97
       -
                   "kern" 1;

     

       98
       -
           }

     

       99
        
           ::selection {

     

       100
        
               @apply bg-yellow-400 text-black bg-opacity-30 dark:bg-yellow-600 dark:bg-opacity-50 dark:text-white;

     

       101
        
           }

     

       102
        
       

     

       103
        
           @layer base {

     

       104
        
               html {

     

       105
       -
                   letter-spacing: -0.01em;

     

       106
       -
                   word-spacing: -0.07em;

     

       107
       -
                   font-size: 14px;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       108
        
               }

     

       0
        
       
     

       109
        
               a {

     

       110
        
                   @apply no-underline text-black hover:underline hover:text-gray-800 dark:text-white dark:hover:text-gray-300;

     

       111
        
               }

···

       3
        
       @tailwind utilities;

     

       4
        
       @layer base {

     

       5
        
           @font-face {

     

       6
       +
               font-family: "InterVariable";

     

       7
       +
               src: url("/static/fonts/InterVariable.woff2") format("woff2");

     

       0
        
       
     

       8
        
               font-weight: normal;

     

       9
        
               font-style: normal;

     

       10
        
               font-display: swap;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
           }

     

       12
       +
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
           @font-face {

     

       14
       +
               font-family: "InterVariable";

     

       15
       +
               src: url("/static/fonts/InterVariable-Italic.woff2") format("woff2");

     

       16
        
               font-weight: normal;

     

       17
        
               font-style: italic;

     

       18
        
               font-display: swap;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
           }

     

       20
        
       

     

       21
        
           @font-face {

     

       22
       +
               font-family: "IBMPlexMono";

     

       23
       +
               src: url("/static/fonts/IBMPlexMono-Regular.woff2") format("woff2");

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
               font-weight: normal;

     

       25
        
               font-style: italic;

     

       26
        
               font-display: swap;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
           }

     

       28
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       29
        
           ::selection {

     

       30
        
               @apply bg-yellow-400 text-black bg-opacity-30 dark:bg-yellow-600 dark:bg-opacity-50 dark:text-white;

     

       31
        
           }

     

       32
        
       

     

       33
        
           @layer base {

     

       34
        
               html {

     

       35
       +
                   font-size: 15px;

     

       36
       +
               }

     

       37
       +
               @supports (font-variation-settings: normal) {

     

       38
       +
                 html {

     

       39
       +
                   font-feature-settings: 'ss01' 1, 'kern' 1, 'liga' 1, 'cv05' 1, 'tnum' 1;

     

       40
       +
                 }

     

       41
        
               }

     

       42
       +
       

     

       43
        
               a {

     

       44
        
                   @apply no-underline text-black hover:underline hover:text-gray-800 dark:text-white dark:hover:text-gray-300;

     

       45
        
               }

+24 -12

knotserver/git/diff.go

···

       86
        
       	return &nd, nil

     

       87
        
       }

     

       88
        
       

     

       89
       -
       func (g *GitRepo) DiffTree(rev1, rev2 string) (*types.DiffTree, error) {

     

       90
       -
       	commit1, err := g.resolveRevision(rev1)

     

       91
       -
       	if err != nil {

     

       92
       -
       		return nil, fmt.Errorf("Invalid revision: %s", rev1)

     

       93
       -
       	}

     

       94
       -
       

     

       95
       -
       	commit2, err := g.resolveRevision(rev2)

     

       96
       -
       	if err != nil {

     

       97
       -
       		return nil, fmt.Errorf("Invalid revision: %s", rev2)

     

       98
       -
       	}

     

       99
       -
       

     

       100
        
       	tree1, err := commit1.Tree()

     

       101
        
       	if err != nil {

     

       102
        
       		return nil, err

     
···

       130
        
       	}, nil

     

       131
        
       }

     

       132
        
       

     

       133
       -
       func (g *GitRepo) resolveRevision(revStr string) (*object.Commit, error) {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       134
        
       	rev, err := g.r.ResolveRevision(plumbing.Revision(revStr))

     

       135
        
       	if err != nil {

     

       136
        
       		return nil, fmt.Errorf("resolving revision %s: %w", revStr, err)

···

       86
        
       	return &nd, nil

     

       87
        
       }

     

       88
        
       

     

       89
       +
       func (g *GitRepo) DiffTree(commit1, commit2 *object.Commit) (*types.DiffTree, error) {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       90
        
       	tree1, err := commit1.Tree()

     

       91
        
       	if err != nil {

     

       92
        
       		return nil, err

     
···

       120
        
       	}, nil

     

       121
        
       }

     

       122
        
       

     

       123
       +
       func (g *GitRepo) MergeBase(commit1, commit2 *object.Commit) (*object.Commit, error) {

     

       124
       +
       	isAncestor, err := commit1.IsAncestor(commit2)

     

       125
       +
       	if err != nil {

     

       126
       +
       		return nil, err

     

       127
       +
       	}

     

       128
       +
       

     

       129
       +
       	if isAncestor {

     

       130
       +
       		return commit1, nil

     

       131
       +
       	}

     

       132
       +
       

     

       133
       +
       	mergeBase, err := commit1.MergeBase(commit2)

     

       134
       +
       	if err != nil {

     

       135
       +
       		return nil, err

     

       136
       +
       	}

     

       137
       +
       

     

       138
       +
       	if len(mergeBase) == 0 {

     

       139
       +
       		return nil, fmt.Errorf("failed to find a merge-base")

     

       140
       +
       	}

     

       141
       +
       

     

       142
       +
       	return mergeBase[0], nil

     

       143
       +
       }

     

       144
       +
       

     

       145
       +
       func (g *GitRepo) ResolveRevision(revStr string) (*object.Commit, error) {

     

       146
        
       	rev, err := g.r.ResolveRevision(plumbing.Revision(revStr))

     

       147
        
       	if err != nil {

     

       148
        
       		return nil, fmt.Errorf("resolving revision %s: %w", revStr, err)

+30 -1

knotserver/routes.go

···

       617
        
       		return

     

       618
        
       	}

     

       619
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       620
        
       	w.WriteHeader(http.StatusNoContent)

     

       621
        
       }

     

       622
        
       

     
···

       775
        
       		return

     

       776
        
       	}

     

       777
        
       

     

       778
       -
       	difftree, err := gr.DiffTree(rev1, rev2)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       779
        
       	if err != nil {

     

       780
        
       		l.Error("error comparing revisions", "msg", err.Error())

     

       781
        
       		writeError(w, "error comparing revisions", http.StatusBadRequest)

···

       617
        
       		return

     

       618
        
       	}

     

       619
        
       

     

       620
       +
       	// add perms for this user to access the repo

     

       621
       +
       	err = h.e.AddRepo(did, ThisServer, relativeRepoPath)

     

       622
       +
       	if err != nil {

     

       623
       +
       		l.Error("adding repo permissions", "error", err.Error())

     

       624
       +
       		writeError(w, err.Error(), http.StatusInternalServerError)

     

       625
       +
       		return

     

       626
       +
       	}

     

       627
       +
       

     

       628
        
       	w.WriteHeader(http.StatusNoContent)

     

       629
        
       }

     

       630
        
       

     
···

       783
        
       		return

     

       784
        
       	}

     

       785
        
       

     

       786
       +
       	commit1, err := gr.ResolveRevision(rev1)

     

       787
       +
       	if err != nil {

     

       788
       +
       		l.Error("error resolving revision 1", "msg", err.Error())

     

       789
       +
       		writeError(w, fmt.Sprintf("error resolving revision %s", rev1), http.StatusBadRequest)

     

       790
       +
       		return

     

       791
       +
       	}

     

       792
       +
       

     

       793
       +
       	commit2, err := gr.ResolveRevision(rev2)

     

       794
       +
       	if err != nil {

     

       795
       +
       		l.Error("error resolving revision 2", "msg", err.Error())

     

       796
       +
       		writeError(w, fmt.Sprintf("error resolving revision %s", rev2), http.StatusBadRequest)

     

       797
       +
       		return

     

       798
       +
       	}

     

       799
       +
       

     

       800
       +
       	mergeBase, err := gr.MergeBase(commit1, commit2)

     

       801
       +
       	if err != nil {

     

       802
       +
       		l.Error("failed to find merge-base", "msg", err.Error())

     

       803
       +
       		writeError(w, "failed to calculate diff", http.StatusBadRequest)

     

       804
       +
       		return

     

       805
       +
       	}

     

       806
       +
       

     

       807
       +
       	difftree, err := gr.DiffTree(mergeBase, commit2)

     

       808
        
       	if err != nil {

     

       809
        
       		l.Error("error comparing revisions", "msg", err.Error())

     

       810
        
       		writeError(w, "error comparing revisions", http.StatusBadRequest)

+55 -34

rbac/rbac.go

···

       3
        
       import (

     

       4
        
       	"database/sql"

     

       5
        
       	"fmt"

     

       6
       -
       	"path"

     

       7
        
       	"strings"

     

       8
        
       

     

       9
        
       	adapter "github.com/Blank-Xu/sql-adapter"

     
···

       26
        
       e = some(where (p.eft == allow))

     

       27
        
       

     

       28
        
       [matchers]

     

       29
       -
       m = r.act == p.act && r.dom == p.dom && keyMatch2(r.obj, p.obj) && g(r.sub, p.sub, r.dom)

     

       30
        
       `

     

       31
        
       )

     

       32
        
       

     
···

       34
        
       	E *casbin.Enforcer

     

       35
        
       }

     

       36
        
       

     

       37
       -
       func keyMatch2(key1 string, key2 string) bool {

     

       38
       -
       	matched, _ := path.Match(key2, key1)

     

       39
       -
       	return matched

     

       40
       -
       }

     

       41
       -
       

     

       42
        
       func NewEnforcer(path string) (*Enforcer, error) {

     

       43
        
       	m, err := model.NewModelFromString(Model)

     

       44
        
       	if err != nil {

     
···

       61
        
       	}

     

       62
        
       

     

       63
        
       	e.EnableAutoSave(false)

     

       64
       -
       

     

       65
       -
       	e.AddFunction("keyMatch2", keyMatch2Func)

     

       66
        
       

     

       67
        
       	return &Enforcer{e}, nil

     

       68
        
       }

     
···

       96
        
       	return err

     

       97
        
       }

     

       98
        
       

     

       99
       -
       func (e *Enforcer) AddRepo(member, domain, repo string) error {

     

       100
       -
       	// sanity check, repo must be of the form ownerDid/repo

     

       101
       -
       	if parts := strings.SplitN(repo, "/", 2); !strings.HasPrefix(parts[0], "did:") {

     

       102
       -
       		return fmt.Errorf("invalid repo: %s", repo)

     

       103
       -
       	}

     

       104
       -
       

     

       105
       -
       	_, err := e.E.AddPolicies([][]string{

     

       106
        
       		{member, domain, repo, "repo:settings"},

     

       107
        
       		{member, domain, repo, "repo:push"},

     

       108
        
       		{member, domain, repo, "repo:owner"},

     

       109
        
       		{member, domain, repo, "repo:invite"},

     

       110
        
       		{member, domain, repo, "repo:delete"},

     

       111
        
       		{"server:owner", domain, repo, "repo:delete"}, // server owner can delete any repo

     

       112
       -
       	})

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       113
        
       	return err

     

       114
        
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       115
        
       

     

       116
        
       func (e *Enforcer) AddCollaborator(collaborator, domain, repo string) error {

     

       117
       -
       	// sanity check, repo must be of the form ownerDid/repo

     

       118
       -
       	if parts := strings.SplitN(repo, "/", 2); !strings.HasPrefix(parts[0], "did:") {

     

       119
       -
       		return fmt.Errorf("invalid repo: %s", repo)

     

       120
        
       	}

     

       121
        
       

     

       122
       -
       	_, err := e.E.AddPolicies([][]string{

     

       123
       -
       		{collaborator, domain, repo, "repo:collaborator"},

     

       124
       -
       		{collaborator, domain, repo, "repo:settings"},

     

       125
       -
       		{collaborator, domain, repo, "repo:push"},

     

       126
       -
       	})

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       127
        
       	return err

     

       128
        
       }

     

       129
        
       

     
···

       165
        
       	return e.E.Enforce(user, domain, repo, "repo:settings")

     

       166
        
       }

     

       167
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       168
        
       // given a repo, what permissions does this user have? repo:owner? repo:invite? etc.

     

       169
        
       func (e *Enforcer) GetPermissionsInRepo(user, domain, repo string) []string {

     

       170
        
       	var permissions []string

     
···

       179
        
       	return permissions

     

       180
        
       }

     

       181
        
       

     

       182
       -
       func (e *Enforcer) IsCollaboratorInviteAllowed(user, domain, repo string) (bool, error) {

     

       183
       -
       	return e.E.Enforce(user, domain, repo, "repo:invite")

     

       184
       -
       }

     

       0
        
       
     

       0
        
       
     

       185
        
       

     

       186
       -
       // keyMatch2Func is a wrapper for keyMatch2 to make it compatible with Casbin

     

       187
       -
       func keyMatch2Func(args ...interface{}) (interface{}, error) {

     

       188
       -
       	name1 := args[0].(string)

     

       189
       -
       	name2 := args[1].(string)

     

       190
       -
       

     

       191
       -
       	return keyMatch2(name1, name2), nil

     

       192
        
       }

···

       3
        
       import (

     

       4
        
       	"database/sql"

     

       5
        
       	"fmt"

     

       0
        
       
     

       6
        
       	"strings"

     

       7
        
       

     

       8
        
       	adapter "github.com/Blank-Xu/sql-adapter"

     
···

       25
        
       e = some(where (p.eft == allow))

     

       26
        
       

     

       27
        
       [matchers]

     

       28
       +
       m = r.act == p.act && r.dom == p.dom && r.obj == p.obj && g(r.sub, p.sub, r.dom)

     

       29
        
       `

     

       30
        
       )

     

       31
        
       

     
···

       33
        
       	E *casbin.Enforcer

     

       34
        
       }

     

       35
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       36
        
       func NewEnforcer(path string) (*Enforcer, error) {

     

       37
        
       	m, err := model.NewModelFromString(Model)

     

       38
        
       	if err != nil {

     
···

       55
        
       	}

     

       56
        
       

     

       57
        
       	e.EnableAutoSave(false)

     

       0
        
       
     

       0
        
       
     

       58
        
       

     

       59
        
       	return &Enforcer{e}, nil

     

       60
        
       }

     
···

       88
        
       	return err

     

       89
        
       }

     

       90
        
       

     

       91
       +
       func repoPolicies(member, domain, repo string) [][]string {

     

       92
       +
       	return [][]string{

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       93
        
       		{member, domain, repo, "repo:settings"},

     

       94
        
       		{member, domain, repo, "repo:push"},

     

       95
        
       		{member, domain, repo, "repo:owner"},

     

       96
        
       		{member, domain, repo, "repo:invite"},

     

       97
        
       		{member, domain, repo, "repo:delete"},

     

       98
        
       		{"server:owner", domain, repo, "repo:delete"}, // server owner can delete any repo

     

       99
       +
       	}

     

       100
       +
       }

     

       101
       +
       func (e *Enforcer) AddRepo(member, domain, repo string) error {

     

       102
       +
       	err := checkRepoFormat(repo)

     

       103
       +
       	if err != nil {

     

       104
       +
       		return err

     

       105
       +
       	}

     

       106
       +
       

     

       107
       +
       	_, err = e.E.AddPolicies(repoPolicies(member, domain, repo))

     

       108
        
       	return err

     

       109
        
       }

     

       110
       +
       func (e *Enforcer) RemoveRepo(member, domain, repo string) error {

     

       111
       +
       	err := checkRepoFormat(repo)

     

       112
       +
       	if err != nil {

     

       113
       +
       		return err

     

       114
       +
       	}

     

       115
       +
       

     

       116
       +
       	_, err = e.E.RemovePolicies(repoPolicies(member, domain, repo))

     

       117
       +
       	return err

     

       118
       +
       }

     

       119
       +
       

     

       120
       +
       var (

     

       121
       +
       	collaboratorPolicies = func(collaborator, domain, repo string) [][]string {

     

       122
       +
       		return [][]string{

     

       123
       +
       			{collaborator, domain, repo, "repo:collaborator"},

     

       124
       +
       			{collaborator, domain, repo, "repo:settings"},

     

       125
       +
       			{collaborator, domain, repo, "repo:push"},

     

       126
       +
       		}

     

       127
       +
       	}

     

       128
       +
       )

     

       129
        
       

     

       130
        
       func (e *Enforcer) AddCollaborator(collaborator, domain, repo string) error {

     

       131
       +
       	err := checkRepoFormat(repo)

     

       132
       +
       	if err != nil {

     

       133
       +
       		return err

     

       134
        
       	}

     

       135
        
       

     

       136
       +
       	_, err = e.E.AddPolicies(collaboratorPolicies(collaborator, domain, repo))

     

       137
       +
       	return err

     

       138
       +
       }

     

       139
       +
       

     

       140
       +
       func (e *Enforcer) RemoveCollaborator(collaborator, domain, repo string) error {

     

       141
       +
       	err := checkRepoFormat(repo)

     

       142
       +
       	if err != nil {

     

       143
       +
       		return err

     

       144
       +
       	}

     

       145
       +
       

     

       146
       +
       	_, err = e.E.RemovePolicies(collaboratorPolicies(collaborator, domain, repo))

     

       147
        
       	return err

     

       148
        
       }

     

       149
        
       

     
···

       185
        
       	return e.E.Enforce(user, domain, repo, "repo:settings")

     

       186
        
       }

     

       187
        
       

     

       188
       +
       func (e *Enforcer) IsCollaboratorInviteAllowed(user, domain, repo string) (bool, error) {

     

       189
       +
       	return e.E.Enforce(user, domain, repo, "repo:invite")

     

       190
       +
       }

     

       191
       +
       

     

       192
        
       // given a repo, what permissions does this user have? repo:owner? repo:invite? etc.

     

       193
        
       func (e *Enforcer) GetPermissionsInRepo(user, domain, repo string) []string {

     

       194
        
       	var permissions []string

     
···

       203
        
       	return permissions

     

       204
        
       }

     

       205
        
       

     

       206
       +
       func checkRepoFormat(repo string) error {

     

       207
       +
       	// sanity check, repo must be of the form ownerDid/repo

     

       208
       +
       	if parts := strings.SplitN(repo, "/", 2); !strings.HasPrefix(parts[0], "did:") {

     

       209
       +
       		return fmt.Errorf("invalid repo: %s", repo)

     

       210
       +
       	}

     

       211
        
       

     

       212
       +
       	return nil

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       213
        
       }

+8 -89

readme.md

···

       6
        
       

     

       7
        
       Read the introduction to Tangled [here](https://blog.tangled.sh/intro).

     

       8
        
       

     

       9
       -
       ## knot self-hosting guide

     

       10
        
       

     

       11
       -
       So you want to run your own knot server? Great! Here are a few prerequisites:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
       

     

       13
       -
       1. A server of some kind (a VPS, a Raspberry Pi, etc.). Preferably running a Linux of some kind.

     

       14
       -
       2. A (sub)domain name. People generally use `knot.example.com`.

     

       15
       -
       3. A valid SSL certificate for your domain.

     

       16
        
       

     

       17
       -
       There's a couple of ways to get started:

     

       18
       -
       * NixOS: refer to [flake.nix](https://tangled.sh/@tangled.sh/core/blob/master/flake.nix)

     

       19
       -
       * Manual: Documented below.

     

       20
       -
       

     

       21
       -
       ### manual setup

     

       22
       -
       

     

       23
       -
       First, clone this repository:

     

       24
       -
       

     

       25
       -
       ```

     

       26
       -
       git clone https://tangled.sh/@tangled.sh/core

     

       27
       -
       ```

     

       28
       -
       

     

       29
       -
       Then, build our binaries (you need to have Go installed):

     

       30
       -
       * `knotserver`: the main server program

     

       31
       -
       * `keyfetch`: utility to fetch ssh pubkeys

     

       32
       -
       * `repoguard`: enforces repository access control

     

       33
       -
       

     

       34
       -
       ```

     

       35
       -
       cd core

     

       36
       -
       export CGO_ENABLED=1

     

       37
       -
       go build -o knot ./cmd/knotserver

     

       38
       -
       go build -o keyfetch ./cmd/keyfetch

     

       39
       -
       go build -o repoguard ./cmd/repoguard

     

       40
       -
       ```

     

       41
       -
       

     

       42
       -
       Next, move the `keyfetch` binary to a location owned by `root` --

     

       43
       -
       `/usr/local/libexec/tangled-keyfetch` is a good choice:

     

       44
       -
       

     

       45
       -
       ```

     

       46
       -
       sudo mv keyfetch /usr/local/libexec/tangled-keyfetch

     

       47
       -
       sudo chown root:root /usr/local/libexec/tangled-keyfetch

     

       48
       -
       sudo chmod 755 /usr/local/libexec/tangled-keyfetch

     

       49
       -
       ```

     

       50
       -
       

     

       51
       -
       This is necessary because SSH `AuthorizedKeysCommand` requires [really specific

     

       52
       -
       permissions](https://stackoverflow.com/a/27638306). Let's set that up:

     

       53
       -
       

     

       54
       -
       ```

     

       55
       -
       sudo tee /etc/ssh/sshd_config.d/authorized_keys_command.conf <<EOF

     

       56
       -
       Match User git

     

       57
       -
         AuthorizedKeysCommand /usr/local/libexec/tangled-keyfetch

     

       58
       -
         AuthorizedKeysCommandUser nobody

     

       59
       -
       EOF

     

       60
       -
       ```

     

       61
       -
       

     

       62
       -
       Next, create the `git` user:

     

       63
       -
       

     

       64
       -
       ```

     

       65
       -
       sudo adduser git

     

       66
       -
       ```

     

       67
       -
       

     

       68
       -
       Copy the `repoguard` binary to the `git` user's home directory:

     

       69
       -
       

     

       70
       -
       ```

     

       71
       -
       sudo cp repoguard /home/git

     

       72
       -
       sudo chown git:git /home/git/repoguard

     

       73
       -
       ```

     

       74
       -
       

     

       75
       -
       Now, let's set up the server. Copy the `knot` binary to

     

       76
       -
       `/usr/local/bin/knotserver`. Then, create `/home/git/.knot.env` with the

     

       77
       -
       following, updating the values as necessary. The `KNOT_SERVER_SECRET` can be

     

       78
       -
       obtaind from the [/knots](/knots) page on Tangled.

     

       79
       -
       

     

       80
       -
       ```

     

       81
       -
       KNOT_REPO_SCAN_PATH=/home/git

     

       82
       -
       KNOT_SERVER_HOSTNAME=knot.example.com

     

       83
       -
       APPVIEW_ENDPOINT=https://tangled.sh

     

       84
       -
       KNOT_SERVER_SECRET=secret

     

       85
       -
       KNOT_SERVER_INTERNAL_LISTEN_ADDR=127.0.0.1:5444

     

       86
       -
       KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555

     

       87
       -
       ```

     

       88
       -
       

     

       89
       -
       If you run a Linux distribution that uses systemd, you can use the provided

     

       90
       -
       service file to run the server. Copy

     

       91
       -
       [`knotserver.service`](https://tangled.sh/did:plc:wshs7t2adsemcrrd4snkeqli/core/blob/master/systemd/knotserver.service)

     

       92
       -
       to `/etc/systemd/system/`. Then, run:

     

       93
       -
       

     

       94
       -
       ```

     

       95
       -
       systemctl enable knotserver

     

       96
       -
       systemctl start knotserver

     

       97
       -
       ```

     

       98
       -
       

     

       99
       -
       You should now have a running knot server! You can finalize your registration by hitting the

     

       100
       -
       `initialize` button on the [/knots](/knots) page.

···

       6
        
       

     

       7
        
       Read the introduction to Tangled [here](https://blog.tangled.sh/intro).

     

       8
        
       

     

       9
       +
       ## docs

     

       10
        
       

     

       11
       +
       * [knot hosting

     

       12
       +
       guide](https://tangled.sh/@tangled.sh/core/blob/master/docs/knot-hosting.md)

     

       13
       +
       * [contributing

     

       14
       +
       guide](https://tangled.sh/@tangled.sh/core/blob/master/docs/contributing.md)&mdash;**read this before opening a PR!**

     

       15
        
       

     

       16
       +
       ## security

     

       0
        
       
     

       0
        
       
     

       17
        
       

     

       18
       +
       If you've identified a security issue in Tangled, please email

     

       19
       +
       [security@tangled.sh](mailto:security@tangled.sh) with details!

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

+40 -8

tailwind.config.js

···

       13
        
       				md: "600px",

     

       14
        
       				lg: "800px",

     

       15
        
       				xl: "1000px",

     

       16
       -
       				"2xl": "1200px"

     

       17
        
       			},

     

       18
        
       		},

     

       19
        
       		extend: {

     

       20
        
       			fontFamily: {

     

       21
       -
       				sans: ["iA Writer Quattro S", "Inter", "system-ui", "sans-serif", "ui-sans-serif"],

     

       22
       -
       				mono: ["iA Writer Mono S", "ui-monospace", "SFMono-Regular", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", "monospace"],

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
       			},

     

       24
        
       			typography: {

     

       25
        
       				DEFAULT: {

     

       26
        
       					css: {

     

       27
       -
       						maxWidth: 'none',

     

       28
        
       						pre: {

     

       29
        
       							backgroundColor: colors.gray[100],

     

       30
        
       							color: colors.black,

     

       31
       -
         						'@apply dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 dark:border': {}	

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       32
        
       						},

     

       33
        
       					},

     

       34
        
       				},

     

       35
        
       			},

     

       36
        
       		},

     

       37
        
       	},

     

       38
       -
       	plugins: [

     

       39
       -
       		require('@tailwindcss/typography'),

     

       40
       -
       	]

     

       41
        
       };

···

       13
        
       				md: "600px",

     

       14
        
       				lg: "800px",

     

       15
        
       				xl: "1000px",

     

       16
       +
       				"2xl": "1200px",

     

       17
        
       			},

     

       18
        
       		},

     

       19
        
       		extend: {

     

       20
        
       			fontFamily: {

     

       21
       +
       				sans: ["InterVariable", "system-ui", "sans-serif", "ui-sans-serif"],

     

       22
       +
       				mono: [

     

       23
       +
       					"IBMPlexMono",

     

       24
       +
       					"ui-monospace",

     

       25
       +
       					"SFMono-Regular",

     

       26
       +
       					"Menlo",

     

       27
       +
       					"Monaco",

     

       28
       +
       					"Consolas",

     

       29
       +
       					"Liberation Mono",

     

       30
       +
       					"Courier New",

     

       31
       +
       					"monospace",

     

       32
       +
       				],

     

       33
        
       			},

     

       34
        
       			typography: {

     

       35
        
       				DEFAULT: {

     

       36
        
       					css: {

     

       37
       +
       						maxWidth: "none",

     

       38
        
       						pre: {

     

       39
        
       							backgroundColor: colors.gray[100],

     

       40
        
       							color: colors.black,

     

       41
       +
       							"@apply font-normal text-black bg-gray-100 dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 dark:border": {},

     

       42
       +
       						},

     

       43
       +
       						code: {

     

       44
       +
       							"@apply font-normal font-mono p-1 rounded text-black bg-gray-100 dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700": {},

     

       45
       +
       						},

     

       46
       +
       						"code::before": {

     

       47
       +
       							content: '""',

     

       48
       +
       						},

     

       49
       +
       						"code::after": {

     

       50
       +
       							content: '""',

     

       51
       +
       						},

     

       52
       +
       						blockquote: {

     

       53
       +
       							quotes: "none",

     

       54
       +
       						},

     

       55
       +
       						'h1, h2, h3, h4': {

     

       56
       +
       							"@apply mt-4 mb-2": {}

     

       57
       +
       						},

     

       58
       +
       						h1: {

     

       59
       +
       							"@apply mt-3 pb-3 border-b border-gray-300 dark:border-gray-600": {}

     

       60
       +
       						},

     

       61
       +
       						h2: {

     

       62
       +
       							"@apply mt-3 pb-3 border-b border-gray-200 dark:border-gray-700": {}

     

       63
       +
       						},

     

       64
       +
       						h3: {

     

       65
       +
       							"@apply mt-2": {}

     

       66
        
       						},

     

       67
        
       					},

     

       68
        
       				},

     

       69
        
       			},

     

       70
        
       		},

     

       71
        
       	},

     

       72
       +
       	plugins: [require("@tailwindcss/typography")],

     

       0
        
       
     

       0
        
       
     

       73
        
       };

+14

types/diff.go

···

       23
        
       	IsRename      bool                   `json:"is_rename"`

     

       24
        
       }

     

       25
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
       // A nicer git diff representation.

     

       27
        
       type NiceDiff struct {

     

       28
        
       	Commit struct {

···

       23
        
       	IsRename      bool                   `json:"is_rename"`

     

       24
        
       }

     

       25
        
       

     

       26
       +
       type DiffStat struct {

     

       27
       +
       	Insertions int64

     

       28
       +
       	Deletions  int64

     

       29
       +
       }

     

       30
       +
       

     

       31
       +
       func (d *Diff) Stats() DiffStat {

     

       32
       +
       	var stats DiffStat

     

       33
       +
       	for _, f := range d.TextFragments {

     

       34
       +
       		stats.Insertions += f.LinesAdded

     

       35
       +
       		stats.Deletions += f.LinesDeleted

     

       36
       +
       	}

     

       37
       +
       	return stats

     

       38
       +
       }

     

       39
       +
       

     

       40
        
       // A nicer git diff representation.

     

       41
        
       type NiceDiff struct {

     

       42
        
       	Commit struct {

Compare changes