patch of appview/pages: display home page to logged out users · round #0 · pull #551 · tangled.org/core

+12 -14

appview/db/timeline.go

···

       20
       20
        
       	*FollowStats

     

       21
       21
        
       }

     

       22
       22
        
       

     

       23
       23
       -
       const Limit = 50

     

       24
       24
       -
       

     

       25
       23
        
       // TODO: this gathers heterogenous events from different sources and aggregates

     

       26
       24
        
       // them in code; if we did this entirely in sql, we could order and limit and paginate easily

     

       27
       27
       -
       func MakeTimeline(e Execer) ([]TimelineEvent, error) {

     

       25
       25
       +
       func MakeTimeline(e Execer, limit int) ([]TimelineEvent, error) {

     

       28
       26
        
       	var events []TimelineEvent

     

       29
       27
        
       

     

       30
       30
       -
       	repos, err := getTimelineRepos(e)

     

       28
       28
       +
       	repos, err := getTimelineRepos(e, limit)

     

       31
       29
        
       	if err != nil {

     

       32
       30
        
       		return nil, err

     

       33
       31
        
       	}

     

       34
       32
        
       

     

       35
       35
       -
       	stars, err := getTimelineStars(e)

     

       33
       33
       +
       	stars, err := getTimelineStars(e, limit)

     

       36
       34
        
       	if err != nil {

     

       37
       35
        
       		return nil, err

     

       38
       36
        
       	}

     

       39
       37
        
       

     

       40
       40
       -
       	follows, err := getTimelineFollows(e)

     

       38
       38
       +
       	follows, err := getTimelineFollows(e, limit)

     

       41
       39
        
       	if err != nil {

     

       42
       40
        
       		return nil, err

     

       43
       41
        
       	}

     
···

       51
       49
        
       	})

     

       52
       50
        
       

     

       53
       51
        
       	// Limit the slice to 100 events

     

       54
       54
       -
       	if len(events) > Limit {

     

       55
       55
       -
       		events = events[:Limit]

     

       52
       52
       +
       	if len(events) > limit {

     

       53
       53
       +
       		events = events[:limit]

     

       56
       54
        
       	}

     

       57
       55
        
       

     

       58
       56
        
       	return events, nil

     

       59
       57
        
       }

     

       60
       58
        
       

     

       61
       61
       -
       func getTimelineRepos(e Execer) ([]TimelineEvent, error) {

     

       62
       62
       -
       	repos, err := GetRepos(e, Limit)

     

       59
       59
       +
       func getTimelineRepos(e Execer, limit int) ([]TimelineEvent, error) {

     

       60
       60
       +
       	repos, err := GetRepos(e, limit)

     

       63
       61
        
       	if err != nil {

     

       64
       62
        
       		return nil, err

     

       65
       63
        
       	}

     
···

       104
       102
        
       	return events, nil

     

       105
       103
        
       }

     

       106
       104
        
       

     

       107
       107
       -
       func getTimelineStars(e Execer) ([]TimelineEvent, error) {

     

       108
       108
       -
       	stars, err := GetStars(e, Limit)

     

       105
       105
       +
       func getTimelineStars(e Execer, limit int) ([]TimelineEvent, error) {

     

       106
       106
       +
       	stars, err := GetStars(e, limit)

     

       109
       107
        
       	if err != nil {

     

       110
       108
        
       		return nil, err

     

       111
       109
        
       	}

     
···

       131
       129
        
       	return events, nil

     

       132
       130
        
       }

     

       133
       131
        
       

     

       134
       134
       -
       func getTimelineFollows(e Execer) ([]TimelineEvent, error) {

     

       135
       135
       -
       	follows, err := GetFollows(e, Limit)

     

       132
       132
       +
       func getTimelineFollows(e Execer, limit int) ([]TimelineEvent, error) {

     

       133
       133
       +
       	follows, err := GetFollows(e, limit)

     

       136
       134
        
       	if err != nil {

     

       137
       135
        
       		return nil, err

     

       138
       136
        
       	}

appview/pages/pages.go

···

       1262
       1262
        
       	return p.execute("strings/string", w, params)

     

       1263
       1263
        
       }

     

       1264
       1264
        
       

     

       1265
       1265
       +
       func (p *Pages) Home(w io.Writer, params TimelineParams) error {

     

       1266
       1266
       +
       	return p.execute("timeline/home", w, params)

     

       1267
       1267
       +
       }

     

       1268
       1268
       +
       

     

       1265
       1269
        
       func (p *Pages) Static() http.Handler {

     

       1266
       1270
        
       	if p.dev {

     

       1267
       1271
        
       		return http.StripPrefix("/static/", http.FileServer(http.Dir("appview/pages/static")))

+116

appview/pages/templates/timeline/fragments/timeline.html

···

       1
       1
       +
       {{ define "timeline/fragments/timeline" }}

     

       2
       2
       +
           <div class="py-4">

     

       3
       3
       +
               <div class="px-6 pb-4">

     

       4
       4
       +
                   <p class="text-xl font-bold dark:text-white">Timeline</p>

     

       5
       5
       +
               </div>

     

       6
       6
       +
       

     

       7
       7
       +
               <div class="flex flex-col gap-4">

     

       8
       8
       +
                 {{ range $i, $e := .Timeline }}

     

       9
       9
       +
                   <div class="relative">

     

       10
       10
       +
                     {{ if ne $i 0 }}

     

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

     

       12
       12
       +
                     {{ end }}

     

       13
       13
       +
                     {{ with $e }}

     

       14
       14
       +
                       <div class="flex flex-col divide-y divide-gray-200 dark:divide-gray-700 border border-gray-200 dark:border-gray-700 rounded-sm">

     

       15
       15
       +
                         {{ if .Repo }}

     

       16
       16
       +
                           {{ template "timeline/fragments/repoEvent" (list $ .Repo .Source) }}

     

       17
       17
       +
                         {{ else if .Star }}

     

       18
       18
       +
                           {{ template "timeline/fragments/starEvent" (list $ .Star) }}

     

       19
       19
       +
                         {{ else if .Follow }}

     

       20
       20
       +
                           {{ template "timeline/fragments/followEvent" (list $ .Follow .Profile .FollowStats) }}

     

       21
       21
       +
                         {{ end }}

     

       22
       22
       +
                       </div>

     

       23
       23
       +
                     {{ end }}

     

       24
       24
       +
                   </div>

     

       25
       25
       +
                 {{ end }}

     

       26
       26
       +
               </div>

     

       27
       27
       +
           </div>

     

       28
       28
       +
       {{ end }}

     

       29
       29
       +
       

     

       30
       30
       +
       {{ define "timeline/fragments/repoEvent" }}

     

       31
       31
       +
         {{ $root := index . 0 }}

     

       32
       32
       +
         {{ $repo := index . 1 }}

     

       33
       33
       +
         {{ $source := index . 2 }}

     

       34
       34
       +
         {{ $userHandle := resolve $repo.Did }}

     

       35
       35
       +
           <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">

     

       36
       36
       +
             {{ template "user/fragments/picHandleLink" $repo.Did }}

     

       37
       37
       +
             {{ with $source }}

     

       38
       38
       +
               {{ $sourceDid := resolve .Did }}

     

       39
       39
       +
               forked

     

       40
       40
       +
               <a href="/{{ $sourceDid }}/{{ .Name }}"class="no-underline hover:underline">

     

       41
       41
       +
                   {{ $sourceDid }}/{{ .Name }}

     

       42
       42
       +
               </a>

     

       43
       43
       +
               to

     

       44
       44
       +
               <a href="/{{ $userHandle }}/{{ $repo.Name }}" class="no-underline hover:underline">{{ $repo.Name }}</a>

     

       45
       45
       +
             {{ else }}

     

       46
       46
       +
               created

     

       47
       47
       +
               <a href="/{{ $userHandle }}/{{ $repo.Name }}" class="no-underline hover:underline">

     

       48
       48
       +
                 {{ $repo.Name }}

     

       49
       49
       +
               </a>

     

       50
       50
       +
             {{ end }}

     

       51
       51
       +
             <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $repo.Created }}</span>

     

       52
       52
       +
           </div>

     

       53
       53
       +
         {{ with $repo }}

     

       54
       54
       +
           {{ template "user/fragments/repoCard" (list $root . true) }}

     

       55
       55
       +
         {{ end }}

     

       56
       56
       +
       {{ end }}

     

       57
       57
       +
       

     

       58
       58
       +
       {{ define "timeline/fragments/starEvent" }}

     

       59
       59
       +
         {{ $root := index . 0 }}

     

       60
       60
       +
         {{ $star := index . 1 }}

     

       61
       61
       +
         {{ with $star }}

     

       62
       62
       +
           {{ $starrerHandle :=  resolve .StarredByDid }}

     

       63
       63
       +
           {{ $repoOwnerHandle :=  resolve .Repo.Did }}

     

       64
       64
       +
           <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">

     

       65
       65
       +
               {{ template "user/fragments/picHandleLink" $starrerHandle }}

     

       66
       66
       +
               starred

     

       67
       67
       +
               <a href="/{{ $repoOwnerHandle }}/{{ .Repo.Name }}" class="no-underline hover:underline">

     

       68
       68
       +
                 {{ $repoOwnerHandle | truncateAt30 }}/{{ .Repo.Name }}

     

       69
       69
       +
               </a>

     

       70
       70
       +
               <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" .Created }}</span>

     

       71
       71
       +
           </div>

     

       72
       72
       +
           {{ with .Repo }}

     

       73
       73
       +
             {{ template "user/fragments/repoCard" (list $root . true) }}

     

       74
       74
       +
           {{ end }}

     

       75
       75
       +
         {{ end }}

     

       76
       76
       +
       {{ end }}

     

       77
       77
       +
       

     

       78
       78
       +
       {{ define "timeline/fragments/followEvent" }}

     

       79
       79
       +
         {{ $root := index . 0 }}

     

       80
       80
       +
         {{ $follow := index . 1 }}

     

       81
       81
       +
         {{ $profile := index . 2 }}

     

       82
       82
       +
         {{ $stat := index . 3 }}

     

       83
       83
       +
       

     

       84
       84
       +
         {{ $userHandle :=  resolve $follow.UserDid }}

     

       85
       85
       +
         {{ $subjectHandle :=  resolve $follow.SubjectDid }}

     

       86
       86
       +
         <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">

     

       87
       87
       +
             {{ template "user/fragments/picHandleLink" $userHandle }}

     

       88
       88
       +
             followed

     

       89
       89
       +
             {{ template "user/fragments/picHandleLink" $subjectHandle }}

     

       90
       90
       +
             <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $follow.FollowedAt }}</span>

     

       91
       91
       +
         </div>

     

       92
       92
       +
         <div class="py-4 px-6 drop-shadow-sm rounded bg-white dark:bg-gray-800 flex items-center gap-4">

     

       93
       93
       +
           <div class="flex-shrink-0 max-h-full w-24 h-24">

     

       94
       94
       +
             <img class="object-cover rounded-full p-2" src="{{ fullAvatar $subjectHandle }}" />

     

       95
       95
       +
           </div>

     

       96
       96
       +
       

     

       97
       97
       +
           <div class="flex-1 min-h-0 justify-around flex flex-col">

     

       98
       98
       +
             <a href="/{{ $subjectHandle }}">

     

       99
       99
       +
               <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $subjectHandle | truncateAt30 }}</span>

     

       100
       100
       +
             </a>

     

       101
       101
       +
             {{ with $profile }}

     

       102
       102
       +
               {{ with .Description }}

     

       103
       103
       +
                 <p class="text-sm pb-2 md:pb-2">{{.}}</p>

     

       104
       104
       +
               {{ end }}

     

       105
       105
       +
             {{ end }}

     

       106
       106
       +
             {{ with $stat }}

     

       107
       107
       +
               <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full">

     

       108
       108
       +
                 <span class="flex-shrink-0">{{ i "users" "size-4" }}</span>

     

       109
       109
       +
                 <span id="followers"><a href="/{{ $subjectHandle }}?tab=followers">{{ .Followers }} followers</a></span>

     

       110
       110
       +
                 <span class="select-none after:content-['·']"></span>

     

       111
       111
       +
                 <span id="following"><a href="/{{ $subjectHandle }}?tab=following">{{ .Following }} following</a></span>

     

       112
       112
       +
               </div>

     

       113
       113
       +
             {{ end }}

     

       114
       114
       +
           </div>

     

       115
       115
       +
         </div>

     

       116
       116
       +
       {{ end }}

+117

appview/pages/templates/timeline/home.html

···

       1
       1
       +
       {{ define "title" }}tangled &middot; tightly-knit social coding{{ end }}

     

       2
       2
       +
       

     

       3
       3
       +
       {{ define "extrameta" }}

     

       4
       4
       +
           <meta property="og:title" content="timeline · tangled" />

     

       5
       5
       +
           <meta property="og:type" content="object" />

     

       6
       6
       +
           <meta property="og:url" content="https://tangled.sh" />

     

       7
       7
       +
           <meta property="og:description" content="tightly-knit social coding" />

     

       8
       8
       +
       {{ end }}

     

       9
       9
       +
       

     

       10
       10
       +
       

     

       11
       11
       +
       {{ define "content" }}

     

       12
       12
       +
         <div class="flex flex-col gap-4">

     

       13
       13
       +
           {{ block "hero" $ }}{{ end }}

     

       14
       14
       +
           {{ block "features" $ }}{{ end }}

     

       15
       15
       +
           {{ block "timeline/fragments/trending" $ }}{{ end }}

     

       16
       16
       +
           {{ block "timeline/fragments/timeline" $ }}{{ end }}

     

       17
       17
       +
         </div>

     

       18
       18
       +
       {{ end }}

     

       19
       19
       +
       

     

       20
       20
       +
       

     

       21
       21
       +
       {{ define "hero" }}

     

       22
       22
       +
           <div class="mx-auto max-w-[100rem] flex flex-col text-black dark:text-white px-6 py-4 gap-6 items-center md:flex-row">

     

       23
       23
       +
               <div class="flex flex-col gap-6">

     

       24
       24
       +
                   <h1 class="font-bold text-4xl">tightly-knit<br>social coding.</h1>

     

       25
       25
       +
       

     

       26
       26
       +
                   <p class="text-lg">

     

       27
       27
       +
                     tangled is new social-enabled git collaboration platform built on <a class="underline" href="https://atproto.com/">atproto</a>.

     

       28
       28
       +
                   </p>

     

       29
       29
       +
                   <p class="text-lg">

     

       30
       30
       +
                     we envision a place where developers have complete ownership of their

     

       31
       31
       +
                     code, open source communities can freely self-govern and most

     

       32
       32
       +
                     importantly, coding can be social and fun again.

     

       33
       33
       +
                   </p>

     

       34
       34
       +
       

     

       35
       35
       +
                   <div class="flex gap-6 items-center">

     

       36
       36
       +
                     <a href="/signup" class="no-underline hover:no-underline ">

     

       37
       37
       +
                       <button class="btn-create flex gap-2 px-4 items-center">

     

       38
       38
       +
                         join now {{ i "arrow-right" "size-4" }}

     

       39
       39
       +
                       </button>

     

       40
       40
       +
                     </a>

     

       41
       41
       +
                   </div>

     

       42
       42
       +
               </div>

     

       43
       43
       +
       

     

       44
       44
       +
               <figure class="w-full hidden md:block md:w-auto">

     

       45
       45
       +
                   <a href="https://tangled.sh/@tangled.sh/core" class="block">

     

       46
       46
       +
                       <img src="https://assets.tangled.network/hero-repo.png" alt="Screenshot of the Tangled monorepo." class="max-w-md mx-auto md:max-w-none w-full md:w-[30vw] h-auto shadow-sm rounded hover:shadow-md transition-shadow" />

     

       47
       47
       +
                   </a>

     

       48
       48
       +
                   <figcaption class="text-sm text-gray-600 dark:text-gray-400 mt-2 text-center">

     

       49
       49
       +
                       Monorepo for Tangled, built in the open with the community.

     

       50
       50
       +
                   </figcaption>

     

       51
       51
       +
               </figure>

     

       52
       52
       +
           </div>

     

       53
       53
       +
       {{ end }}

     

       54
       54
       +
       

     

       55
       55
       +
       {{ define "feature" }}

     

       56
       56
       +
           {{ $info := index . 0 }}

     

       57
       57
       +
           {{ $bullets := index . 1 }}

     

       58
       58
       +
           <div class="flex flex-col items-center gap-6 md:flex-row md:gap-12">

     

       59
       59
       +
               <div class="flex-1">

     

       60
       60
       +
                   <h2 class="text-2xl font-bold text-black dark:text-white mb-6">{{ $info.title }}</h2>

     

       61
       61
       +
                   <ul class="leading-normal">

     

       62
       62
       +
                       {{ range $bullets }}

     

       63
       63
       +
                           <li><p>{{ escapeHtml . }}</p></li>

     

       64
       64
       +
                       {{ end }}

     

       65
       65
       +
                   </ul>

     

       66
       66
       +
               </div>

     

       67
       67
       +
               <div class="flex-shrink-0">

     

       68
       68
       +
                 <a href="{{ $info.image }}">

     

       69
       69
       +
                   <img src="{{ $info.image }}" alt="{{ $info.alt }}" class="w-full max-w-sm md:max-w-48 lg:max-w-sm mx-auto h-auto rounded" />

     

       70
       70
       +
                 </a>

     

       71
       71
       +
               </div>

     

       72
       72
       +
           </div>

     

       73
       73
       +
       {{ end }}

     

       74
       74
       +
       

     

       75
       75
       +
       {{ define "features" }}

     

       76
       76
       +
         <div class="prose dark:text-gray-200 space-y-12 px-6 py-4">

     

       77
       77
       +
           {{ template "feature" (list

     

       78
       78
       +
               (dict

     

       79
       79
       +
                   "title" "lightweight git repo hosting"

     

       80
       80
       +
                   "image" "https://assets.tangled.network/what-is-tangled-repo.png"

     

       81
       81
       +
                   "alt" "A repository hosted on Tangled"

     

       82
       82
       +
               )

     

       83
       83
       +
               (list

     

       84
       84
       +
                   "Host your repositories on your own infrastructure using <em>knots</em>&mdash;tiny, headless servers that facilitate git operations."

     

       85
       85
       +
                   "Fully federated using the AT Protocol."

     

       86
       86
       +
                   "Use SSH to push/pull, guarded by role-based access control."

     

       87
       87
       +
               )

     

       88
       88
       +
           ) }}

     

       89
       89
       +
       

     

       90
       90
       +
           {{ template "feature" (list

     

       91
       91
       +
               (dict

     

       92
       92
       +
                   "title" "improved pull request model"

     

       93
       93
       +
                   "image" "https://assets.tangled.network/pulls.png"

     

       94
       94
       +
                   "alt" "Round-based pull requests."

     

       95
       95
       +
               )

     

       96
       96
       +
               (list

     

       97
       97
       +
                   "An intuitive and effective round-based pull request flow, with inter-diffing between rounds."

     

       98
       98
       +
                   "Stacked pull requests using Jujutsu's change IDs."

     

       99
       99
       +
                   "Paste a <code>git diff</code> or <code>git format-patch</code> for quick drive-by changes."

     

       100
       100
       +
               )

     

       101
       101
       +
           ) }}

     

       102
       102
       +
       

     

       103
       103
       +
           {{ template "feature" (list

     

       104
       104
       +
               (dict

     

       105
       105
       +
                   "title" "run pipelines using spindles"

     

       106
       106
       +
                   "image" "https://assets.tangled.network/pipelines.png"

     

       107
       107
       +
                   "alt" "CI pipeline running on spindle"

     

       108
       108
       +
               )

     

       109
       109
       +
               (list

     

       110
       110
       +
                   "Run pipelines on your own infrastructure using <em>spindles</em>&mdash;lightweight CI runners."

     

       111
       111
       +
                   "Natively supports Nix for package management."

     

       112
       112
       +
                   "Easily extended to support different execution backends."

     

       113
       113
       +
               )

     

       114
       114
       +
           ) }}

     

       115
       115
       +
         </div>

     

       116
       116
       +
       {{ end }}

     

       117
       117
       +

+2 -172

appview/pages/templates/timeline/timeline.html

···

       8
       8
        
       {{ end }}

     

       9
       9
        
       

     

       10
       10
        
       {{ define "content" }}

     

       11
       11
       -
           {{ if .LoggedInUser }}

     

       12
       12
       -
           {{ else }}

     

       13
       13
       -
               {{ block "hero" $ }}{{ end }}

     

       14
       14
       -
           {{ end }}

     

       15
       15
       -
       

     

       16
       16
       -
           {{ block "trending" $ }}{{ end }}

     

       17
       17
       -
           {{ block "timeline" $ }}{{ end }}

     

       18
       18
       -
       {{ end }}

     

       19
       19
       -
       

     

       20
       20
       -
       {{ define "hero" }}

     

       21
       21
       -
           <div class="flex flex-col text-black dark:text-white p-6 gap-6 max-w-xl">

     

       22
       22
       -
               <div class="font-bold text-4xl">tightly-knit<br>social coding.</div>

     

       23
       23
       -
       

     

       24
       24
       -
               <p class="text-lg">

     

       25
       25
       -
                 tangled is new social-enabled git collaboration platform built on <a class="underline" href="https://atproto.com/">atproto</a>.

     

       26
       26
       -
               </p>

     

       27
       27
       -
               <p class="text-lg">

     

       28
       28
       -
                 we envision a place where developers have complete ownership of their

     

       29
       29
       -
                 code, open source communities can freely self-govern and most

     

       30
       30
       -
                 importantly, coding can be social and fun again.

     

       31
       31
       -
               </p>

     

       32
       32
       -
       

     

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

     

       34
       34
       -
                 <a href="/signup" class="no-underline hover:no-underline ">

     

       35
       35
       -
                   <button class="btn-create flex gap-2 px-4 items-center">

     

       36
       36
       -
                     join now {{ i "arrow-right" "size-4" }}

     

       37
       37
       -
                   </button>

     

       38
       38
       -
                 </a>

     

       39
       39
       -
               </div>

     

       40
       40
       -
           </div>

     

       41
       41
       -
       {{ end }}

     

       42
       42
       -
       

     

       43
       43
       -
       {{ define "trending" }}

     

       44
       44
       -
         <div class="w-full md:mx-0 py-4">

     

       45
       45
       -
             <div class="px-6 pb-4">

     

       46
       46
       -
               <h3 class="text-xl font-bold dark:text-white flex items-center gap-2">

     

       47
       47
       -
                   Trending

     

       48
       48
       -
                   {{ i "trending-up" "size-4 flex-shrink-0" }}

     

       49
       49
       -
               </h3>

     

       50
       50
       -
             </div>

     

       51
       51
       -
             <div class="flex gap-4 overflow-x-auto scrollbar-hide items-stretch">

     

       52
       52
       -
                 {{ range $index, $repo := .Repos }}

     

       53
       53
       -
                   <div class="flex-none h-full border border-gray-200 dark:border-gray-700 rounded-sm w-96">

     

       54
       54
       -
                     {{ template "user/fragments/repoCard" (list $ $repo true) }}

     

       55
       55
       -
                   </div>

     

       56
       56
       -
                 {{ else }}

     

       57
       57
       -
                     <div class="py-8 px-6 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-sm">

     

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

     

       59
       59
       -
                             No trending repositories this week

     

       60
       60
       -
                         </div>

     

       61
       61
       -
                     </div>

     

       62
       62
       -
                 {{ end }}

     

       63
       63
       -
             </div>

     

       64
       64
       -
         </div>

     

       65
       65
       -
       {{ end }}

     

       66
       66
       -
       

     

       67
       67
       -
       {{ define "timeline" }}

     

       68
       68
       -
           <div class="py-4">

     

       69
       69
       -
               <div class="px-6 pb-4">

     

       70
       70
       -
                   <p class="text-xl font-bold dark:text-white">Timeline</p>

     

       71
       71
       -
               </div>

     

       72
       72
       -
       

     

       73
       73
       -
               <div class="flex flex-col gap-4">

     

       74
       74
       -
                 {{ range $i, $e := .Timeline }}

     

       75
       75
       -
                   <div class="relative">

     

       76
       76
       -
                     {{ if ne $i 0 }}

     

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

     

       78
       78
       -
                     {{ end }}

     

       79
       79
       -
                     {{ with $e }}

     

       80
       80
       -
                       <div class="flex flex-col divide-y divide-gray-200 dark:divide-gray-700 border border-gray-200 dark:border-gray-700 rounded-sm">

     

       81
       81
       -
                         {{ if .Repo }}

     

       82
       82
       -
                           {{ block "repoEvent" (list $ .Repo .Source) }} {{ end }}

     

       83
       83
       -
                         {{ else if .Star }}

     

       84
       84
       -
                           {{ block "starEvent" (list $ .Star) }} {{ end }}

     

       85
       85
       -
                         {{ else if .Follow }}

     

       86
       86
       -
                           {{ block "followEvent" (list $ .Follow .Profile .FollowStats) }} {{ end }}

     

       87
       87
       -
                         {{ end }}

     

       88
       88
       -
                       </div>

     

       89
       89
       -
                     {{ end }}

     

       90
       90
       -
                   </div>

     

       91
       91
       -
                 {{ end }}

     

       92
       92
       -
               </div>

     

       93
       93
       -
           </div>

     

       94
       94
       -
       {{ end }}

     

       95
       95
       -
       

     

       96
       96
       -
       {{ define "repoEvent" }}

     

       97
       97
       -
         {{ $root := index . 0 }}

     

       98
       98
       -
         {{ $repo := index . 1 }}

     

       99
       99
       -
         {{ $source := index . 2 }}

     

       100
       100
       -
         {{ $userHandle := resolve $repo.Did }}

     

       101
       101
       -
           <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">

     

       102
       102
       -
             {{ template "user/fragments/picHandleLink" $repo.Did }}

     

       103
       103
       -
             {{ with $source }}

     

       104
       104
       -
               {{ $sourceDid := resolve .Did }}

     

       105
       105
       -
               forked

     

       106
       106
       -
               <a href="/{{ $sourceDid }}/{{ .Name }}"class="no-underline hover:underline">

     

       107
       107
       -
                   {{ $sourceDid }}/{{ .Name }}

     

       108
       108
       -
               </a>

     

       109
       109
       -
               to

     

       110
       110
       -
               <a href="/{{ $userHandle }}/{{ $repo.Name }}" class="no-underline hover:underline">{{ $repo.Name }}</a>

     

       111
       111
       -
             {{ else }}

     

       112
       112
       -
               created

     

       113
       113
       -
               <a href="/{{ $userHandle }}/{{ $repo.Name }}" class="no-underline hover:underline">

     

       114
       114
       -
                 {{ $repo.Name }}

     

       115
       115
       -
               </a>

     

       116
       116
       -
             {{ end }}

     

       117
       117
       -
             <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $repo.Created }}</span>

     

       118
       118
       -
           </div>

     

       119
       119
       -
         {{ with $repo }}

     

       120
       120
       -
           {{ template "user/fragments/repoCard" (list $root . true) }}

     

       121
       121
       -
         {{ end }}

     

       122
       122
       -
       {{ end }}

     

       123
       123
       -
       

     

       124
       124
       -
       {{ define "starEvent" }}

     

       125
       125
       -
         {{ $root := index . 0 }}

     

       126
       126
       -
         {{ $star := index . 1 }}

     

       127
       127
       -
         {{ with $star }}

     

       128
       128
       -
           {{ $starrerHandle :=  resolve .StarredByDid }}

     

       129
       129
       -
           {{ $repoOwnerHandle :=  resolve .Repo.Did }}

     

       130
       130
       -
           <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">

     

       131
       131
       -
               {{ template "user/fragments/picHandleLink" $starrerHandle }}

     

       132
       132
       -
               starred

     

       133
       133
       -
               <a href="/{{ $repoOwnerHandle }}/{{ .Repo.Name }}" class="no-underline hover:underline">

     

       134
       134
       -
                 {{ $repoOwnerHandle | truncateAt30 }}/{{ .Repo.Name }}

     

       135
       135
       -
               </a>

     

       136
       136
       -
               <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" .Created }}</span>

     

       137
       137
       -
           </div>

     

       138
       138
       -
           {{ with .Repo }}

     

       139
       139
       -
             {{ template "user/fragments/repoCard" (list $root . true) }}

     

       140
       140
       -
           {{ end }}

     

       141
       141
       -
         {{ end }}

     

       142
       142
       -
       {{ end }}

     

       143
       143
       -
       

     

       144
       144
       -
       

     

       145
       145
       -
       {{ define "followEvent" }}

     

       146
       146
       -
         {{ $root := index . 0 }}

     

       147
       147
       -
         {{ $follow := index . 1 }}

     

       148
       148
       -
         {{ $profile := index . 2 }}

     

       149
       149
       -
         {{ $stat := index . 3 }}

     

       150
       150
       -
       

     

       151
       151
       -
         {{ $userHandle :=  resolve $follow.UserDid }}

     

       152
       152
       -
         {{ $subjectHandle :=  resolve $follow.SubjectDid }}

     

       153
       153
       -
         <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">

     

       154
       154
       -
             {{ template "user/fragments/picHandleLink" $userHandle }}

     

       155
       155
       -
             followed

     

       156
       156
       -
             {{ template "user/fragments/picHandleLink" $subjectHandle }}

     

       157
       157
       -
             <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $follow.FollowedAt }}</span>

     

       158
       158
       -
         </div>

     

       159
       159
       -
         <div class="py-4 px-6 drop-shadow-sm rounded bg-white dark:bg-gray-800 flex items-center gap-4">

     

       160
       160
       -
           <div class="flex-shrink-0 max-h-full w-24 h-24">

     

       161
       161
       -
             <img class="object-cover rounded-full p-2" src="{{ fullAvatar $subjectHandle }}" />

     

       162
       162
       -
           </div>

     

       163
       163
       -
       

     

       164
       164
       -
           <div class="flex-1 min-h-0 justify-around flex flex-col">

     

       165
       165
       -
             <a href="/{{ $subjectHandle }}">

     

       166
       166
       -
               <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $subjectHandle | truncateAt30 }}</span>

     

       167
       167
       -
             </a>

     

       168
       168
       -
             {{ with $profile }}

     

       169
       169
       -
               {{ with .Description }}

     

       170
       170
       -
                 <p class="text-sm pb-2 md:pb-2">{{.}}</p>

     

       171
       171
       -
               {{ end }}

     

       172
       172
       -
             {{ end }}

     

       173
       173
       -
             {{ with $stat }}

     

       174
       174
       -
               <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full">

     

       175
       175
       -
                 <span class="flex-shrink-0">{{ i "users" "size-4" }}</span>

     

       176
       176
       -
                 <span id="followers"><a href="/{{ $subjectHandle }}?tab=followers">{{ .Followers }} followers</a></span>

     

       177
       177
       -
                 <span class="select-none after:content-['·']"></span>

     

       178
       178
       -
                 <span id="following"><a href="/{{ $subjectHandle }}?tab=following">{{ .Following }} following</a></span>

     

       179
       179
       -
               </div>

     

       180
       180
       -
             {{ end }}

     

       181
       181
       -
           </div>

     

       182
       182
       -
         </div>

     

       11
       11
       +
           {{ template "timeline/fragments/trending" . }}

     

       12
       12
       +
           {{ template "timeline/fragments/timeline" . }}

     

       183
       13
        
       {{ end }}

+2 -1

appview/state/router.go

···

       111
       111
        
       

     

       112
       112
        
       	r.Handle("/static/*", s.pages.Static())

     

       113
       113
        
       

     

       114
       114
       -
       	r.Get("/", s.Timeline)

     

       114
       114
       +
       	r.Get("/", s.HomeOrTimeline)

     

       115
       115
       +
       	r.Get("/timeline", s.Timeline)

     

       115
       116
        
       

     

       116
       117
        
       	r.Route("/repo", func(r chi.Router) {

     

       117
       118
        
       		r.Route("/new", func(r chi.Router) {

+33 -1

appview/state/state.go

···

       190
       190
        
       	})

     

       191
       191
        
       }

     

       192
       192
        
       

     

       193
       193
       +
       func (s *State) HomeOrTimeline(w http.ResponseWriter, r *http.Request) {

     

       194
       194
       +
       	if s.oauth.GetUser(r) != nil {

     

       195
       195
       +
       		s.Timeline(w, r)

     

       196
       196
       +
       		return

     

       197
       197
       +
       	}

     

       198
       198
       +
       	s.Home(w, r)

     

       199
       199
       +
       }

     

       200
       200
       +
       

     

       193
       201
        
       func (s *State) Timeline(w http.ResponseWriter, r *http.Request) {

     

       194
       202
        
       	user := s.oauth.GetUser(r)

     

       195
       203
        
       

     

       196
       196
       -
       	timeline, err := db.MakeTimeline(s.db)

     

       204
       204
       +
       	timeline, err := db.MakeTimeline(s.db, 50)

     

       197
       205
        
       	if err != nil {

     

       198
       206
        
       		log.Println(err)

     

       199
       207
        
       		s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.")

     
···

       213
       221
        
       	})

     

       214
       222
        
       }

     

       215
       223
        
       

     

       224
       224
       +
       func (s *State) Home(w http.ResponseWriter, r *http.Request) {

     

       225
       225
       +
       	timeline, err := db.MakeTimeline(s.db, 15)

     

       226
       226
       +
       	if err != nil {

     

       227
       227
       +
       		log.Println(err)

     

       228
       228
       +
       		s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.")

     

       229
       229
       +
       		return

     

       230
       230
       +
       	}

     

       231
       231
       +
       

     

       232
       232
       +
       	repos, err := db.GetTopStarredReposLastWeek(s.db)

     

       233
       233
       +
       	if err != nil {

     

       234
       234
       +
       		log.Println(err)

     

       235
       235
       +
       		s.pages.Notice(w, "topstarredrepos", "Unable to load.")

     

       236
       236
       +
       		return

     

       237
       237
       +
       	}

     

       238
       238
       +
       

     

       239
       239
       +
       	timeline = timeline[:5]

     

       240
       240
       +
       

     

       241
       241
       +
       	s.pages.Home(w, pages.TimelineParams{

     

       242
       242
       +
       		LoggedInUser: nil,

     

       243
       243
       +
       		Timeline:     timeline,

     

       244
       244
       +
       		Repos:        repos,

     

       245
       245
       +
       	})

     

       246
       246
       +
       }

     

       247
       247
       +
       

     

       216
       248
        
       func (s *State) Keys(w http.ResponseWriter, r *http.Request) {

     

       217
       249
        
       	user := chi.URLParam(r, "user")

     

       218
       250
        
       	user = strings.TrimPrefix(user, "@")