forked from tangled.org/core
Monorepo for Tangled — https://tangled.org

appview: allows the user to toggle between a filtered or non filtered timeline

Signed-off-by: Will Andrews <did:plc:dadhhalkfcq3gucaq25hjqon>

Changed files
+36 -4
appview
pages
templates
timeline
fragments
state
+1
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 {
+18 -2
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">
+17 -2
appview/state/state.go
··· 8 "log" 9 "log/slog" 10 "net/http" 11 "strings" 12 "time" 13 ··· 228 } 229 230 func (s *State) Timeline(w http.ResponseWriter, r *http.Request) { 231 user := s.oauth.GetUser(r) 232 233 var userDid string 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.") ··· 251 LoggedInUser: user, 252 Timeline: timeline, 253 Repos: repos, 254 }) 255 } 256 ··· 293 } 294 295 func (s *State) Home(w http.ResponseWriter, r *http.Request) { 296 - timeline, err := db.MakeTimeline(s.db, 5, "") 297 if err != nil { 298 log.Println(err) 299 s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.") ··· 311 LoggedInUser: nil, 312 Timeline: timeline, 313 Repos: repos, 314 }) 315 } 316 ··· 630 631 return nil 632 }
··· 8 "log" 9 "log/slog" 10 "net/http" 11 + "strconv" 12 "strings" 13 "time" 14 ··· 229 } 230 231 func (s *State) Timeline(w http.ResponseWriter, r *http.Request) { 232 + filtered := getTimelineFilteredQuery(r) 233 user := s.oauth.GetUser(r) 234 235 var userDid string 236 if user != nil { 237 userDid = user.Did 238 } 239 + timeline, err := db.MakeTimeline(s.db, 50, userDid, filtered) 240 if err != nil { 241 log.Println(err) 242 s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.") ··· 253 LoggedInUser: user, 254 Timeline: timeline, 255 Repos: repos, 256 + Filtered: filtered, 257 }) 258 } 259 ··· 296 } 297 298 func (s *State) Home(w http.ResponseWriter, r *http.Request) { 299 + filtered := getTimelineFilteredQuery(r) 300 + timeline, err := db.MakeTimeline(s.db, 5, "", filtered) 301 if err != nil { 302 log.Println(err) 303 s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.") ··· 315 LoggedInUser: nil, 316 Timeline: timeline, 317 Repos: repos, 318 + Filtered: filtered, 319 }) 320 } 321 ··· 635 636 return nil 637 } 638 + 639 + func getTimelineFilteredQuery(r *http.Request) bool { 640 + filteredStr := r.URL.Query().Get("filtered") 641 + if filteredStr == "" { 642 + return false 643 + } 644 + 645 + res, _ := strconv.ParseBool(filteredStr) 646 + return res 647 + }