Improved tagging

2025-03-08 01:14:48 -08:00
parent 9050faa239
commit 462b08911d
8 changed files with 43 additions and 80 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -26,23 +26,10 @@ jobs:
          echo REPO_VERSION_HASH=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
          echo PROJECT_VERSION=$(npm pkg get version --workspaces=false | tr -d \") >> $GITHUB_OUTPUT

-      - name: Show Metadata
-        run: |
-          set -x
-          echo "${{ steps.project_metadata.outputs.REPO_NAME }}"
-          echo "${{ steps.project_metadata.outputs.repo_version_hash }}"
-          echo "${{ steps.project_metadata.outputs.project_version }}"
  build_and_push:
    runs-on: ubuntu-latest
    needs: determine_version
    steps:
-      - name: Show Metadata
-        run: |
-          set -x
-          echo "${{ needs.determine_version.outputs.repo_name }}"
-          echo "${{ needs.determine_version.outputs.repo_name }}"
-          echo "${{ needs.determine_version.outputs.repo_name }}"
-
      - name: Checkout Repository
        uses: actions/checkout@v4

--- a/public/favicon.png
+++ b/public/favicon.png
--- a/public/favicon.svg
+++ b/public/favicon.svg
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 128 128">
-    <path d="M50.4 78.5a75.1 75.1 0 0 0-28.5 6.9l24.2-65.7c.7-2 1.9-3.2 3.4-3.2h29c1.5 0 2.7 1.2 3.4 3.2l24.2 65.7s-11.6-7-28.5-7L67 45.5c-.4-1.7-1.6-2.8-2.9-2.8-1.3 0-2.5 1.1-2.9 2.7L50.4 78.5Zm-1.1 28.2Zm-4.2-20.2c-2 6.6-.6 15.8 4.2 20.2a17.5 17.5 0 0 1 .2-.7 5.5 5.5 0 0 1 5.7-4.5c2.8.1 4.3 1.5 4.7 4.7.2 1.1.2 2.3.2 3.5v.4c0 2.7.7 5.2 2.2 7.4a13 13 0 0 0 5.7 4.9v-.3l-.2-.3c-1.8-5.6-.5-9.5 4.4-12.8l1.5-1a73 73 0 0 0 3.2-2.2 16 16 0 0 0 6.8-11.4c.3-2 .1-4-.6-6l-.8.6-1.6 1a37 37 0 0 1-22.4 2.7c-5-.7-9.7-2-13.2-6.2Z" />
-    <style>
-        path { fill: #000; }
-        @media (prefers-color-scheme: dark) {
-            path { fill: #FFF; }
-        }
-    </style>
-</svg>
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -1,15 +1,17 @@
 ---
-const pageTitle = Astro.props.title || "Corwin Perren";
+const pageTitle = Astro.props.title ? `${Astro.props.title} - Corwin Perren`: "Corwin Perren";
 ---
+<!doctype html>
 <html lang="en">
 <head>
-    <meta charset="utf-8" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <meta name="viewport" content="width=device-width" />
-    <meta name="generator" content={Astro.generator} />
+    <meta charset="utf-8"/>
+    <link rel="icon" type="image/png" href="/favicon.png"/>
+    <meta name="viewport" content="width=device-width"/>
+    <meta name="generator" content={Astro.generator}/>
    <title>{pageTitle}</title>
 </head>
 <body class="container mx-auto">
+<h1>{pageTitle}</h1>
 <slot/>
 </body>
 </html>
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,22 +0,0 @@
-<!doctype html>
-<html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width" />
-		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-		<meta name="generator" content={Astro.generator} />
-		<title>Corwin Perren</title>
-	</head>
-	<body>
-		<slot />
-	</body>
-</html>
-
-<style>
-	html,
-	body {
-		margin: 0;
-		width: 100%;
-		height: 100%;
-	}
-</style>
--- a/src/pages/hobby/[id].astro
+++ b/src/pages/hobby/[id].astro
@@ -1,17 +1,18 @@
 ---
-import { getCollection, render } from 'astro:content';
+import {getCollection, render} from 'astro:content';
+import BaseLayout from "../../layouts/BaseLayout.astro";
 // 1. Generate a new path for every collection entry
 export async function getStaticPaths() {
    const hobbies = await getCollection('hobbies');
    return hobbies.map(hobby => ({
-        params: { id: hobby.id },
-        props: { hobby: hobby },
+        params: {id: hobby.id},
+        props: {hobby: hobby, title: hobby.id},
    }));
 }
 // 2. For your template, you can get the entry directly from the prop
-const { hobby } = Astro.props;
-const { Content } = await render(hobby);
-
+const {hobby} = Astro.props;
+const {Content} = await render(hobby);
 ---
-<h1>{hobby.id}</h1>
-<Content />
+<BaseLayout title={hobby.id}>
+    <Content/>
+</BaseLayout>
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,23 +1,27 @@
 ---
-import { getCollection } from 'astro:content';
+import {getCollection} from 'astro:content';
+import BaseLayout from "../layouts/BaseLayout.astro";
+
 const projects = await getCollection('projects');
 const hobbies = await getCollection('hobbies');
 ---
-<h1>My Projects</h1>
-<ul>
-    {projects.map(project => (
-            <li><a href={`/project/${project.id}`}>{project.id}</a></li>
-    ))}
-</ul>
+<BaseLayout>
+    <h1>My Projects</h1>
+    <ul>
+        {projects.map(project => (
+                <li><a href={`/project/${project.id}`}>{project.id}</a></li>
+        ))}
+    </ul>
+
+    <h1>My Hobbies</h1>
+    <ul>
+        {hobbies.map(project => (
+                <li><a href={`/hobby/${project.id}`}>{project.id}</a></li>
+        ))}
+    </ul>
+</BaseLayout>

-<h1>My Hobbies</h1>
-<ul>
-    {hobbies.map(project => (
-            <li><a href={`/hobby/${project.id}`}>{project.id}</a></li>
-    ))}
-</ul>

-<!--import BaseLayout from "../layouts/BaseLayout.astro";-->
 <!--import { getCollection, render } from 'astro:content';-->
 <!--import type { CollectionEntry } from 'astro:content';-->

@@ -46,4 +50,3 @@ const hobbies = await getCollection('hobbies');
 <!--&lt;!&ndash;	<div class="prose">&ndash;&gt;-->
 <!--&lt;!&ndash;		&lt;!&ndash;<Content />&ndash;&gt;&ndash;&gt;-->
 <!--&lt;!&ndash;	</div>&ndash;&gt;-->
-<!--</BaseLayout>-->
--- a/src/pages/project/[id].astro
+++ b/src/pages/project/[id].astro
@@ -1,17 +1,18 @@
 ---
-import { getCollection, render } from 'astro:content';
+import {getCollection, render} from 'astro:content';
+import BaseLayout from "../../layouts/BaseLayout.astro";
 // 1. Generate a new path for every collection entry
 export async function getStaticPaths() {
    const projects = await getCollection('projects');
    return projects.map(project => ({
-        params: { id: project.id },
-        props: { project: project },
+        params: {id: project.id},
+        props: {project: project},
    }));
 }
 // 2. For your template, you can get the entry directly from the prop
-const { project } = Astro.props;
-const { Content } = await render(project);
-
+const {project} = Astro.props;
+const {Content} = await render(project);
 ---
-<h1>{project.id}</h1>
-<Content />
+<BaseLayout title={project.id}>
+    <Content/>
+</BaseLayout>