comparing 8e2091053e5357ec4847aa2679f869b2b6f3c49a and main on veryroundbird.house/pds-dash

+54 -31

.tangled/workflows/build.yml

···

       1
       1
        
       when:

     

       2
       2
       -
       	- event: ["push", "manual"]

     

       3
       3
       -
       		branch: ["main"]

     

       2
       2
       +
         - event: ["push", "manual"]

     

       3
       3
       +
           branch: ["main"]

     

       4
       4
        
       

     

       5
       5
        
       engine: "nixery"

     

       6
       6
        
       

     

       7
       7
        
       dependencies:

     

       8
       8
       -
       	nixpkgs:

     

       9
       9
       -
       		- deno

     

       8
       8
       +
         nixpkgs:

     

       9
       9
       +
           - deno

     

       10
       10
       +
           - openssh

     

       11
       11
       +
           - su

     

       10
       12
        
       

     

       11
       13
        
       steps:

     

       12
       12
       -
       	- name: "Build static files"

     

       13
       13
       -
       		command: "deno run build"

     

       14
       14
       -
       	

     

       15
       15
       -
       	- name: "SSH setup"

     

       16
       16
       -
       		command: |

     

       17
       17
       -
       			mkdir ~/.ssh

     

       18
       18
       -
       			echo "${{secrets.SSH_KEY}}" > ~/.ssh/id_tangledsh

     

       19
       19
       -
       			chmod 600 ~/.ssh/id_tangledsh

     

       20
       20
       -
       			cat > ~/.ssh/config << EOF

     

       21
       21
       -
       			Host deploy

     

       22
       22
       -
       				HostName ${{ secrets.SERVER_HOST }}

     

       23
       23
       -
       				User ${{ secrets.SERVER_USER }}

     

       24
       24
       -
       				IdentityFile ~/.ssh/id_tangledsh

     

       25
       25
       -
       				StrictHostKeyChecking accept-new

     

       26
       26
       -
       				BatchMode yes

     

       27
       27
       -
       				PasswordAuthentication no

     

       28
       28
       -
       				PubkeyAuthentication yes

     

       29
       29
       -
       			EOF

     

       30
       30
       -
       			chmod 600 ~/.ssh/config

     

       31
       31
       -
       			ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts

     

       32
       32
       -
       			echo "🪶 deploying to shimaenaga pds"

     

       33
       33
       -
       	

     

       34
       34
       -
       	- name: "Deploy via SCP"

     

       35
       35
       -
       		run: scp -r ./dist/* deploy:/pds/caddy/webroot

     

       36
       36
       -
       	

     

       37
       37
       -
       	- name: "Done!"

     

       38
       38
       -
       		command: "echo \"🪶 all done!\""
     

       14
       14
       +
         - name: "Pretend we have a real local user"

     

       15
       15
       +
           command: |

     

       16
       16
       +
             echo "🪶 pretend root is a real user"

     

       17
       17
       +
             echo "root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash" >> /etc/passwd

     

       18
       18
       +
           

     

       19
       19
       +
         - name: "Copy config to server"

     

       20
       20
       +
           command: |

     

       21
       21
       +
             echo "🪶 copying config from secrets"

     

       22
       22
       +
             echo "${CONFIG}" > config.ts

     

       23
       23
       +
            

     

       24
       24
       +
         - name: "Set up Deno"

     

       25
       25
       +
           command: |

     

       26
       26
       +
             echo "🪶 installing deno packages"

     

       27
       27
       +
             deno install

     

       28
       28
       +
           

     

       29
       29
       +
         - name: "Build static files"

     

       30
       30
       +
           command: |

     

       31
       31
       +
             echo "🪶 building static files"

     

       32
       32
       +
             deno run build

     

       33
       33
       +
         

     

       34
       34
       +
         - name: "SSH setup"

     

       35
       35
       +
           command: |

     

       36
       36
       +
             echo "🪶 setting up ssh connection"

     

       37
       37
       +
             mkdir ~/.ssh

     

       38
       38
       +
             echo "${SSH_KEY}" > ~/.ssh/id_tangledsh

     

       39
       39
       +
             chmod 600 ~/.ssh/id_tangledsh

     

       40
       40
       +
             cat > /etc/ssh/ssh_config << EOF

     

       41
       41
       +
             Host deploy

     

       42
       42
       +
               HostName ${SERVER_HOST}

     

       43
       43
       +
               User ${SERVER_USER}

     

       44
       44
       +
               IdentityFile ~/.ssh/id_tangledsh

     

       45
       45
       +
               StrictHostKeyChecking no

     

       46
       46
       +
               UserKnownHostsFile /dev/null

     

       47
       47
       +
               BatchMode yes

     

       48
       48
       +
               PasswordAuthentication no

     

       49
       49
       +
               PubkeyAuthentication yes

     

       50
       50
       +
             EOF

     

       51
       51
       +
             chmod 600 /etc/ssh/ssh_config

     

       52
       52
       +
             ssh-keyscan -H $SERVER_HOST >> ~/.ssh/known_hosts

     

       53
       53
       +
         

     

       54
       54
       +
         - name: "Deploy via SCP"

     

       55
       55
       +
           command: |

     

       56
       56
       +
             echo "🪶 deploying files via scp"

     

       57
       57
       +
             scp -r ./dist/* deploy:/pds/caddy/etc/caddy/static

     

       58
       58
       +
         

     

       59
       59
       +
         - name: "Done!"

     

       60
       60
       +
           command: |

     

       61
       61
       +
             echo "🪶 all done!

+3 -1

README.md

···

       10
       10
        
       * Replaced favicon

     

       11
       11
        
       * Ported in guestbook functionality from another PDS frontpage (see new config options)

     

       12
       12
        
       * Secret unique easter egg :)

     

       13
       13
       -
       * Wrote deploy pipeline for tangled.sh

     

       13
       13
       +
       * Wrote deploy pipeline for tangled.sh (WORK IN PROGRESS help try #5 - changing ssh perms?)

     

       14
       14
       +
       

     

       15
       15
       +
       you can see it running at [my pds!](https://shimaenaga.veryroundbird.house)

     

       14
       16
        
       

     

       15
       17
        
       # original readme below this line

     

       16
       18

+71 -2

src/App.svelte

···

       1
       1
        
       <script lang="ts">

     

       2
       2
        
         import PostComponent from "./lib/PostComponent.svelte";

     

       3
       3
       +
         import GuestbookPostComponent from "./lib/GuestbookPostComponent.svelte";

     

       3
       4
        
         import AccountComponent from "./lib/AccountComponent.svelte";

     

       4
       5
        
         import InfiniteLoading from "svelte-infinite-loading";

     

       5
       6
        
         import { getNextPosts, Post, getAllMetadataFromPds, fetchGuestbookPosts } from "./lib/pdsfetch";

     
···

       50
       51
        
       <main>

     

       51
       52
        
         <div id="content">

     

       52
       53
        
           {#await accountsPromise}

     

       53
       53
       -
             <p>Loading...</p>

     

       54
       54
       +
       			<div id="loadingbirds">

     

       55
       55
       +
       			<div class="small">

     

       56
       56
       +
       <pre>

     

       57
       57
       +
                                     █▓░░░░░░░░░▒        

     

       58
       58
       +
                                   █▓▒           ░▒      

     

       59
       59
       +
                                ▓▒▒▒░              ▒     

     

       60
       60
       +
                              ▓▒░░░░                ░▓   

     

       61
       61
       +
                            █▒  ░░     ░   ░   ▓▒    ░█  

     

       62
       62
       +
                          ▓░    ░░     ▒▓░░▒▒░        ▒  

     

       63
       63
       +
       ███████      ██▓▒░▒▒░   ░░░░       ░░░          ▒ 

     

       64
       64
       +
       █▓▓▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▒▒▓▒▒▒▓░                     ▓

     

       65
       65
       +
               ███▓▒░░▒░░░░▓▓█▓▓▒░                      ░

     

       66
       66
       +
                       ▓                                ░

     

       67
       67
       +
                       █              ░                 ▒

     

       68
       68
       +
                       █░                              ▒█

     

       69
       69
       +
                        ▒                             ▒  

     

       70
       70
       +
                        █▒                           █   

     

       71
       71
       +
                          ▓                        ░█    

     

       72
       72
       +
                           ▓▒    ░░              ░▒      

     

       73
       73
       +
                             ▓▒▒░░▒▓░  ░░░▒▒▓▓▒▓▓        

     

       74
       74
       +
                                 █▓█▓▓█    ███▓█         

     

       75
       75
       +
                                  ████      ████         

     

       76
       76
       +
       </pre>

     

       77
       77
       +
       			</div>

     

       78
       78
       +
       			<div class="large">

     

       79
       79
       +
       <pre>

     

       80
       80
       +
                                                                        ████▓▒░░░░░░░▒▓██                   

     

       81
       81
       +
                                                                     █▓░                 ▒█                

     

       82
       82
       +
                                                                  ██▓░                     ▒█              

     

       83
       83
       +
                                                                ██▒                          ▒█            

     

       84
       84
       +
                                                            ███▓▒░                             ▓█          

     

       85
       85
       +
                                                          █▓░   ░                               █          

     

       86
       86
       +
                                                       ██░     ░                                 ░█        

     

       87
       87
       +
                                                      █░                                           ▓       

     

       88
       88
       +
                                                    █▒                                              ▓      

     

       89
       89
       +
                                                 ██▒                                   ▒▓▓           █     

     

       90
       90
       +
                                               █▒                       ▓█     ░▒       ▒▓           ▓█    

     

       91
       91
       +
                                            ██▒                         ▒▓░   ░▒░░                    ▓█   

     

       92
       92
       +
                                        ███▒░                                ░▒▒▒▒▒░                   ▓█  

     

       93
       93
       +
        █████                       ██▓░    ░░░░                                                        █  

     

       94
       94
       +
       █▓▒░░░░░░▒▒▒▓▓██████████▓▓▒░   ░▒▒▒▒▒▒▓▒▒░         ░▒▒░                                          ░█ 

     

       95
       95
       +
          ██████▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▓▒▒▓▓▓▓▒▒▒▒▒▒▓▒░░░▒▒▒░                                           ▒█

     

       96
       96
       +
                     ███▓▓▒▒░░░░       ░░░▒▓▓▓▒▒▓▓▓▓▓▒░░▒▒▒▒░                                             █

     

       97
       97
       +
                                ███▓▓▒         ▒▓▓▓▓▓▓▓█▓▒░░                                              █

     

       98
       98
       +
                                      █▓           ░▒▒▓▒░                                                 ▓

     

       99
       99
       +
                                       █▓                                                                 ▓

     

       100
       100
       +
                                        █                                                                 █

     

       101
       101
       +
                                        █                                                                ░█

     

       102
       102
       +
                                        █                                                                ▓█

     

       103
       103
       +
                                        █░                                                              ▒█ 

     

       104
       104
       +
                                         ▒                                                             ▓█  

     

       105
       105
       +
                                         ▓                                                            █    

     

       106
       106
       +
                                         █▒                                                         ▒█     

     

       107
       107
       +
                                          █▒                                                       ▒█      

     

       108
       108
       +
                                           █▓                                                     ▒█       

     

       109
       109
       +
                                            ██                                                   ██        

     

       110
       110
       +
                                              █▒                                               ▓█          

     

       111
       111
       +
                                               ██░                                           ▒█            

     

       112
       112
       +
                                                  █░                                      ░▓█              

     

       113
       113
       +
                                                    █▓░       ▓▓▓░               ░▓▓▒  ░██                 

     

       114
       114
       +
                                                       ███▓▒░ ▒▓▓▓    ▒▓▓▓▓▓▓▓████▓▓▓▓▒█                   

     

       115
       115
       +
                                                            █▓██▓▓▓▓██          ████▓▓▓██                  

     

       116
       116
       +
                                                               ██▓▓██              ██▓▓██                  

     

       117
       117
       +
                                                              ███▓██               █▓▓▓██                  

     

       118
       118
       +
                                                            ██████              ███████                                        

     

       119
       119
       +
       </pre>

     

       120
       120
       +
       			</div>

     

       121
       121
       +
       			<p id="loadingText" data-text="pds is landing..." title="pds is landing...">pds is landing...</p>

     

       122
       122
       +
             </div>

     

       54
       123
        
           {:then accountsData}

     

       55
       124
        
             <div id="account">

     

       56
       125
        
       				<pre id="asciiart">

     
···

       84
       153
        
       							<div id="guestbookPosts">

     

       85
       154
        
       								{#if guestbookPosts.length > 0}

     

       86
       155
        
       									{#each guestbookPosts as postObject}

     

       87
       87
       -
       										<PostComponent post={postObject as Post} />

     

       156
       156
       +
                           <GuestbookPostComponent post={postObject.post} />

     

       88
       157
        
       									{/each}

     

       89
       158
        
       								{:else}

     

       90
       159
        
       									<p class="noGuestbookPosts">No guestbook posts yet!</p>

+92

src/lib/GuestbookPostComponent.svelte

···

       1
       1
       +
       <script lang="ts">

     

       2
       2
       +
         import { Post } from "./pdsfetch";

     

       3
       3
       +
         import { Config } from "../../config";

     

       4
       4
       +
         import { onMount } from "svelte";

     

       5
       5
       +
         import moment from "moment";

     

       6
       6
       +
         

     

       7
       7
       +
         let { post }: { post: Post } = $props();

     

       8
       8
       +
         console.log(post);

     

       9
       9
       +
       </script>

     

       10
       10
       +
       

     

       11
       11
       +
       <div class="postContainer">

     

       12
       12
       +
         <div class="postHeader">

     

       13
       13
       +
           {#if post.author.avatar}

     

       14
       14
       +
             <img

     

       15
       15
       +
               class="avatar"

     

       16
       16
       +
               src="{post.author.avatar}"

     

       17
       17
       +
               alt="avatar of {post.author.displayName}"

     

       18
       18
       +
             />

     

       19
       19
       +
           {/if}

     

       20
       20
       +
           <div class="headerText">

     

       21
       21
       +
             <a class="displayName" href="{Config.FRONTEND_URL}/profile/{post.author.did}">{post.author.displayName}</a>

     

       22
       22
       +
             <p class="handle">

     

       23
       23
       +
               <a href="{Config.FRONTEND_URL}/profile/{post.author.handle}"

     

       24
       24
       +
                 >@{post.author.handle}</a

     

       25
       25
       +
               >

     

       26
       26
       +
               <a

     

       27
       27
       +
                 class="postLink" href="{Config.FRONTEND_URL}/profile/{post.author.did}/post/{post.record.id}"

     

       28
       28
       +
                 >{moment(post.record.createdAt).isBefore(moment().subtract(1, "month"))

     

       29
       29
       +
                   ? moment(post.record.createdAt).format("MMM D, YYYY")

     

       30
       30
       +
                   : moment(post.record.createdAt).fromNow()}</a>

     

       31
       31
       +
             </p>

     

       32
       32
       +
           </div>

     

       33
       33
       +
         </div>

     

       34
       34
       +
         <div class="postContent">

     

       35
       35
       +
           {#if post.record.quote}

     

       36
       36
       +
             <a

     

       37
       37
       +
               class="quotingText"

     

       38
       38
       +
               href="{Config.FRONTEND_URL}/profile/{post.record.quote.uri}/post/{post

     

       39
       39
       +
                 .quotingUri.rkey}">quoting {post.quotingUri.repo}</a

     

       40
       40
       +
             >

     

       41
       41
       +
           {/if}

     

       42
       42
       +
           <div class="postText">{post.record.text}</div>

     

       43
       43
       +
           {#if post.record.imagesCid && post.record.imagesCid.length > 0}

     

       44
       44
       +
             <div id="carouselContainer">

     

       45
       45
       +
               <img

     

       46
       46
       +
                 class="embedImages"

     

       47
       47
       +
                 alt="Post Image {currentImageIndex + 1} of {post.record.imagesCid.length}"

     

       48
       48
       +
                 src="{Config.PDS_URL}/xrpc/com.atproto.sync.getBlob?did={post.record.author.did}&cid={post.record

     

       49
       49
       +
                   .imagesCid[currentImageIndex]}"

     

       50
       50
       +
               />

     

       51
       51
       +
       

     

       52
       52
       +
               {#if post.imagesCid.length > 1}

     

       53
       53
       +
                 <div class="carouselControls">

     

       54
       54
       +
                   <button

     

       55
       55
       +
                     id="prevBtn"

     

       56
       56
       +
                     onclick={prevImage}

     

       57
       57
       +
                     disabled={currentImageIndex === 0}>←</button

     

       58
       58
       +
                   >

     

       59
       59
       +
                   <div class="carouselIndicators">

     

       60
       60
       +
                     {#each post.record.imagesCid as _, i}

     

       61
       61
       +
                       <div

     

       62
       62
       +
                         class="indicator {i === currentImageIndex ? 'active' : ''}"

     

       63
       63
       +
                       ></div>

     

       64
       64
       +
                     {/each}

     

       65
       65
       +
                   </div>

     

       66
       66
       +
                   <button

     

       67
       67
       +
                     class="nextBtn"

     

       68
       68
       +
                     onclick={nextImage}

     

       69
       69
       +
                     disabled={currentImageIndex === post.imagesCid.length - 1}

     

       70
       70
       +
                     >→</button

     

       71
       71
       +
                   >

     

       72
       72
       +
                 </div>

     

       73
       73
       +
               {/if}

     

       74
       74
       +
             </div>

     

       75
       75
       +
           {/if}

     

       76
       76
       +
           {#if post.record.videosLinkCid}

     

       77
       77
       +
             <!-- svelte-ignore a11y_media_has_caption -->

     

       78
       78
       +
             <video

     

       79
       79
       +
               class="embedVideo"

     

       80
       80
       +
               src="{Config.PDS_URL}/xrpc/com.atproto.sync.getBlob?did={post.authorDid}&cid={post.videosLinkCid}"

     

       81
       81
       +
               controls

     

       82
       82
       +
             ></video>

     

       83
       83
       +
           {/if}

     

       84
       84
       +
           {#if post.gifLink}

     

       85
       85
       +
             <img

     

       86
       86
       +
               class="embedVideo"

     

       87
       87
       +
               src="{post.record.gifLink}"

     

       88
       88
       +
               alt="Post GIF"

     

       89
       89
       +
             />

     

       90
       90
       +
           {/if}

     

       91
       91
       +
         </div>

     

       92
       92
       +
       </div>

+41 -2

themes/birdrights/theme.css

···

       355
       355
        
         white-space: nowrap;

     

       356
       356
        
       }

     

       357
       357
        
       

     

       358
       358
       -
       .accountTooltip {

     

       358
       358
       +
       .accountTooltip[popover] {

     

       359
       359
        
       	border: 1px var(--border-color) solid;

     

       360
       360
        
       	color: var(--text-color);

     

       361
       361
        
       	background-color: var(--content-background-color);

     
···

       429
       429
        
       	padding: 10px;

     

       430
       430
        
       	gap: 10px;

     

       431
       431
        
       	z-index: 10;

     

       432
       432
       +
         grid-template-rows: auto 1fr;

     

       432
       433
        
       }

     

       433
       434
        
       

     

       434
       435
        
       #guestbookContents:popover-open {

     
···

       442
       443
        
       /* Source Link */

     

       443
       444
        
       

     

       444
       445
        
       #footer {

     

       445
       445
       -
       	position: absolute;

     

       446
       446
       +
       	position: fixed;

     

       446
       447
        
       	bottom: 5px;

     

       447
       448
        
       	right: 5px;

     

       448
       449
        
       	z-index: 99;

     
···

       457
       458
        
       

     

       458
       459
        
       #footer:hover {

     

       459
       460
        
       	opacity: 1;

     

       461
       461
       +
       }

     

       462
       462
       +
       

     

       463
       463
       +
       #loadingbirds {

     

       464
       464
       +
       	line-height: 1;

     

       465
       465
       +
       	text-align: center;

     

       466
       466
       +
       	width: 100%;

     

       467
       467
       +
       }

     

       468
       468
       +
       

     

       469
       469
       +
       #loadingbirds pre {

     

       470
       470
       +
       	display: inline-block;

     

       471
       471
       +
       	margin: 0 auto;

     

       472
       472
       +
       	text-align: left;

     

       473
       473
       +
       }

     

       474
       474
       +
       

     

       475
       475
       +
       #loadingbirds .small {

     

       476
       476
       +
       	display: none;

     

       477
       477
       +
       }

     

       478
       478
       +
       

     

       479
       479
       +
       #loadingbirds #loadingText {

     

       480
       480
       +
       	font-family: "Space Mono", monospace;

     

       481
       481
       +
       	text-align: center;

     

       482
       482
       +
       	font-style: oblique 5deg;

     

       483
       483
       +
       	font-size: 2em;

     

       484
       484
       +
       	min-height: 1em;

     

       485
       485
       +
       }

     

       486
       486
       +
       

     

       487
       487
       +
       @media screen and (max-width: 780px) {

     

       488
       488
       +
       	#loadingbirds .small {

     

       489
       489
       +
       		display: block;

     

       490
       490
       +
       	}

     

       491
       491
       +
       	

     

       492
       492
       +
       	#loadingbirds .large {

     

       493
       493
       +
       		display: none;

     

       494
       494
       +
       	}

     

       495
       495
       +
       	

     

       496
       496
       +
       	#loadingbirds #loadingText {

     

       497
       497
       +
       		font-size: 1.25em;

     

       498
       498
       +
       	}

     

       460
       499
        
       }

     

       461
       500
        
       

     

       462
       501
        
       /* Responsive Styling */

Compare changes