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

ERROR

appview/db/timeline.go

Failed to calculate interdiff for this file.

REVERTED

appview/state/state.go

··· 234 if user != nil { 235 userDid = user.Did 236 } 237 - timeline, err := db.MakeTimeline(s.db, 50, userDid, false) 238 if err != nil { 239 log.Println(err) 240 s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.")

··· 234 if user != nil { 235 userDid = user.Did 236 } 237 + timeline, err := db.MakeTimeline(s.db, 50, userDid) 238 if err != nil { 239 log.Println(err) 240 s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.")

NEW

appview/pages/pages.go

··· 306 LoggedInUser *oauth.User 307 Timeline []models.TimelineEvent 308 Repos []models.Repo 309 } 310 311 func (p *Pages) Timeline(w io.Writer, params TimelineParams) error {

··· 306 LoggedInUser *oauth.User 307 Timeline []models.TimelineEvent 308 Repos []models.Repo 309 + Filtered bool 310 } 311 312 func (p *Pages) Timeline(w io.Writer, params TimelineParams) error {

NEW

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

··· 1 {{ define "timeline/fragments/timeline" }} 2 <div class="py-4"> 3 - <div class="px-6 pb-4"> 4 - <p class="text-xl font-bold dark:text-white">Timeline</p> 5 </div> 6 7 <div class="flex flex-col gap-4">

··· 1 {{ define "timeline/fragments/timeline" }} 2 <div class="py-4"> 3 + 4 + <div class="flex gap-2 px-6 pb-4"> 5 + <div> 6 + <p class="text-xl font-bold dark:text-white">Timeline</p> 7 + </div> 8 + {{ if .LoggedInUser }} 9 + <div> 10 + {{ if .Filtered }} 11 + <a href="/timeline" class="hover:underline text-sm"> 12 + Show All 13 + </a> 14 + {{ else }} 15 + <a href="/timeline?filtered=true" class="hover:underline text-sm"> 16 + Show following only 17 + </a> 18 + {{ end }} 19 + </div> 20 + {{ end }} 21 </div> 22 23 <div class="flex flex-col gap-4">