interdiff of round #1 and #0 · pull #660 · tangled.org/core

ERROR

appview/state/router.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/knots/dashboard.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/knots/fragments/addMemberModal.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/knots/fragments/knotListing.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/knots/index.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/fork.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/new.html

Failed to calculate interdiff for this file.

REBASED

docs/knot-hosting.md

This patch was likely rebased, as context lines do not match.

ERROR

appview/pages/templates/spindles/dashboard.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/spindles/fragments/addMemberModal.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/spindles/fragments/spindleListing.html

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/spindles/index.html

Failed to calculate interdiff for this file.

NEW

appview/knots/knots.go

···

       38
        
       	Knotstream *eventconsumer.Consumer

     

       39
        
       }

     

       40
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       41
        
       func (k *Knots) Router() http.Handler {

     

       42
        
       	r := chi.NewRouter()

     

       43
        
       

     
···

       69
        
       	k.Pages.Knots(w, pages.KnotsParams{

     

       70
        
       		LoggedInUser:  user,

     

       71
        
       		Registrations: registrations,

     

       0
        
       
     

       0
        
       
     

       72
        
       	})

     

       73
        
       }

     

       74
        
       

     
···

       131
        
       		Members:      members,

     

       132
        
       		Repos:        repoMap,

     

       133
        
       		IsOwner:      true,

     

       0
        
       
     

       0
        
       
     

       134
        
       	})

     

       135
        
       }

     

       136

···

       38
        
       	Knotstream *eventconsumer.Consumer

     

       39
        
       }

     

       40
        
       

     

       41
       +
       type tab = map[string]any

     

       42
       +
       

     

       43
       +
       var (

     

       44
       +
       	knotsTabs []tab = []tab{

     

       45
       +
       		{"Name": "profile", "Icon": "user"},

     

       46
       +
       		{"Name": "keys", "Icon": "key"},

     

       47
       +
       		{"Name": "emails", "Icon": "mail"},

     

       48
       +
       		{"Name": "notifications", "Icon": "bell"},

     

       49
       +
       		{"Name": "knots", "Icon": "volleyball"},

     

       50
       +
       		{"Name": "spindles", "Icon": "spool"},

     

       51
       +
       	}

     

       52
       +
       )

     

       53
       +
       

     

       54
        
       func (k *Knots) Router() http.Handler {

     

       55
        
       	r := chi.NewRouter()

     

       56
        
       

     
···

       82
        
       	k.Pages.Knots(w, pages.KnotsParams{

     

       83
        
       		LoggedInUser:  user,

     

       84
        
       		Registrations: registrations,

     

       85
       +
       		Tabs: knotsTabs,

     

       86
       +
       		Tab: "knots",

     

       87
        
       	})

     

       88
        
       }

     

       89
        
       

     
···

       146
        
       		Members:      members,

     

       147
        
       		Repos:        repoMap,

     

       148
        
       		IsOwner:      true,

     

       149
       +
       		Tabs:         knotsTabs,

     

       150
       +
       		Tab:          "knots",

     

       151
        
       	})

     

       152
        
       }

     

       153

NEW

appview/pages/pages.go

···

       410
        
       type KnotsParams struct {

     

       411
        
       	LoggedInUser  *oauth.User

     

       412
        
       	Registrations []models.Registration

     

       0
        
       
     

       0
        
       
     

       413
        
       }

     

       414
        
       

     

       415
        
       func (p *Pages) Knots(w io.Writer, params KnotsParams) error {

     
···

       422
        
       	Members      []string

     

       423
        
       	Repos        map[string][]models.Repo

     

       424
        
       	IsOwner      bool

     

       0
        
       
     

       0
        
       
     

       425
        
       }

     

       426
        
       

     

       427
        
       func (p *Pages) Knot(w io.Writer, params KnotParams) error {

     
···

       439
        
       type SpindlesParams struct {

     

       440
        
       	LoggedInUser *oauth.User

     

       441
        
       	Spindles     []models.Spindle

     

       0
        
       
     

       0
        
       
     

       442
        
       }

     

       443
        
       

     

       444
        
       func (p *Pages) Spindles(w io.Writer, params SpindlesParams) error {

     
···

       447
        
       

     

       448
        
       type SpindleListingParams struct {

     

       449
        
       	models.Spindle

     

       0
        
       
     

       0
        
       
     

       450
        
       }

     

       451
        
       

     

       452
        
       func (p *Pages) SpindleListing(w io.Writer, params SpindleListingParams) error {

     
···

       458
        
       	Spindle      models.Spindle

     

       459
        
       	Members      []string

     

       460
        
       	Repos        map[string][]models.Repo

     

       0
        
       
     

       0
        
       
     

       461
        
       }

     

       462
        
       

     

       463
        
       func (p *Pages) SpindleDashboard(w io.Writer, params SpindleDashboardParams) error {

···

       410
        
       type KnotsParams struct {

     

       411
        
       	LoggedInUser  *oauth.User

     

       412
        
       	Registrations []models.Registration

     

       413
       +
       	Tabs         []map[string]any

     

       414
       +
       	Tab          string

     

       415
        
       }

     

       416
        
       

     

       417
        
       func (p *Pages) Knots(w io.Writer, params KnotsParams) error {

     
···

       424
        
       	Members      []string

     

       425
        
       	Repos        map[string][]models.Repo

     

       426
        
       	IsOwner      bool

     

       427
       +
       	Tabs         []map[string]any

     

       428
       +
       	Tab          string

     

       429
        
       }

     

       430
        
       

     

       431
        
       func (p *Pages) Knot(w io.Writer, params KnotParams) error {

     
···

       443
        
       type SpindlesParams struct {

     

       444
        
       	LoggedInUser *oauth.User

     

       445
        
       	Spindles     []models.Spindle

     

       446
       +
       	Tabs         []map[string]any

     

       447
       +
       	Tab          string

     

       448
        
       }

     

       449
        
       

     

       450
        
       func (p *Pages) Spindles(w io.Writer, params SpindlesParams) error {

     
···

       453
        
       

     

       454
        
       type SpindleListingParams struct {

     

       455
        
       	models.Spindle

     

       456
       +
       	Tabs         []map[string]any

     

       457
       +
       	Tab          string

     

       458
        
       }

     

       459
        
       

     

       460
        
       func (p *Pages) SpindleListing(w io.Writer, params SpindleListingParams) error {

     
···

       466
        
       	Spindle      models.Spindle

     

       467
        
       	Members      []string

     

       468
        
       	Repos        map[string][]models.Repo

     

       469
       +
       	Tabs         []map[string]any

     

       470
       +
       	Tab          string

     

       471
        
       }

     

       472
        
       

     

       473
        
       func (p *Pages) SpindleDashboard(w io.Writer, params SpindleDashboardParams) error {

NEW

appview/pages/templates/layouts/fragments/topbar.html

···

       65
        
               <a href="/{{ $user }}">profile</a>

     

       66
        
               <a href="/{{ $user }}?tab=repos">repositories</a>

     

       67
        
               <a href="/{{ $user }}?tab=strings">strings</a>

     

       68
       -
               <a href="/knots">knots</a>

     

       69
       -
               <a href="/spindles">spindles</a>

     

       70
        
               <a href="/settings">settings</a>

     

       71
        
               <a href="#"

     

       72
        
                  hx-post="/logout"

···

       65
        
               <a href="/{{ $user }}">profile</a>

     

       66
        
               <a href="/{{ $user }}?tab=repos">repositories</a>

     

       67
        
               <a href="/{{ $user }}?tab=strings">strings</a>

     

       0
        
       
     

       0
        
       
     

       68
        
               <a href="/settings">settings</a>

     

       69
        
               <a href="#"

     

       70
        
                  hx-post="/logout"

NEW

appview/settings/settings.go

···

       43
        
       		{"Name": "keys", "Icon": "key"},

     

       44
        
       		{"Name": "emails", "Icon": "mail"},

     

       45
        
       		{"Name": "notifications", "Icon": "bell"},

     

       0
        
       
     

       0
        
       
     

       46
        
       	}

     

       47
        
       )

     

       48

···

       43
        
       		{"Name": "keys", "Icon": "key"},

     

       44
        
       		{"Name": "emails", "Icon": "mail"},

     

       45
        
       		{"Name": "notifications", "Icon": "bell"},

     

       46
       +
       		{"Name": "knots", "Icon": "volleyball"},

     

       47
       +
       		{"Name": "spindles", "Icon": "spool"},

     

       48
        
       	}

     

       49
        
       )

     

       50

NEW

appview/spindles/spindles.go

···

       37
        
       	Logger     *slog.Logger

     

       38
        
       }

     

       39
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
       func (s *Spindles) Router() http.Handler {

     

       41
        
       	r := chi.NewRouter()

     

       42
        
       

     
···

       68
        
       	s.Pages.Spindles(w, pages.SpindlesParams{

     

       69
        
       		LoggedInUser: user,

     

       70
        
       		Spindles:     all,

     

       0
        
       
     

       0
        
       
     

       71
        
       	})

     

       72
        
       }

     

       73
        
       

     
···

       126
        
       		Spindle:      spindle,

     

       127
        
       		Members:      members,

     

       128
        
       		Repos:        repoMap,

     

       0
        
       
     

       0
        
       
     

       129
        
       	})

     

       130
        
       }

     

       131

···

       37
        
       	Logger     *slog.Logger

     

       38
        
       }

     

       39
        
       

     

       40
       +
       type tab = map[string]any

     

       41
       +
       

     

       42
       +
       var (

     

       43
       +
       	spindlesTabs []tab = []tab{

     

       44
       +
       		{"Name": "profile", "Icon": "user"},

     

       45
       +
       		{"Name": "keys", "Icon": "key"},

     

       46
       +
       		{"Name": "emails", "Icon": "mail"},

     

       47
       +
       		{"Name": "notifications", "Icon": "bell"},

     

       48
       +
       		{"Name": "knots", "Icon": "volleyball"},

     

       49
       +
       		{"Name": "spindles", "Icon": "spool"},

     

       50
       +
       	}

     

       51
       +
       )

     

       52
       +
       

     

       53
        
       func (s *Spindles) Router() http.Handler {

     

       54
        
       	r := chi.NewRouter()

     

       55
        
       

     
···

       81
        
       	s.Pages.Spindles(w, pages.SpindlesParams{

     

       82
        
       		LoggedInUser: user,

     

       83
        
       		Spindles:     all,

     

       84
       +
       		Tabs:         spindlesTabs,

     

       85
       +
       		Tab:          "spindles",

     

       86
        
       	})

     

       87
        
       }

     

       88
        
       

     
···

       141
        
       		Spindle:      spindle,

     

       142
        
       		Members:      members,

     

       143
        
       		Repos:        repoMap,

     

       144
       +
       		Tabs:         spindlesTabs,

     

       145
       +
       		Tab:          "spindles",

     

       146
        
       	})

     

       147
        
       }

     

       148

NEW

docs/hacking.md

···

       111
        
       with `ssh` exposed on port 2222.

     

       112
        
       

     

       113
        
       Once the services are running, head to

     

       114
       -
       http://localhost:3000/knots and hit verify. It should

     

       115
        
       verify the ownership of the services instantly if everything

     

       116
        
       went smoothly.

     

       117
        
       

     
···

       136
        
       ### running a spindle

     

       137
        
       

     

       138
        
       The above VM should already be running a spindle on

     

       139
       -
       `localhost:6555`. Head to http://localhost:3000/spindles and

     

       140
        
       hit verify. You can then configure each repository to use

     

       141
        
       this spindle and run CI jobs.

     

       142

···

       111
        
       with `ssh` exposed on port 2222.

     

       112
        
       

     

       113
        
       Once the services are running, head to

     

       114
       +
       http://localhost:3000/settings/knots and hit verify. It should

     

       115
        
       verify the ownership of the services instantly if everything

     

       116
        
       went smoothly.

     

       117
        
       

     
···

       136
        
       ### running a spindle

     

       137
        
       

     

       138
        
       The above VM should already be running a spindle on

     

       139
       +
       `localhost:6555`. Head to http://localhost:3000/settings/spindles and

     

       140
        
       hit verify. You can then configure each repository to use

     

       141
        
       this spindle and run CI jobs.

     

       142

NEW

docs/migrations.md

···

       14
        
       For knots:

     

       15
        
       

     

       16
        
       - Upgrade to latest tag (v1.9.0 or above)

     

       17
       -
       - Head to the [knot dashboard](https://tangled.org/knots) and

     

       18
        
         hit the "retry" button to verify your knot

     

       19
        
       

     

       20
        
       For spindles:

     

       21
        
       

     

       22
        
       - Upgrade to latest tag (v1.9.0 or above)

     

       23
        
       - Head to the [spindle

     

       24
       -
         dashboard](https://tangled.org/spindles) and hit the

     

       25
        
         "retry" button to verify your spindle

     

       26
        
       

     

       27
        
       ## Upgrading from v1.7.x

     
···

       41
        
         [settings](https://tangled.org/settings) page.

     

       42
        
       - Restart your knot once you have replaced the environment

     

       43
        
         variable

     

       44
       -
       - Head to the [knot dashboard](https://tangled.org/knots) and

     

       45
        
         hit the "retry" button to verify your knot. This simply

     

       46
        
         writes a `sh.tangled.knot` record to your PDS.

     

       47

···

       14
        
       For knots:

     

       15
        
       

     

       16
        
       - Upgrade to latest tag (v1.9.0 or above)

     

       17
       +
       - Head to the [knot dashboard](https://tangled.org/settings/knots) and

     

       18
        
         hit the "retry" button to verify your knot

     

       19
        
       

     

       20
        
       For spindles:

     

       21
        
       

     

       22
        
       - Upgrade to latest tag (v1.9.0 or above)

     

       23
        
       - Head to the [spindle

     

       24
       +
         dashboard](https://tangled.org/settings/spindles) and hit the

     

       25
        
         "retry" button to verify your spindle

     

       26
        
       

     

       27
        
       ## Upgrading from v1.7.x

     
···

       41
        
         [settings](https://tangled.org/settings) page.

     

       42
        
       - Restart your knot once you have replaced the environment

     

       43
        
         variable

     

       44
       +
       - Head to the [knot dashboard](https://tangled.org/settings/knots) and

     

       45
        
         hit the "retry" button to verify your knot. This simply

     

       46
        
         writes a `sh.tangled.knot` record to your PDS.

     

       47