back round 1 view raw

appview/pages: add dashboard to strings page #415

merged

opened by

oppi.li 4 months ago targeting master from push-potvrpwlpwsl

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+58 -20

appview

pages

pages.go

templates

strings

dashboard.html

user

fragments

profileCard.html

state

profile.go

-1

appview/pages/pages.go

···

       416
       416
        
       	UserDid      string

     

       417
       417
        
       	UserHandle   string

     

       418
       418
        
       	FollowStatus db.FollowStatus

     

       419
       419
       -
       	AvatarUri    string

     

       420
       419
        
       	Followers    int

     

       421
       420
        
       	Following    int

     

       422
       421

+57

appview/pages/templates/strings/dashboard.html

···

       1
       1
       +
       {{ define "title" }}strings by {{ or .Card.UserHandle .Card.UserDid  }}{{ end }}

     

       2
       2
       +
       

     

       3
       3
       +
       {{ define "extrameta" }}

     

       4
       4
       +
           <meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid  }}" />

     

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

     

       6
       6
       +
           <meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid  }}" />

     

       7
       7
       +
           <meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />

     

       8
       8
       +
       {{ end }}

     

       9
       9
       +
       

     

       10
       10
       +
       

     

       11
       11
       +
       {{ define "content" }}

     

       12
       12
       +
       <div class="grid grid-cols-1 md:grid-cols-11 gap-4">

     

       13
       13
       +
           <div class="md:col-span-3 order-1 md:order-1">

     

       14
       14
       +
               {{ template "user/fragments/profileCard" .Card }}

     

       15
       15
       +
           </div>

     

       16
       16
       +
           <div id="all-strings" class="md:col-span-8 order-2 md:order-2">

     

       17
       17
       +
               {{ block "allStrings" . }}{{ end }}

     

       18
       18
       +
           </div>

     

       19
       19
       +
       </div>

     

       20
       20
       +
       {{ end }}

     

       21
       21
       +
       

     

       22
       22
       +
       {{ define "allStrings" }}

     

       23
       23
       +
         <p class="text-sm font-bold p-2 dark:text-white">ALL STRINGS</p>

     

       24
       24
       +
         <div id="strings" class="grid grid-cols-1 gap-4 mb-6">

     

       25
       25
       +
           {{ range .Strings }}

     

       26
       26
       +
             {{ template "singleString" (list $ .) }}

     

       27
       27
       +
           {{ else }}

     

       28
       28
       +
             <p class="px-6 dark:text-white">This user does not have any strings yet.</p>

     

       29
       29
       +
           {{ end }}

     

       30
       30
       +
         </div>

     

       31
       31
       +
       {{ end }}

     

       32
       32
       +
       

     

       33
       33
       +
       {{ define "singleString" }}

     

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

     

       35
       35
       +
         {{ $s := index . 1 }}

     

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

     

       37
       37
       +
           <div class="font-medium dark:text-white flex gap-2 items-center">

     

       38
       38
       +
               <a href="/strings/{{ or $root.Card.UserHandle $root.Card.UserDid  }}/{{ $s.Rkey }}">{{ $s.Filename }}</a>

     

       39
       39
       +
           </div>

     

       40
       40
       +
           {{ with $s.Description }}

     

       41
       41
       +
             <div class="text-gray-600 dark:text-gray-300 text-sm">

     

       42
       42
       +
                 {{ . }}

     

       43
       43
       +
             </div>

     

       44
       44
       +
           {{ end }}

     

       45
       45
       +
       

     

       46
       46
       +
           {{ $stat := $s.Stats }}

     

       47
       47
       +
           <div class="text-gray-400 pt-4 text-sm font-mono inline-flex gap-2 mt-auto">

     

       48
       48
       +
             <span>{{ $stat.LineCount }} line{{if ne $stat.LineCount 1}}s{{end}}</span>

     

       49
       49
       +
             <span class="select-none [&:before]:content-['·']"></span>

     

       50
       50
       +
             {{ with $s.Edited }}

     

       51
       51
       +
               <span>edited {{ template "repo/fragments/shortTimeAgo" . }}</span>

     

       52
       52
       +
             {{ else }}

     

       53
       53
       +
               {{ template "repo/fragments/shortTimeAgo" $s.Created }}

     

       54
       54
       +
             {{ end }}

     

       55
       55
       +
           </div>

     

       56
       56
       +
         </div>

     

       57
       57
       +
       {{ end }}

+1 -3

appview/pages/templates/user/fragments/profileCard.html

···

       2
       2
        
         <div class="bg-white dark:bg-gray-800 px-6 py-4 rounded drop-shadow-sm max-h-fit">

     

       3
       3
        
           <div class="grid grid-cols-3 md:grid-cols-1 gap-1 items-center">

     

       4
       4
        
             <div id="avatar" class="col-span-1 flex justify-center items-center">

     

       5
       5
       -
               {{ if .AvatarUri }}

     

       6
       5
        
               <div class="w-3/4 aspect-square relative">

     

       7
       7
       -
                 <img class="absolute inset-0 w-full h-full object-cover rounded-full p-2" src="{{ .AvatarUri }}" />

     

       6
       6
       +
                 <img class="absolute inset-0 w-full h-full object-cover rounded-full p-2" src="{{ fullAvatar .UserDid }}" />

     

       8
       7
        
               </div>

     

       9
       9
       -
               {{ end }}

     

       10
       8
        
             </div>

     

       11
       9
        
             <div class="col-span-2">

     

       12
       10
        
               <p title="{{ didOrHandle .UserDid .UserHandle }}"

-16

appview/state/profile.go

···

       1
       1
        
       package state

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"crypto/hmac"

     

       5
       5
       -
       	"crypto/sha256"

     

       6
       6
       -
       	"encoding/hex"

     

       7
       4
        
       	"fmt"

     

       8
       5
        
       	"log"

     

       9
       6
        
       	"net/http"

     
···

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

     

       143
       140
        
       	}

     

       144
       141
        
       

     

       145
       145
       -
       	profileAvatarUri := s.GetAvatarUri(ident.Handle.String())

     

       146
       142
        
       	s.pages.ProfilePage(w, pages.ProfilePageParams{

     

       147
       143
        
       		LoggedInUser:       loggedInUser,

     

       148
       144
        
       		Repos:              pinnedRepos,

     
···

       151
       147
        
       		Card: pages.ProfileCard{

     

       152
       148
        
       			UserDid:      ident.DID.String(),

     

       153
       149
        
       			UserHandle:   ident.Handle.String(),

     

       154
       154
       -
       			AvatarUri:    profileAvatarUri,

     

       155
       150
        
       			Profile:      profile,

     

       156
       151
        
       			FollowStatus: followStatus,

     

       157
       152
        
       			Followers:    followers,

     
···

       194
       189
        
       		log.Printf("getting follow stats repos for %s: %s", ident.DID.String(), err)

     

       195
       190
        
       	}

     

       196
       191
        
       

     

       197
       197
       -
       	profileAvatarUri := s.GetAvatarUri(ident.Handle.String())

     

       198
       198
       -
       

     

       199
       192
        
       	s.pages.ReposPage(w, pages.ReposPageParams{

     

       200
       193
        
       		LoggedInUser: loggedInUser,

     

       201
       194
        
       		Repos:        repos,

     
···

       203
       196
        
       		Card: pages.ProfileCard{

     

       204
       197
        
       			UserDid:      ident.DID.String(),

     

       205
       198
        
       			UserHandle:   ident.Handle.String(),

     

       206
       206
       -
       			AvatarUri:    profileAvatarUri,

     

       207
       199
        
       			Profile:      profile,

     

       208
       200
        
       			FollowStatus: followStatus,

     

       209
       201
        
       			Followers:    followers,

     
···

       212
       204
        
       	})

     

       213
       205
        
       }

     

       214
       206
        
       

     

       215
       215
       -
       func (s *State) GetAvatarUri(handle string) string {

     

       216
       216
       -
       	secret := s.config.Avatar.SharedSecret

     

       217
       217
       -
       	h := hmac.New(sha256.New, []byte(secret))

     

       218
       218
       -
       	h.Write([]byte(handle))

     

       219
       219
       -
       	signature := hex.EncodeToString(h.Sum(nil))

     

       220
       220
       -
       	return fmt.Sprintf("%s/%s/%s", s.config.Avatar.Host, signature, handle)

     

       221
       221
       -
       }

     

       222
       222
       -
       

     

       223
       207
        
       func (s *State) UpdateProfileBio(w http.ResponseWriter, r *http.Request) {

     

       224
       208
        
       	user := s.oauth.GetUser(r)

     

       225
       209