136bbf7 | website

git clone https://git.pyrossh.dev/website

木 Personal website of pyrossh. Built with astrojs, shiki, vite.

136bbf7 — pyrossh 2025-11-15T14:30:48+05:30

update stuff

Generated files not shown: bun.lock

Files changed (24) hide show

alchemy.run.ts +15 -0
package.json +1 -0
src/components/RecursiveList.astro +1 -5
src/content.config.ts +23 -30
src/layouts/{Base.astro → BaseLayout.astro} +59 -1
src/layouts/{Base.css → BaseLayout.css} +0 -0
src/layouts/FileLayout.astro +121 -0
src/layouts/{Repo.astro → RepoLayout.astro} +1 -1
src/pages/404.astro +1 -1
src/pages/500.astro +1 -1
src/pages/cv/index.astro +1 -1
src/pages/index.astro +1 -1
src/pages/only-bible-app/index.astro +1 -1
src/pages/only-bible-app/privacy-policy/index.astro +1 -1
src/pages/only-bible-app/terms-and-conditions/index.astro +1 -1
src/pages/posts/[...slug].astro +1 -1
src/pages/posts/index.astro +1 -1
src/pages/repos/[...slug]/commits/index.astro +1 -1
src/pages/repos/[...slug]/files/[...file]/blame/index.astro +42 -0
src/pages/repos/[...slug]/files/[...file]/history/index.astro +43 -0
src/pages/repos/[...slug]/files/[...file]/index.astro +24 -48
src/pages/repos/[...slug]/files/index.astro +1 -1
src/pages/repos/[...slug]/index.astro +1 -1
src/utils/files.ts +47 -2

alchemy.run.ts ADDED Viewed

@@ -0,0 +1,15 @@
+import alchemy from "alchemy";
+import AWS from "alchemy/aws/control";
+const app = await alchemy("my-first-app");
+const reposBucket = await AWS.S3.Bucket("pyrossh-repos2", {
+  BucketName: "pyrossh-repos2",
+  Tags: [
+    { Key: "Environment", Value: "Production" },
+    { Key: "ProvisionedBy", Value: "Alchemy" }
+  ]
+});
+await app.finalize();

package.json CHANGED Viewed

@@ -18,6 +18,7 @@
     "@astrojs/rss": "^4.0.12",
     "@astrojs/sitemap": "^3.4.1",
     "@tauri-apps/plugin-log": "^2.7.1",
+    "alchemy": "^0.77.5",
     "astro": "^5.9.0",
     "astro-color-scheme": "^1.1.5",
     "astro-expressive-code": "^0.41.3",

src/components/RecursiveList.astro CHANGED Viewed

@@ -33,7 +33,7 @@ const { items, repoTitle, depth = 0 } = Astro.props;
                 size="24px"
                 color="hsl(45deg 75.37% 60%)"
               />
-              <span class="folder-name"> {item.name}</span>
+              <span>{item.name}</span>
             </summary>
             <ul>
               <Astro.self
@@ -88,10 +88,6 @@ const { items, repoTitle, depth = 0 } = Astro.props;
       padding: 0;
       margin: 0.25rem 0 0.5rem 1rem;
     }
-    .folder-name {
-      color: var(--color-link);
-    }
   }
   .file {

src/content.config.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { simpleGit } from "simple-git";
 import { glob } from 'astro/loaders';
 import { defineCollection, z } from 'astro:content';
 import { REPOS } from './consts';
-import { buildFileTree, sortChildren, fileNodeSchema } from "./utils/files";
+import { buildFileTree, sortChildren, CommitSchema, FileNodeSchema, collectCommits } from "./utils/files";
 async function checkFileExists(filePath: string) {
   try {
@@ -24,17 +24,27 @@ export const collections = {
           const readmePath = repoPath + "/README.md";
           console.log("loading repo " + repoPath)
           const git = simpleGit(repoPath)
+          // "-p",
           const commits = await git.log(["--branches", "--tags"]);
           const paths = await git.raw(["ls-files"]);
-          // await git.log(["-p", "--", "file"]); // to get diffs
-          // await git.log(["file"]);
-          const files = await Promise.all(paths.split("\n")
+          const files = [];
-            .filter((p) => p.length > 0)
+          for (const p of paths.split("\n").filter((p) => p.length > 0)) {
+            try {
-            .map((p) => fs.stat(`${repoPath}/${p}`)
+              const stat = await fs.stat(`${repoPath}/${p}`);
+              const isLarge = stat.size > 1024 * 512;
+              const history = isLarge ? { all: [] } : await git.log(["-p", p]);
+              files.push({
+                name: p,
-              .then((stat) => ({ name: p, absolutePath: `${repoPath}/${p}`, ...stat }))
+                absolutePath: `${repoPath}/${p}`,
+                ...stat,
-              .catch(() => null)
+                history: history.all.map(collectCommits),
-            ));
+              })
+            } catch (e) {
+              // Ignore files not found
+              console.log(e);
+            }
+          }
-          const fileTree = sortChildren(buildFileTree(files.filter((f) => f !== null)));
+          const fileTree = sortChildren(buildFileTree(files));
           const readmeContent = await checkFileExists(readmePath) ? await renderMarkdown(await fs.readFile(readmePath, 'utf-8')) : {
             html: '',
             metadata: {},
@@ -46,15 +56,7 @@ export const collections = {
               description: r.description,
               tags: r.tags,
               badges: r.badges || [],
-              commits: commits.all.map((item) => ({
+              commits: commits.all.map(collectCommits),
-                hash: item.hash,
-                message: item.message,
-                body: `${item.message}\n\n${item.body}`,
-                author_name: item.author_name,
-                date: item.date,
-                branches: item.refs.split(",").filter((ref: string) => ref.includes("origin/")).map((ref) => ref.replace("origin/", "")),
-                tags: item.refs.split(",").filter((ref: string) => ref.includes("tag: ")).map((ref) => ref.replace("tag: ", "")),
-              })),
               files: fileTree,
             },
             rendered: readmeContent,
@@ -71,17 +73,8 @@ export const collections = {
         img: z.string(),
         alt: z.string(),
       })).optional(),
-      commits: z.array(z.object({
+      commits: z.array(CommitSchema),
-        hash: z.string(),
-        message: z.string(),
-        body: z.string(),
-        author_name: z.string(),
-        date: z.string(),
-        branches: z.array(z.string()),
-        tags: z.array(z.string()),
-        // diff: z.string(),
-      })),
-      files: z.array(fileNodeSchema),
+      files: z.array(FileNodeSchema),
     }),
   }),
   content: defineCollection({

src/layouts/{Base.astro → BaseLayout.astro} RENAMED Viewed

@@ -1,5 +1,5 @@
 ---
-import "./Base.css"; // Note: This has to be first always
+// import "./BaseLayout.css"; // Note: This has to be first always
 import { ClientRouter } from "astro:transitions";
 import ResetCSS from "@appzic/astro-reset-css";
 import Header from "@/components/Header.astro";
@@ -87,3 +87,61 @@ const image = "/favicon.png";
     <Footer />
   </body>
 </html>
+<style>
+  :root {
+    --color-black: light-dark(hsl(0, 0%, 0%), hsl(0, 0%, 0%));
+    --color-white: light-dark(hsl(0, 0%, 100%), hsl(0, 0%, 100%));
+    --color-accent: light-dark(hsl(65, 92%, 76%), hsl(65, 92%, 76%));
+    --color-body-bg: light-dark(hsl(0, 0%, 100%), hsl(210, 13%, 15%));
+    --color-box-bg: light-dark(hsl(0, 0%, 95%), hsl(210, 13%, 9%));
+    --color-text: light-dark(hsl(0, 0%, 13%), hsl(210, 17%, 98%));
+    --color-link: light-dark(hsl(211, 100%, 45%), hsl(211, 100%, 60%));
+    --color-post-link: light-dark(hsl(0, 0%, 0%), hsl(211, 100%, 60%));
+    --color-highlight-bg: light-dark(hsl(183, 80%, 88%), hsl(183, 80%, 18%));
+    --color-code-fg: light-dark(hsl(348, 86%, 43%), hsl(348, 86%, 80%));
+    --color-code-bg: light-dark(hsl(0, 0%, 95%), hsl(0, 0%, 0%));
+    --color-pre-bg: light-dark(hsl(0, 0%, 95%), hsl(0, 0%, 0%));
+    --color-tag: light-dark(hsl(152, 96%, 35%), hsl(152, 96%, 44%));
+    --btn-light: none;
+    --btn-dark: block;
+    .astro-code,
+    .astro-code span {
+      background: var(--color-pre-bg) !important;
+    }
+  }
+  [data-theme="dark"] {
+    --btn-light: block;
+    --btn-dark: none;
+    .expressive-code .frame pre {
+      background: var(--color-pre-bg) !important;
+    }
+  }
+  body {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    background-color: var(--color-body-bg);
+    color: var(--color-text);
+    font-family: system-ui;
+    text-rendering: optimizeLegibility;
+    font-variant-ligatures: common-ligatures;
+    font-kerning: normal;
+    font-size: 1.25rem;
+    line-height: 1.5;
+    min-height: 100vh;
+    @media (max-width: 720px) {
+      font-size: 1.1rem;
+    }
+  }
+  main {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+    padding-bottom: 1em;
+  }
+</style>

src/layouts/{Base.css → BaseLayout.css} RENAMED Viewed

File without changes

src/layouts/FileLayout.astro ADDED Viewed

@@ -0,0 +1,121 @@
+---
+import { Icon } from "astro-icon/components";
+import { type CollectionEntry } from "astro:content";
+import RepoLayout from "@/layouts/RepoLayout.astro";
+type Props = {
+  repo: CollectionEntry<"repos">;
+  file: {
+    name: string;
+    path: string;
+    size: number;
+    isDirectory: boolean;
+    absolutePath: string;
+  };
+};
+const { repo, file } = Astro.props;
+const { pathname } = Astro.url;
+---
+<RepoLayout data={repo.data}>
+  {
+    (
+      <div>
+        <hr />
+        <div class="title">
+          <span>file:</span>
+          <Icon name="mdi:file" size="24px" color="hsl(0deg 75% 75%)" />
+          <h3>{file.path}</h3>
+        </div>
+        <hr />
+        <div class="nav">
+          <div>
+            <a
+              aria-current={
+                pathname == `/repos/${repo.id}/files/${file.path}`
+                  ? "true"
+                  : "false"
+              }
+              href={`/repos/${repo.id}/files/${file.path}`}
+            >
+              Contents
+            </a>
+          </div>
+          <div>|</div>
+          <div>
+            <a
+              aria-current={
+                pathname == `/repos/${repo.id}/files/${file.path}/history`
+                  ? "true"
+                  : "false"
+              }
+              href={`/repos/${repo.id}/files/${file.path}/history`}
+            >
+              History
+            </a>
+          </div>
+          <div>|</div>
+          <div>
+            <a
+              aria-current={
+                pathname == `/repos/${repo.id}/files/${file.path}/blame`
+                  ? "true"
+                  : "false"
+              }
+              href={`/repos/${repo.id}/files/${file.path}/blame`}
+            >
+              Blame
+            </a>
+          </div>
+        </div>
+        <hr />
+        <slot />
+      </div>
+    )
+  }
+</RepoLayout>
+<style>
+  .nav {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.5rem;
+    @media (max-width: 720px) {
+      margin-top: 0.5rem;
+    }
+    div {
+      padding-right: 0.5rem;
+    }
+    a {
+      font-size: 1rem;
+      font-weight: 500;
+      padding-right: 0.5rem;
+      cursor: pointer;
+      color: var(--color-link);
+      &[aria-current="true"] {
+        text-underline-offset: 4px;
+        text-decoration: underline;
+      }
+    }
+  }
+  .title {
+    display: flex;
+    align-items: center;
+    margin-top: 0.75rem;
+    margin-bottom: 0.5rem;
+    font-size: 1.1rem;
+    font-weight: 500;
+  }
+  span {
+    font-weight: 600;
+    margin-right: 4px;
+  }
+  h3 {
+    text-decoration: underline;
+  }
+</style>

src/layouts/{Repo.astro → RepoLayout.astro} RENAMED Viewed

@@ -1,6 +1,6 @@
 ---
 import { type CollectionEntry } from "astro:content";
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 type Props = Pick<CollectionEntry<"repos">, "data">;

src/pages/404.astro CHANGED Viewed

@@ -1,5 +1,5 @@
 ---
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 ---
 <Layout title="pyrossh" description="Page Not found">

src/pages/500.astro CHANGED Viewed

@@ -1,5 +1,5 @@
 ---
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 ---
 <Layout title="pyrossh" description="Error Page">

src/pages/cv/index.astro CHANGED Viewed

@@ -1,5 +1,5 @@
 ---
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 ---
 <Layout title="cv" description="Peter John's CV">

src/pages/index.astro CHANGED Viewed

@@ -1,6 +1,6 @@
 ---
 import { Image } from "astro:assets";
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 import { REPOS, TOOLS } from "@/consts";
 import styles from "./index.module.css";
 ---

src/pages/only-bible-app/index.astro CHANGED Viewed

@@ -1,6 +1,6 @@
 ---
 import { Image } from "astro:assets";
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 import PlayStoreIcon from "@/assets/icons/playstore.svg";
 import AppStoreIcon from "@/assets/icons/appstore.svg";
 import AppIconPng from "@/assets/images/app_icon.png";

src/pages/only-bible-app/privacy-policy/index.astro CHANGED Viewed

@@ -1,5 +1,5 @@
 ---
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 ---
 <Layout

src/pages/only-bible-app/terms-and-conditions/index.astro CHANGED Viewed

@@ -1,5 +1,5 @@
 ---
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 ---
 <Layout

src/pages/posts/[...slug].astro CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 import { type CollectionEntry, getCollection } from "astro:content";
 import { render } from "astro:content";
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 import FormattedDate from "@/components/FormattedDate.astro";
 export async function getStaticPaths() {

src/pages/posts/index.astro CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 import { getCollection } from "astro:content";
 import FormattedDate from "../../components/FormattedDate.astro";
-import Layout from "@/layouts/Base.astro";
+import Layout from "@/layouts/BaseLayout.astro";
 const posts = (await getCollection("content")).sort(
   (a, b) => b.data.pubDate.valueOf() - a.data.pubDate.valueOf(),

src/pages/repos/[...slug]/commits/index.astro CHANGED Viewed

@@ -1,6 +1,6 @@
 ---
 import { type CollectionEntry, getCollection } from "astro:content";
-import RepoLayout from "@/layouts/Repo.astro";
+import RepoLayout from "@/layouts/RepoLayout.astro";
 import Commit from "@/components/Commit.astro";
 export async function getStaticPaths() {

src/pages/repos/[...slug]/files/[...file]/blame/index.astro ADDED Viewed

@@ -0,0 +1,42 @@
+---
+import { type CollectionEntry, getCollection } from "astro:content";
+import FileLayout from "@/layouts/FileLayout.astro";
+import { collectFiles } from "@/utils/files";
+export async function getStaticPaths() {
+  const repos = await getCollection("repos");
+  return repos.flatMap((repo) => {
+    const allFiles = collectFiles(repo.data.files);
+    return allFiles.map((file) => ({
+      params: { slug: repo.id, file: file.path },
+      props: {
+        repo: repo,
+        file: file,
+      },
+    }));
+  });
+}
+type Props = {
+  repo: CollectionEntry<"repos">;
+  file: {
+    name: string;
+    path: string;
+    size: number;
+    isDirectory: boolean;
+    absolutePath: string;
+    history: {
+      hash: string;
+      message: string;
+      body: string;
+      branches: string[];
+      tags: string[];
+    }[];
+  };
+};
+const { repo, file } = Astro.props;
+---
+<FileLayout repo={repo} file={file}>
+  WIP: Work in Progress...
+</FileLayout>

src/pages/repos/[...slug]/files/[...file]/history/index.astro ADDED Viewed

@@ -0,0 +1,43 @@
+---
+import { type CollectionEntry, getCollection } from "astro:content";
+import FileLayout from "@/layouts/FileLayout.astro";
+import Commit from "@/components/Commit.astro";
+import { collectFiles } from "@/utils/files";
+export async function getStaticPaths() {
+  const repos = await getCollection("repos");
+  return repos.flatMap((repo) => {
+    const allFiles = collectFiles(repo.data.files);
+    return allFiles.map((file) => ({
+      params: { slug: repo.id, file: file.path },
+      props: {
+        repo: repo,
+        file: file,
+      },
+    }));
+  });
+}
+type Props = {
+  repo: CollectionEntry<"repos">;
+  file: {
+    name: string;
+    path: string;
+    size: number;
+    isDirectory: boolean;
+    absolutePath: string;
+    history: {
+      hash: string;
+      message: string;
+      body: string;
+      branches: string[];
+      tags: string[];
+    }[];
+  };
+};
+const { repo, file } = Astro.props;
+---
+<FileLayout repo={repo} file={file}>
+  {file.history.map((commit) => <Commit {...commit} message={commit.body} />)}
+</FileLayout>

src/pages/repos/[...slug]/files/[...file]/index.astro CHANGED Viewed

@@ -3,7 +3,7 @@ import fs from "fs/promises";
 import path from "path";
 import { type CollectionEntry, getCollection } from "astro:content";
 import { Code } from "astro-expressive-code/components";
-import RepoLayout from "@/layouts/Repo.astro";
+import FileLayout from "@/layouts/FileLayout.astro";
 import { collectFiles } from "@/utils/files";
 export async function getStaticPaths() {
@@ -32,7 +32,6 @@ type Props = {
 const { repo, file } = Astro.props;
 const contentBuffer = await fs.readFile(file.absolutePath);
-const name = path.basename(file.name);
 const ext = path.extname(file.name).replace(".", "");
 const isBinary = ["apk", "dex", "ap_", "jar", "fnt"].includes(ext);
 const isLarge = file.size > 1024 * 512; // 512KB
@@ -50,49 +49,26 @@ const isImage = [
 ].includes(ext);
 ---
-<RepoLayout data={repo.data}>
+<FileLayout repo={repo} file={file}>
+  <div>
-  {
+    {
+      isBinary || isLarge ? (
+        <p>The file is too large to be displayed ({file.size} bytes).</p>
-    (
+      ) : isImage ? (
-      <div>
+        <img
+          src={`data:image/${ext};base64,${Buffer.from(contentBuffer).toString("base64")}`}
+          alt={file.path}
+        />
+      ) : (
+        <Code
+          code={
+            Buffer.from(contentBuffer).toString("utf-8") ||
+            "No content to display."
+          }
-        <div class="title">
+          lang={ext || "txt"}
+          wrap
-          <span>file:</span>
+        />
+      )
-          <h3>{file.path}</h3>
+    }
-        </div>
+  </div>
-        {isBinary || isLarge ? (
-          <p>The file is too large to be displayed ({file.size} bytes).</p>
-        ) : isImage ? (
-          <img
-            src={`data:image/${ext};base64,${Buffer.from(contentBuffer).toString("base64")}`}
-            alt={file.path}
-          />
-        ) : (
-          <Code
-            code={
-              Buffer.from(contentBuffer).toString("utf-8") ||
-              "No content to display."
-            }
-            lang={ext || "txt"}
-            wrap
-          />
-        )}
-      </div>
-    )
-  }
-</RepoLayout>
+</FileLayout>
-<style>
-  .title {
-    display: flex;
-    align-items: center;
-    margin-top: 0.75rem;
-    margin-bottom: 0.5rem;
-    font-size: 1.1rem;
-    font-weight: 500;
-  }
-  span {
-    font-weight: 600;
-    margin-right: 4px;
-  }
-  h3 {
-    text-decoration: underline;
-  }
-</style>

src/pages/repos/[...slug]/files/index.astro CHANGED Viewed

@@ -1,6 +1,6 @@
 ---
 import { type CollectionEntry, getCollection } from "astro:content";
-import RepoLayout from "@/layouts/Repo.astro";
+import RepoLayout from "@/layouts/RepoLayout.astro";
 import RecursiveList from "@/components/RecursiveList.astro";
 export async function getStaticPaths() {

src/pages/repos/[...slug]/index.astro CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 import { type CollectionEntry, getCollection } from "astro:content";
 import { render } from "astro:content";
-import RepoLayout from "@/layouts/Repo.astro";
+import RepoLayout from "@/layouts/RepoLayout.astro";
 import Commit from "@/components/Commit.astro";
 import styles from "./index.module.css";

src/utils/files.ts CHANGED Viewed

@@ -1,5 +1,24 @@
 import { z } from 'astro:content';
+export interface DiffSummary {
+  changed: number;
+  insertions: number;
+  deletions: number;
+  files: string[];
+}
+export interface Commit {
+  hash: string;
+  message: string;
+  body: string;
+  author_name: string;
+  author_email: string;
+  date: string;
+  branches: string[];
+  tags: string[];
+  diff: DiffSummary;
+}
 export interface FileNode {
   name: string;
   path: string;
@@ -8,20 +27,45 @@ export interface FileNode {
   size?: number;
   ext?: string;
   absolutePath?: string;
+  history?: Commit[];
 }
+export const CommitSchema = z.object({
+  hash: z.string(),
+  message: z.string(),
+  body: z.string(),
+  author_name: z.string(),
+  author_email: z.string(),
+  date: z.string(),
+  branches: z.array(z.string()),
+  tags: z.array(z.string()),
+  // diff: z.string(),
+});
-export const fileNodeSchema: z.ZodType<FileNode> = z.lazy(() =>
+export const FileNodeSchema: z.ZodType<FileNode> = z.lazy(() =>
   z.object({
     name: z.string(),
     path: z.string(),
     isDirectory: z.boolean(),
-    children: z.array(fileNodeSchema),
+    children: z.array(FileNodeSchema),
     size: z.number(),
     ext: z.string(),
     absolutePath: z.string(),
+    history: z.array(CommitSchema),
   })
 );
+export const collectCommits = (item: { hash: any; message: any; body: any; author_name: any; author_email: any; date: any; refs: string; }) => ({
+  hash: item.hash,
+  message: item.message,
+  body: `${item.message}\n\n${item.body}`,
+  author_name: item.author_name,
+  author_email: item.author_email,
+  date: item.date,
+  branches: item.refs.split(",").filter((ref: string) => ref.includes("origin/")).map((ref) => ref.replace("origin/", "")),
+  tags: item.refs.split(",").filter((ref: string) => ref.includes("tag: ")).map((ref) => ref.replace("tag: ", "")),
+});
 export const collectFiles = (nodes: FileNode[]): FileNode[] => {
   const files: FileNode[] = [];
@@ -76,6 +120,7 @@ export const buildFileTree = (files: any[]): FileNode[] => {
           // It's a file, add file metadata
           newNode.size = file.size;
           newNode.ext = file.ext;
+          newNode.history = file.history;
           newNode.absolutePath = file.absolutePath;
         } else {
           // It's a directory