patch of appview: profile: render punchcard on profile · round #0 · pull #238 · tangled.org/core

appview/pages/funcmap.go

···

       33
        
       		"splitOn": func(s, sep string) []string {

     

       34
        
       			return strings.Split(s, sep)

     

       35
        
       		},

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       37
        
       			return a + b

     

       38
        
       		},

     
···

       79
        
       		"longTimeFmt": func(t time.Time) string {

     

       80
        
       			return t.Format("2006-01-02 * 3:04 PM")

     

       81
        
       		},

     

       0
        
       
     

       82
        
       		"shortTimeFmt": func(t time.Time) string {

     

       83
        
       			return humanize.CustomRelTime(t, time.Now(), "", "", []humanize.RelTimeMagnitude{

     

       84
        
       				{time.Second, "now", time.Second},

···

       33
        
       		"splitOn": func(s, sep string) []string {

     

       34
        
       			return strings.Split(s, sep)

     

       35
        
       		},

     

       36
       +
       		"int64": func(a int) int64 {

     

       37
       +
       			return int64(a)

     

       38
       +
       		},

     

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

     

       40
        
       			return a + b

     

       41
        
       		},

     
···

       82
        
       		"longTimeFmt": func(t time.Time) string {

     

       83
        
       			return t.Format("2006-01-02 * 3:04 PM")

     

       84
        
       		},

     

       85
       +
       		"commaFmt": humanize.Comma,

     

       86
        
       		"shortTimeFmt": func(t time.Time) string {

     

       87
        
       			return humanize.CustomRelTime(t, time.Now(), "", "", []humanize.RelTimeMagnitude{

     

       88
        
       				{time.Second, "now", time.Second},

appview/pages/pages.go

···

       316
        
       	CollaboratingRepos []db.Repo

     

       317
        
       	ProfileTimeline    *db.ProfileTimeline

     

       318
        
       	Card               ProfileCard

     

       0
        
       
     

       319
        
       

     

       320
        
       	DidHandleMap map[string]string

     

       321
        
       }

···

       316
        
       	CollaboratingRepos []db.Repo

     

       317
        
       	ProfileTimeline    *db.ProfileTimeline

     

       318
        
       	Card               ProfileCard

     

       319
       +
       	Punchcard          db.Punchcard

     

       320
        
       

     

       321
        
       	DidHandleMap map[string]string

     

       322
        
       }

+30

appview/pages/templates/user/profile.html

···

       11
        
       <div class="grid grid-cols-1 md:grid-cols-8 gap-6">

     

       12
        
           <div class="md:col-span-2 order-1 md:order-1">

     

       13
        
               {{ template "user/fragments/profileCard" .Card }}

     

       0
        
       
     

       14
        
           </div>

     

       15
        
           <div id="all-repos" class="md:col-span-3 order-2 md:order-2">

     

       16
        
               {{ block "ownRepos" . }}{{ end }}

     
···

       316
        
           </div>

     

       317
        
         {{ end }}

     

       318
        
       {{ end }}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       11
        
       <div class="grid grid-cols-1 md:grid-cols-8 gap-6">

     

       12
        
           <div class="md:col-span-2 order-1 md:order-1">

     

       13
        
               {{ template "user/fragments/profileCard" .Card }}

     

       14
       +
               {{ block "punchcard" .Punchcard }} {{ end }}

     

       15
        
           </div>

     

       16
        
           <div id="all-repos" class="md:col-span-3 order-2 md:order-2">

     

       17
        
               {{ block "ownRepos" . }}{{ end }}

     
···

       317
        
           </div>

     

       318
        
         {{ end }}

     

       319
        
       {{ end }}

     

       320
       +
       

     

       321
       +
       {{ define "punchcard" }}

     

       322
       +
         <div class="bg-white dark:bg-gray-800 px-6 py-4 rounded mt-3 drop-shadow-sm">

     

       323
       +
           <p class="text-sm font-bold pb-2 dark:text-white">{{ .Total | int64 | commaFmt }} COMMITS</p>

     

       324
       +
           <div class="grid grid-rows-7 grid-cols-52 gap-1 w-full h-full" style="grid-auto-flow: column;">

     

       325
       +
             {{ range .Punches }}

     

       326
       +
               {{ $count := .Count }}

     

       327
       +
               {{ $theme := "bg-white dark:bg-gray-800 w-0 h-0" }}

     

       328
       +
               {{ if lt $count 1 }}

     

       329
       +
                 {{ $theme = "bg-white dark:bg-gray-800 w-0 h-0" }}

     

       330
       +
               {{ else if lt $count 2 }}

     

       331
       +
                 {{ $theme = "bg-green-200 dark:bg-green-800 size-px" }}

     

       332
       +
               {{ else if lt $count 4 }}

     

       333
       +
                 {{ $theme = "bg-green-300 dark:bg-green-700 size-px" }}

     

       334
       +
               {{ else if lt $count 6 }}

     

       335
       +
                 {{ $theme = "bg-green-300 dark:bg-green-700 size-[2px]" }}

     

       336
       +
               {{ else }}

     

       337
       +
                 {{ $theme = "bg-green-400 dark:bg-green-600 size-[2px]" }}

     

       338
       +
               {{ end }}

     

       339
       +
               <div class="w-full h-full flex justify-center items-center">

     

       340
       +
                 <div

     

       341
       +
                   class="aspect-square rounded-full transition-all duration-300 {{ $theme }} max-w-full max-h-full"

     

       342
       +
                   title="{{ .Date.Format "2006-01-02" }}: {{ .Count }} commits">

     

       343
       +
                 </div>

     

       344
       +
               </div>

     

       345
       +
             {{ end }}

     

       346
       +
           </div>

     

       347
       +
         </div>

     

       348
       +
       {{ end }}

+24

appview/state/profile.go

···

       9
        
       	"net/http"

     

       10
        
       	"slices"

     

       11
        
       	"strings"

     

       0
        
       
     

       12
        
       

     

       13
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       14
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     
···

       126
        
       		followStatus = db.GetFollowStatus(s.db, loggedInUser.Did, ident.DID.String())

     

       127
        
       	}

     

       128
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       129
        
       	profileAvatarUri := s.GetAvatarUri(ident.Handle.String())

     

       130
        
       	s.pages.ProfilePage(w, pages.ProfilePageParams{

     

       131
        
       		LoggedInUser:       loggedInUser,

     
···

       141
        
       			Followers:    followers,

     

       142
        
       			Following:    following,

     

       143
        
       		},

     

       0
        
       
     

       144
        
       		ProfileTimeline: timeline,

     

       145
        
       	})

     

       146
        
       }

···

       9
        
       	"net/http"

     

       10
        
       	"slices"

     

       11
        
       	"strings"

     

       12
       +
       	"time"

     

       13
        
       

     

       14
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       15
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     
···

       127
        
       		followStatus = db.GetFollowStatus(s.db, loggedInUser.Did, ident.DID.String())

     

       128
        
       	}

     

       129
        
       

     

       130
       +
       	now := time.Now()

     

       131
       +
       	startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)

     

       132
       +
       	punchcard, err := db.MakePunchcard(

     

       133
       +
       		s.db,

     

       134
       +
       		db.FilterEq("did", ident.DID.String()),

     

       135
       +
       		db.FilterGte("date", startOfYear.Format(time.DateOnly)),

     

       136
       +
       		db.FilterLte("date", now.Format(time.DateOnly)),

     

       137
       +
       	)

     

       138
       +
       	if err != nil {

     

       139
       +
       		log.Println("failed to get punchcard for did", "did", ident.DID.String(), "err", err)

     

       140
       +
       	} else {

     

       141
       +
       		// Extend punchcard to end of year with empty entries

     

       142
       +
       		endOfYear := time.Date(now.Year(), 12, 31, 0, 0, 0, 0, time.UTC)

     

       143
       +
       		tomorrow := now.AddDate(0, 0, 1)

     

       144
       +
       		for d := tomorrow; d.Before(endOfYear) || d.Equal(endOfYear); d = d.AddDate(0, 0, 1) {

     

       145
       +
       			punchcard.Punches = append(punchcard.Punches, db.Punch{

     

       146
       +
       				Date:  d,

     

       147
       +
       				Count: 0,

     

       148
       +
       			})

     

       149
       +
       		}

     

       150
       +
       	}

     

       151
       +
       

     

       152
        
       	profileAvatarUri := s.GetAvatarUri(ident.Handle.String())

     

       153
        
       	s.pages.ProfilePage(w, pages.ProfilePageParams{

     

       154
        
       		LoggedInUser:       loggedInUser,

     
···

       164
        
       			Followers:    followers,

     

       165
        
       			Following:    following,

     

       166
        
       		},

     

       167
       +
       		Punchcard:       punchcard,

     

       168
        
       		ProfileTimeline: timeline,

     

       169
        
       	})

     

       170
        
       }

+49

cmd/punchcardPopulate/main.go

···

       1
       +
       package main

     

       2
       +
       

     

       3
       +
       import (

     

       4
       +
       	"database/sql"

     

       5
       +
       	"fmt"

     

       6
       +
       	"log"

     

       7
       +
       	"math/rand"

     

       8
       +
       	"time"

     

       9
       +
       

     

       10
       +
       	_ "github.com/mattn/go-sqlite3"

     

       11
       +
       )

     

       12
       +
       

     

       13
       +
       func main() {

     

       14
       +
       	db, err := sql.Open("sqlite3", "./appview.db")

     

       15
       +
       	if err != nil {

     

       16
       +
       		log.Fatal("Failed to open database:", err)

     

       17
       +
       	}

     

       18
       +
       	defer db.Close()

     

       19
       +
       

     

       20
       +
       	const did = "did:plc:qfpnj4og54vl56wngdriaxug"

     

       21
       +
       

     

       22
       +
       	now := time.Now()

     

       23
       +
       	start := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)

     

       24
       +
       

     

       25
       +
       	tx, err := db.Begin()

     

       26
       +
       	if err != nil {

     

       27
       +
       		log.Fatal(err)

     

       28
       +
       	}

     

       29
       +
       	stmt, err := tx.Prepare("INSERT INTO punchcard (did, date, count) VALUES (?, ?, ?)")

     

       30
       +
       	if err != nil {

     

       31
       +
       		log.Fatal(err)

     

       32
       +
       	}

     

       33
       +
       	defer stmt.Close()

     

       34
       +
       

     

       35
       +
       	for day := start; !day.After(now); day = day.AddDate(0, 0, 1) {

     

       36
       +
       		count := rand.Intn(16) // 0–5

     

       37
       +
       		dateStr := day.Format("2006-01-02")

     

       38
       +
       		_, err := stmt.Exec(did, dateStr, count)

     

       39
       +
       		if err != nil {

     

       40
       +
       			log.Println("Failed to insert for date %s: %v", dateStr, err)

     

       41
       +
       		}

     

       42
       +
       	}

     

       43
       +
       

     

       44
       +
       	if err := tx.Commit(); err != nil {

     

       45
       +
       		log.Fatal("Failed to commit:", err)

     

       46
       +
       	}

     

       47
       +
       

     

       48
       +
       	fmt.Println("Done populating punchcard.")

     

       49
       +
       }