From 037dea4e40f8566248f03e141d101f4454db5ba3 Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 18:14:12 +0900 Subject: [PATCH 01/27] Style still WIP but much better now --- config.ts | 8 +++- src/App.svelte | 34 ++++++++++++--- src/app.css | 27 ++++++++++-- src/lib/AccountComponent.svelte | 77 ++++++++++++++++----------------- src/lib/PostComponent.svelte | 26 ++++++----- src/lib/pdsfetch.ts | 2 +- 6 files changed, 113 insertions(+), 61 deletions(-) diff --git a/config.ts b/config.ts index af29271..a507eb3 100644 --- a/config.ts +++ b/config.ts @@ -6,11 +6,17 @@ export class Config { * The base URL of the PDS (Personal Data Server) * @default "https://pds.witchcraft.systems" */ - static readonly PDS_URL: string = "https://pds.witchcraft.systems"; + static readonly PDS_URL: string = "https://ap.brid.gy"; /** * The base URL of the frontend service for linking to replies * @default "https://deer.social" */ static readonly FRONTEND_URL: string = "https://deer.social"; + + /** + * Maximum number of posts to fetch from the PDS per user + * @default 10 + */ + static readonly MAX_POSTS_PER_USER: number = 1; } \ No newline at end of file diff --git a/src/App.svelte b/src/App.svelte index a8a0033..c5a024c 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -14,9 +14,11 @@

ATProto PDS

Home to {accountsData.length} accounts

+
{#each accountsData as accountObject} {/each} +
{:catch error}

Error: {error.message}

@@ -26,9 +28,11 @@

Loading...

{:then postsData}
+
{#each postsData as postObject} {/each} +
{/await} @@ -48,19 +52,39 @@ } #Feed { width: 65%; - height: 80vh; + height: 100vh; overflow-y: scroll; padding: 20px; + padding-bottom: 0; + padding-top: 0; + margin-top: 0; + margin-bottom: 0; + } + #spacer { + padding: 0; + margin: 0; + height: 10vh; + width: 100%; } #Account { width: 35%; + display: flex; + flex-direction: column; + border: 1px solid #8054f0; + background-color: #0d0620; height: 80vh; - overflow-y: scroll; padding: 20px; - background-color: #070311; - - border-radius: 10px; } + #accountsList { + display: flex; + flex-direction: column; + overflow-y: scroll; + height: 100%; + width: 100%; + padding: 0px; + margin: 0px; + } + #Header { text-align: center; font-size: 2em; diff --git a/src/app.css b/src/app.css index 2232051..988c405 100644 --- a/src/app.css +++ b/src/app.css @@ -6,10 +6,27 @@ ::-webkit-scrollbar { width: 0px; background: transparent; + padding: 0; + margin: 0; +} +::-webkit-scrollbar-thumb { + background: transparent; + border-radius: 0; +} +::-webkit-scrollbar-track { + background: transparent; + border-radius: 0; +} +::-webkit-scrollbar-corner { + background: transparent; + border-radius: 0; +} +::-webkit-scrollbar-button { + background: transparent; + border-radius: 0; } - * { - scrollbar-width: thin; + scrollbar-width: none; scrollbar-color: transparent transparent; -ms-overflow-style: none; /* IE and Edge */ -webkit-overflow-scrolling: touch; @@ -45,8 +62,10 @@ h1 { #app { max-width: 1400px; - margin: 0 auto; - padding: 2rem; + margin: 0; + padding: 0; + margin-left: auto; + margin-right: auto; text-align: center; } diff --git a/src/lib/AccountComponent.svelte b/src/lib/AccountComponent.svelte index 4c987c8..a6093f9 100644 --- a/src/lib/AccountComponent.svelte +++ b/src/lib/AccountComponent.svelte @@ -1,49 +1,48 @@ -
- {#if account.avatarCid} - avatar of {account.displayName} - {/if} -
- {account.displayName || account.handle || account.did} -
+
+ {#if account.avatarCid} + avatar of {account.displayName} + {/if} +
+ {account.displayName || account.handle || account.did}
+
diff --git a/src/lib/PostComponent.svelte b/src/lib/PostComponent.svelte index f077582..b240c95 100644 --- a/src/lib/PostComponent.svelte +++ b/src/lib/PostComponent.svelte @@ -25,18 +25,17 @@
{#if post.replyingUri} - replying to {post.replyingUri.repo} + replying to {post.replyingUri.repo} {/if} -

{post.text}

- +
{post.text}
{#if post.quotingUri} quoting {post.quotingUri.repo} {/if} @@ -66,7 +65,8 @@ flex-direction: column; border: 1px solid #8054f0; background-color: black; - margin-bottom: -1px; + margin-bottom: 15px; + overflow-wrap: break-word; } #postHeader { display: flex; @@ -78,6 +78,7 @@ height: fit-content; border-bottom: 1px solid #8054f0; font-weight: bold; + overflow-wrap: break-word; } #postContent { display: flex; @@ -86,22 +87,25 @@ padding: 10px; background-color: #0d0620; color: white; + overflow-wrap: break-word; } #replyingText { font-size: 0.7em; - color: white; margin: 0; - margin-bottom: 10px; padding: 0; + padding-bottom: 5px; } #postText { margin: 0; + margin-bottom: 5px; padding: 0; } #headerText { margin-left: 10px; font-size: 0.9em; text-align: start; + overflow-wrap: break-word; + overflow: hidden; } #avatar { width: 50px; diff --git a/src/lib/pdsfetch.ts b/src/lib/pdsfetch.ts index ed24c45..61be9bf 100644 --- a/src/lib/pdsfetch.ts +++ b/src/lib/pdsfetch.ts @@ -164,7 +164,7 @@ const fetchPosts = async (did: string) => { params: { repo: did as At.Identifier, collection: "app.bsky.feed.post", - limit: 5, + limit: Config.MAX_POSTS_PER_USER, }, }); return { From ebca274e5a1773bc5ce994bf730f7ccd61e43de9 Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 20:08:13 +0900 Subject: [PATCH 02/27] "Final-ish" design --- config.ts | 10 +- src/App.svelte | 3 + src/app.css | 1 + src/lib/PostComponent.svelte | 219 ++++++++++++++++++++++++++++++----- src/lib/pdsfetch.ts | 2 + 5 files changed, 202 insertions(+), 33 deletions(-) diff --git a/config.ts b/config.ts index a507eb3..b8284a6 100644 --- a/config.ts +++ b/config.ts @@ -6,7 +6,7 @@ export class Config { * The base URL of the PDS (Personal Data Server) * @default "https://pds.witchcraft.systems" */ - static readonly PDS_URL: string = "https://ap.brid.gy"; + static readonly PDS_URL: string = "https://pds.witchcraft.systems"; /** * The base URL of the frontend service for linking to replies @@ -18,5 +18,11 @@ export class Config { * Maximum number of posts to fetch from the PDS per user * @default 10 */ - static readonly MAX_POSTS_PER_USER: number = 1; + static readonly MAX_POSTS_PER_USER: number = 22; + + /** + * Footer text for the dashboard + * @default "Astrally projected from witchcraft.systems" + */ + static readonly FOOTER_TEXT: string = "Astrally projected from witchcraft.systems"; } \ No newline at end of file diff --git a/src/App.svelte b/src/App.svelte index c5a024c..fbf59f1 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -2,6 +2,7 @@ import PostComponent from "./lib/PostComponent.svelte"; import AccountComponent from "./lib/AccountComponent.svelte"; import { fetchAllPosts, Post, getAllMetadataFromPds } from "./lib/pdsfetch"; + import { Config } from "../config"; const postsPromise = fetchAllPosts(); const accountsPromise = getAllMetadataFromPds(); @@ -19,6 +20,7 @@ {/each}
+

{@html Config.FOOTER_TEXT}

{:catch error}

Error: {error.message}

@@ -74,6 +76,7 @@ background-color: #0d0620; height: 80vh; padding: 20px; + margin-left: 20px; } #accountsList { display: flex; diff --git a/src/app.css b/src/app.css index 988c405..05a51fd 100644 --- a/src/app.css +++ b/src/app.css @@ -40,6 +40,7 @@ a { } a:hover { color: #535bf2; + text-decoration: underline; } body { diff --git a/src/lib/PostComponent.svelte b/src/lib/PostComponent.svelte index b240c95..fc24700 100644 --- a/src/lib/PostComponent.svelte +++ b/src/lib/PostComponent.svelte @@ -1,7 +1,58 @@
@@ -14,24 +65,30 @@ /> {/if}
{#if post.replyingUri} - replying to {post.replyingUri.repo} + replying to {post.replyingUri.repo} {/if} -
{post.text}
{#if post.quotingUri} quoting {post.quotingUri.repo} {/if} - {#if post.imagesCid} -
- {#each post.imagesCid as imageLink} - Post Image - {/each} +
{post.text}
+ {#if post.imagesCid && post.imagesCid.length > 0} +
+ Post Image {currentImageIndex + 1} of {post.imagesCid.length} + + {#if post.imagesCid.length > 1} +
+ +
+ {#each post.imagesCid as _, i} +
+ {/each} +
+ +
+ {/if}
{/if} {#if post.videosLinkCid} {/if}
diff --git a/src/lib/pdsfetch.ts b/src/lib/pdsfetch.ts index 61be9bf..d48e1b9 100644 --- a/src/lib/pdsfetch.ts +++ b/src/lib/pdsfetch.ts @@ -32,6 +32,7 @@ class Post { authorDid: string; authorAvatarCid: string | null; postCid: string; + recordName: string; authorHandle: string; displayName: string; text: string; @@ -47,6 +48,7 @@ class Post { account: AccountMetadata, ) { this.postCid = record.cid; + this.recordName = record.uri.split("/").slice(-1)[0]; this.authorDid = account.did; this.authorAvatarCid = account.avatarCid; this.authorHandle = account.handle; From 686ef007c4e9642c0b245e1a3f102c32133b94f8 Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 20:44:56 +0900 Subject: [PATCH 03/27] Mobile-friendly design --- src/App.svelte | 34 ++++++++++++++++++++++++++++++++++ src/lib/PostComponent.svelte | 17 +++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/App.svelte b/src/App.svelte index fbf59f1..6a635b1 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -41,6 +41,8 @@ diff --git a/src/lib/PostComponent.svelte b/src/lib/PostComponent.svelte index fc24700..894540d 100644 --- a/src/lib/PostComponent.svelte +++ b/src/lib/PostComponent.svelte @@ -222,14 +222,6 @@ margin-left: 0px; border-right: #8054f0 1px solid; } - #embedImages { - min-width: 500px; - max-width: 500px; - max-height: 500px; - object-fit: contain; - - margin: 0; - } #carouselContainer { position: relative; width: 100%; @@ -281,4 +273,13 @@ margin-top: 10px; align-self: center; } + + #embedImages { + min-width: min(100%, 500px); + max-width: min(100%, 500px); + max-height: 500px; + object-fit: contain; + + margin: 0; + } From 2a33061ae499f19082f497d731891368734c4d54 Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 20:49:18 +0900 Subject: [PATCH 04/27] CI/CD --- .forgejo/workflows/deploy.yaml | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .forgejo/workflows/deploy.yaml diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml new file mode 100644 index 0000000..6a86efb --- /dev/null +++ b/.forgejo/workflows/deploy.yaml @@ -0,0 +1,44 @@ +name: Deploy + +on: + push: + branches: + - main + +jobs: + deploy: + name: Deploy + runs-on: ubuntu-latest + + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Setup Node + uses: actions/setup-node@v3 + + - name: Install dependencies + uses: bahmutov/npm-install@v1 + + - name: Build project + run: npm run build + + - name: Setup SCP + run: | + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 + chmod -R go-rwx ~/.ssh + ssh-keyscan -H ${{ vars.SERVER_HOST }} >> ~/.ssh/known_hosts + echo "Deploying to ${{ vars.SERVER_HOST }} as ${{ vars.SERVER_USER }} to /home/common/www/${{ github.ref_name }}" + + - name: Debug SSH Connection + run: ssh -v -o PasswordAuthentication=no -i ~/.ssh/id_ed25519 ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }} echo "SSH Connection Successful" + + - name: create folder if not exists + run: | + ssh -i ~/.ssh/id_ed25519 ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }} "mkdir -p /var/www/pds/${{ github.ref_name }}" + + - name: Deploy via SCP + run: | + scp -i ~/.ssh/id_ed25519 -rv ./dist/* ${{ vars.SERVER_USER }}@\[${{ vars.SERVER_HOST }}\]:/var/www/pds/${{ github.ref_name }} + \ No newline at end of file From dcefd4f0cfa8b8a65f4257cd44d896bc08524d9e Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 20:49:54 +0900 Subject: [PATCH 05/27] CI/CD testing branch --- .forgejo/workflows/deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 6a86efb..7c68b85 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - astra/ci jobs: deploy: From 2a08708c695654d26272c12f17549d7eb4a29f74 Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 20:54:21 +0900 Subject: [PATCH 06/27] Replace npm-install action with just "npm install" --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 7c68b85..d1cdd60 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-node@v3 - name: Install dependencies - uses: bahmutov/npm-install@v1 + run: npm install - name: Build project run: npm run build From 9ee49f9089084564237d4d66244218270cb5b12a Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 20:56:13 +0900 Subject: [PATCH 07/27] I have no idea what I am doing --- .forgejo/workflows/deploy.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index d1cdd60..483e969 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -17,9 +17,11 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 - + with: + node-version: '18' + cache: 'npm' - name: Install dependencies - run: npm install + run: npm ci - name: Build project run: npm run build From 3de4682c3449be490a571c05c9f24c746f313c32 Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 21:02:43 +0900 Subject: [PATCH 08/27] I am deno --- .forgejo/workflows/deploy.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 483e969..fb38adb 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -16,12 +16,10 @@ jobs: uses: actions/checkout@v4 - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: '18' - cache: 'npm' + uses: scientific-witchery/setup-deno@v2 + - name: Install dependencies - run: npm ci + run: deno install - name: Build project run: npm run build From 55056128889630f94d969dc04a84b714cec97786 Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 21:06:27 +0900 Subject: [PATCH 09/27] Still no idea --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index fb38adb..7a3ccb7 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Node - uses: scientific-witchery/setup-deno@v2 + uses: https://git.witchctaft.systems/scientific-witchery/setup-deno@v2 - name: Install dependencies run: deno install From 4f85fe2ef6137951980915509e657f139fb398a2 Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 21:07:11 +0900 Subject: [PATCH 10/27] Typo -_- --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 7a3ccb7..b56a3a9 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Node - uses: https://git.witchctaft.systems/scientific-witchery/setup-deno@v2 + uses: https://git.witchcraft.systems/scientific-witchery/setup-deno@v2 - name: Install dependencies run: deno install From df18b3f97ffff1d39c8b6dc7eb0762322e02d4fb Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 21:09:14 +0900 Subject: [PATCH 11/27] Will that work? --- .forgejo/workflows/deploy.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index b56a3a9..a731af1 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -15,14 +15,14 @@ jobs: - name: Checkout repo uses: actions/checkout@v4 - - name: Setup Node - uses: https://git.witchcraft.systems/scientific-witchery/setup-deno@v2 + - name: Setup Deno + uses: https://github.com/denoland/setup-deno@v2 - name: Install dependencies run: deno install - name: Build project - run: npm run build + run: deno task build - name: Setup SCP run: | From a2a7f8fcc792fdd6b75db71a7e5f6c9f6be0354d Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 21:12:10 +0900 Subject: [PATCH 12/27] Am I wrong? --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index a731af1..3a0601f 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Deno - uses: https://github.com/denoland/setup-deno@v2 + uses: https://github.com/denoland/setup-deno@v1 - name: Install dependencies run: deno install From 965753107e38db4734de039af6948e158fef9fda Mon Sep 17 00:00:00 2001 From: Astra Date: Sun, 20 Apr 2025 21:14:27 +0900 Subject: [PATCH 13/27] I am so lost --- .forgejo/workflows/deploy.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 3a0601f..edc1f84 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -15,8 +15,13 @@ jobs: - name: Checkout repo uses: actions/checkout@v4 + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: '20' + - name: Setup Deno - uses: https://github.com/denoland/setup-deno@v1 + uses: https://github.com/denoland/setup-deno@v2 - name: Install dependencies run: deno install From d440f1c465b87ed61a699c7ca0bfb45795e1b062 Mon Sep 17 00:00:00 2001 From: Astra Date: Mon, 21 Apr 2025 14:25:56 +0900 Subject: [PATCH 14/27] Trying a different approach for deploying the thing --- .forgejo/workflows/deploy.yaml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index edc1f84..c6a05d0 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -29,22 +29,30 @@ jobs: - name: Build project run: deno task build - - name: Setup SCP + - name: Setup SSH run: | mkdir -p ~/.ssh echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 - chmod -R go-rwx ~/.ssh + chmod 600 ~/.ssh/id_ed25519 + cat > ~/.ssh/config << EOF + Host deploy + HostName ${{ vars.SERVER_HOST }} + User ${{ vars.SERVER_USER }} + IdentityFile ~/.ssh/id_ed25519 + StrictHostKeyChecking accept-new + BatchMode yes + PasswordAuthentication no + PubkeyAuthentication yes + EOF + chmod 600 ~/.ssh/config ssh-keyscan -H ${{ vars.SERVER_HOST }} >> ~/.ssh/known_hosts - echo "Deploying to ${{ vars.SERVER_HOST }} as ${{ vars.SERVER_USER }} to /home/common/www/${{ github.ref_name }}" + echo "Deploying to ${{ vars.SERVER_HOST }} as ${{ vars.SERVER_USER }} to /var/www/pds/${{ github.ref_name }}" - name: Debug SSH Connection - run: ssh -v -o PasswordAuthentication=no -i ~/.ssh/id_ed25519 ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }} echo "SSH Connection Successful" + run: ssh -v deploy echo "SSH Connection Successful" - - name: create folder if not exists - run: | - ssh -i ~/.ssh/id_ed25519 ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }} "mkdir -p /var/www/pds/${{ github.ref_name }}" + - name: Create folder if not exists + run: ssh deploy "mkdir -p /var/www/pds/${{ github.ref_name }}" - name: Deploy via SCP - run: | - scp -i ~/.ssh/id_ed25519 -rv ./dist/* ${{ vars.SERVER_USER }}@\[${{ vars.SERVER_HOST }}\]:/var/www/pds/${{ github.ref_name }} - \ No newline at end of file + run: scp -r ./dist/* deploy:/var/www/pds/${{ github.ref_name }} From b01b6b7f6584667c9af25828d76e09d0640ede0f Mon Sep 17 00:00:00 2001 From: Astra Date: Mon, 21 Apr 2025 06:30:49 +0000 Subject: [PATCH 15/27] Cleanup and Maintenance part 1 (#1) Co-authored-by: ari Reviewed-on: https://git.witchcraft.systems/scientific-witchery/pds-dash/pulls/1 --- config.ts | 6 +++--- deno.lock | 5 +++++ package.json | 3 ++- src/App.svelte | 15 +++++++------- src/app.css | 26 ++++++++++++++++-------- src/lib/AccountComponent.svelte | 6 +++--- src/lib/PostComponent.svelte | 35 +++++++++++++++++++-------------- src/lib/pdsfetch.ts | 22 ++++++++------------- 8 files changed, 67 insertions(+), 51 deletions(-) diff --git a/config.ts b/config.ts index b8284a6..fe28a5a 100644 --- a/config.ts +++ b/config.ts @@ -15,10 +15,10 @@ export class Config { static readonly FRONTEND_URL: string = "https://deer.social"; /** - * Maximum number of posts to fetch from the PDS per user - * @default 10 + * Maximum number of posts to show in the feed (across all users) + * @default 100 */ - static readonly MAX_POSTS_PER_USER: number = 22; + static readonly MAX_POSTS: number = 100; /** * Footer text for the dashboard diff --git a/deno.lock b/deno.lock index df8c920..0616852 100644 --- a/deno.lock +++ b/deno.lock @@ -6,6 +6,7 @@ "npm:@atcute/identity-resolver@~0.1.2": "0.1.2_@atcute+identity@0.1.3", "npm:@sveltejs/vite-plugin-svelte@^5.0.3": "5.0.3_svelte@5.28.1__acorn@8.14.1_vite@6.3.2__picomatch@4.0.2", "npm:@tsconfig/svelte@^5.0.4": "5.0.4", + "npm:moment@^2.30.1": "2.30.1", "npm:svelte-check@^4.1.5": "4.1.6_svelte@5.28.1__acorn@8.14.1_typescript@5.7.3", "npm:svelte@^5.23.1": "5.28.1_acorn@8.14.1", "npm:typescript@~5.7.2": "5.7.3", @@ -337,6 +338,9 @@ "@jridgewell/sourcemap-codec" ] }, + "moment@2.30.1": { + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==" + }, "mri@1.2.0": { "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==" }, @@ -470,6 +474,7 @@ "npm:@atcute/identity-resolver@~0.1.2", "npm:@sveltejs/vite-plugin-svelte@^5.0.3", "npm:@tsconfig/svelte@^5.0.4", + "npm:moment@^2.30.1", "npm:svelte-check@^4.1.5", "npm:svelte@^5.23.1", "npm:typescript@~5.7.2", diff --git a/package.json b/package.json index 59269d2..9f84465 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "dependencies": { "@atcute/bluesky": "^2.0.2", "@atcute/client": "^3.0.1", - "@atcute/identity-resolver": "^0.1.2" + "@atcute/identity-resolver": "^0.1.2", + "moment": "^2.30.1" }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^5.0.3", diff --git a/src/App.svelte b/src/App.svelte index 6a635b1..95912e2 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -41,8 +41,9 @@ diff --git a/src/lib/PostComponent.svelte b/src/lib/PostComponent.svelte index 894540d..69ea88b 100644 --- a/src/lib/PostComponent.svelte +++ b/src/lib/PostComponent.svelte @@ -2,6 +2,7 @@ import { Post } from "./pdsfetch"; import { Config } from "../../config"; import { onMount } from "svelte"; + import moment from "moment"; let { post }: { post: Post } = $props(); @@ -76,7 +77,9 @@ {post.timenotstamp}{moment(post.timenotstamp).isBefore(moment().subtract(1, "month")) + ? moment(post.timenotstamp).format("MMM D, YYYY") + : moment(post.timenotstamp).fromNow()}

@@ -131,6 +134,7 @@ {/if} {#if post.videosLinkCid} +