From 462b08911de341be4fd6efc8af1ed5ff6533f90e Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 8 Mar 2025 01:14:48 -0800 Subject: [PATCH] Improved tagging --- .gitea/workflows/build.yaml | 13 ------------- public/favicon.png | Bin 0 -> 662 bytes public/favicon.svg | 9 --------- src/layouts/BaseLayout.astro | 12 +++++++----- src/layouts/Layout.astro | 22 ---------------------- src/pages/hobby/[id].astro | 17 +++++++++-------- src/pages/index.astro | 33 ++++++++++++++++++--------------- src/pages/project/[id].astro | 17 +++++++++-------- 8 files changed, 43 insertions(+), 80 deletions(-) create mode 100644 public/favicon.png delete mode 100644 public/favicon.svg delete mode 100644 src/layouts/Layout.astro diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 22cc2dc..0be6882 100644 --- 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 diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..80bf719e2121cf05bff67c5495ac4fc7c641fea6 GIT binary patch literal 662 zcmV;H0%`q;P)WFU8GbZ8()Nlj2>E@cM*00H_*L_t(I%axN&YZE~j z$A7asyU8|*i6+EKp{HUks3(!06a|Y=@FpG#y{lJmegr>&UqC?*(jL612SKc&H>C%y z6mt=RB&~UA_HA~?!^Tb0RKW)ZmYL`I&42#;JOVHr3TxIOcfEo<=V8?yge%b9gyefj z{Ju~0wg+)qCJqB~H;&`2RlyeMmLk~=Fuq2VCGt!j;aTXPG2J^20OUmRY6Wk-hB?p- z9yWpK_0My5Wkv5TfV$ZvDZ#Te#nY$;C23WHW0LhPN zbhzY^d`}iw*$!nOAI#miC%T46l8$tWe1eOT`nR|=TTpLj6d>&*r2xkw5aY(19VH_ zKWc$3DBPdJSuUoH&SWR%R?3tf%ujm&5I+9}mcU!9Qn+^t-5$=uKx0)T_Tq3Bn(=t6 w{9_u=4yQ3E(4FBlzUvch^+1`w1O6v|1H9nLx3L4up#T5?07*qoM6N<$g47Hc2><{9 literal 0 HcmV?d00001 diff --git a/public/favicon.svg b/public/favicon.svg deleted file mode 100644 index f157bd1..0000000 --- a/public/favicon.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro index 74a8fde..85f245f 100644 --- 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"; --- + - - - - + + + + {pageTitle} +

{pageTitle}

\ No newline at end of file diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro deleted file mode 100644 index 838fd78..0000000 --- a/src/layouts/Layout.astro +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - Corwin Perren - - - - - - - diff --git a/src/pages/hobby/[id].astro b/src/pages/hobby/[id].astro index 25e2536..a4ca14d 100644 --- 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); --- -

{hobby.id}

- \ No newline at end of file + + + \ No newline at end of file diff --git a/src/pages/index.astro b/src/pages/index.astro index eb277da..4afe7a0 100644 --- 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'); --- -

My Projects

- + +

My Projects

+ + +

My Hobbies

+ + -

My Hobbies

- - @@ -46,4 +50,3 @@ const hobbies = await getCollection('hobbies'); - \ No newline at end of file diff --git a/src/pages/project/[id].astro b/src/pages/project/[id].astro index 0b78494..d462206 100644 --- 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); --- -

{project.id}

- \ No newline at end of file + + + \ No newline at end of file