Merge pull request 'website-content-updates' (#1) from website-content-updates into main

Reviewed-on: #1

.gitea/workflows/build.yaml

@@ -2,8 +2,6 @@ name: Build and Test
 on:
   push:
     branches: [main]
-#  pull_request:
-#    branches: [main]
 
 jobs:
   determine_version:
@@ -30,13 +28,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_version
     steps:
-      - name: Checkout Obsidian Repo
-        uses: actions/checkout@v4
-        with:
-          repository: caperren/obsidian
-          token: ${{ secrets.ACTIONS_TOKEN }}
-          path: obsidian
-
       - name: Checkout caperren-com Repository
         uses: actions/checkout@v4
         with:
@@ -52,12 +43,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Copy Website Obsidian Content
-        run: |
-          mv "${{ gitea.workspace }}/caperren-com/src/content/config.ts" "${{ gitea.workspace }}/caperren-com/src/config.ts"
-          rm -rf "${{ gitea.workspace }}/caperren-com/src/content"
-          mv "${{ gitea.workspace }}/obsidian/00002 - Projects/Websites/caperren-com" "${{ gitea.workspace }}/caperren-com/src/content"
-          mv "${{ gitea.workspace }}/caperren-com/src/config.ts" "${{ gitea.workspace }}/caperren-com/src/content/config.ts"
       - name: Build and Push
         uses: docker/build-push-action@v5
         with:
@@ -73,17 +58,7 @@ jobs:
     needs: build_and_push
     steps:
       - run: echo "Placeholder"
-#      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
-#      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-#      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-#      - name: Check out repository code
-#        uses: actions/checkout@v4
-#      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
-#      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
-#      - name: List files in the repository
-#        run: |
-#          ls ${{ gitea.workspace }}
-#      - run: echo "🍏 This job's status is ${{ job.status }}."
+
   deploy_production:
     runs-on: ubuntu-latest
     needs: test

.gitignore

@@ -1,3 +1,9 @@
+# Ignore everything under src/content, as they are dynamically added from obsidian
+src/content/*
+
+# Do not ignore config.ts in src/content since that necessary to import the dynamic content
+!src/content/config.ts
+
 # build output
 dist/
 
@@ -21,4 +27,4 @@ pnpm-debug.log*
 .DS_Store
 
 # jetbrains setting folder
-.idea/
+.idea/

Makefile

@@ -0,0 +1,26 @@
+# Makefile for caperren.com
+
+.PHONY: \
+	install \
+	fix \
+	astro_upgrade \
+	build \
+	dev
+
+default: dev
+
+install:
+	npm install
+
+fix:
+	npm audit fix
+
+astro_upgrade:
+	npx @astrojs/upgrade
+
+build:
+	npm run build
+
+dev:
+	npm run dev
+

astro.config.mjs

@@ -2,10 +2,17 @@
 import { defineConfig } from 'astro/config';
 import rehypeAstroRelativeMarkdownLinks from "astro-rehype-relative-markdown-links";
 
+import tailwindcss from "@tailwindcss/vite";
+
 // https://astro.build/config
 export default defineConfig({
-    integrations: [],
-    markdown: {
-        rehypePlugins: [rehypeAstroRelativeMarkdownLinks],
-    },
-});
+  integrations: [],
+
+  markdown: {
+      rehypePlugins: [rehypeAstroRelativeMarkdownLinks],
+  },
+
+  vite: {
+    plugins: [tailwindcss()],
+  },
+});

package.json

@@ -9,7 +9,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.4.2",
-    "astro-rehype-relative-markdown-links": "^0.18.1"
+    "@tailwindcss/vite": "^4.1.11",
+    "astro": "^5.11.0",
+    "astro-navbar": "^2.4.0",
+    "astro-rehype-relative-markdown-links": "^0.18.1",
+    "tailwindcss": "^4.1.11"
   }
 }

src/assets/astro.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" width="115" height="48"><path fill="#17191E" d="M7.77 36.35C6.4 35.11 6 32.51 6.57 30.62c.99 1.2 2.35 1.57 3.75 1.78 2.18.33 4.31.2 6.33-.78.23-.12.44-.27.7-.42.18.55.23 1.1.17 1.67a4.56 4.56 0 0 1-1.94 3.23c-.43.32-.9.61-1.34.91-1.38.94-1.76 2.03-1.24 3.62l.05.17a3.63 3.63 0 0 1-1.6-1.38 3.87 3.87 0 0 1-.63-2.1c0-.37 0-.74-.05-1.1-.13-.9-.55-1.3-1.33-1.32a1.56 1.56 0 0 0-1.63 1.26c0 .06-.03.12-.05.2Z"/><path fill="url(#a)" d="M7.77 36.35C6.4 35.11 6 32.51 6.57 30.62c.99 1.2 2.35 1.57 3.75 1.78 2.18.33 4.31.2 6.33-.78.23-.12.44-.27.7-.42.18.55.23 1.1.17 1.67a4.56 4.56 0 0 1-1.94 3.23c-.43.32-.9.61-1.34.91-1.38.94-1.76 2.03-1.24 3.62l.05.17a3.63 3.63 0 0 1-1.6-1.38 3.87 3.87 0 0 1-.63-2.1c0-.37 0-.74-.05-1.1-.13-.9-.55-1.3-1.33-1.32a1.56 1.56 0 0 0-1.63 1.26c0 .06-.03.12-.05.2Z"/><path fill="#17191E" d="M.02 30.31s4.02-1.95 8.05-1.95l3.04-9.4c.11-.45.44-.76.82-.76.37 0 .7.31.82.76l3.04 9.4c4.77 0 8.05 1.95 8.05 1.95L17 11.71c-.2-.56-.53-.91-.98-.91H7.83c-.44 0-.76.35-.97.9L.02 30.31Zm42.37-5.97c0 1.64-2.05 2.62-4.88 2.62-1.85 0-2.5-.45-2.5-1.41 0-1 .8-1.49 2.65-1.49 1.67 0 3.09.03 4.73.23v.05Zm.03-2.04a21.37 21.37 0 0 0-4.37-.36c-5.32 0-7.82 1.25-7.82 4.18 0 3.04 1.71 4.2 5.68 4.2 3.35 0 5.63-.84 6.46-2.92h.14c-.03.5-.05 1-.05 1.4 0 1.07.18 1.16 1.06 1.16h4.15a16.9 16.9 0 0 1-.36-4c0-1.67.06-2.93.06-4.62 0-3.45-2.07-5.64-8.56-5.64-2.8 0-5.9.48-8.26 1.19.22.93.54 2.83.7 4.06 2.04-.96 4.95-1.37 7.2-1.37 3.11 0 3.97.71 3.97 2.15v.57Zm11.37 3c-.56.07-1.33.07-2.12.07-.83 0-1.6-.03-2.12-.1l-.02.58c0 2.85 1.87 4.52 8.45 4.52 6.2 0 8.2-1.64 8.2-4.55 0-2.74-1.33-4.09-7.2-4.39-4.58-.2-4.99-.7-4.99-1.28 0-.66.59-1 3.65-1 3.18 0 4.03.43 4.03 1.35v.2a46.13 46.13 0 0 1 4.24.03l.02-.55c0-3.36-2.8-4.46-8.2-4.46-6.08 0-8.13 1.49-8.13 4.39 0 2.6 1.64 4.23 7.48 4.48 4.3.14 4.77.62 4.77 1.28 0 .7-.7 1.03-3.71 1.03-3.47 0-4.35-.48-4.35-1.47v-.13Zm19.82-12.05a17.5 17.5 0 0 1-6.24 3.48c.03.84.03 2.4.03 3.24l1.5.02c-.02 1.63-.04 3.6-.04 4.9 0 3.04 1.6 5.32 6.58 5.32 2.1 0 3.5-.23 5.23-.6a43.77 43.77 0 0 1-.46-4.13c-1.03.34-2.34.53-3.78.53-2 0-2.82-.55-2.82-2.13 0-1.37 0-2.65.03-3.84 2.57.02 5.13.07 6.64.11-.02-1.18.03-2.9.1-4.04-2.2.04-4.65.07-6.68.07l.07-2.93h-.16Zm13.46 6.04a767.33 767.33 0 0 1 .07-3.18H82.6c.07 1.96.07 3.98.07 6.92 0 2.95-.03 4.99-.07 6.93h5.18c-.09-1.37-.11-3.68-.11-5.65 0-3.1 1.26-4 4.12-4 1.33 0 2.28.16 3.1.46.03-1.16.26-3.43.4-4.43-.86-.25-1.81-.41-2.96-.41-2.46-.03-4.26.98-5.1 3.38l-.17-.02Zm22.55 3.65c0 2.5-1.8 3.66-4.64 3.66-2.81 0-4.61-1.1-4.61-3.66s1.82-3.52 4.61-3.52c2.82 0 4.64 1.03 4.64 3.52Zm4.71-.11c0-4.96-3.87-7.18-9.35-7.18-5.5 0-9.23 2.22-9.23 7.18 0 4.94 3.49 7.59 9.21 7.59 5.77 0 9.37-2.65 9.37-7.6Z"/><defs><linearGradient id="a" x1="6.33" x2="19.43" y1="40.8" y2="34.6" gradientUnits="userSpaceOnUse"><stop stop-color="#D83333"/><stop offset="1" stop-color="#F041FF"/></linearGradient></defs></svg>

src/assets/background.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1440" height="1024" fill="none"><path fill="url(#a)" fill-rule="evenodd" d="M-217.58 475.75c91.82-72.02 225.52-29.38 341.2-44.74C240 415.56 372.33 315.14 466.77 384.9c102.9 76.02 44.74 246.76 90.31 366.31 29.83 78.24 90.48 136.14 129.48 210.23 57.92 109.99 169.67 208.23 155.9 331.77-13.52 121.26-103.42 264.33-224.23 281.37-141.96 20.03-232.72-220.96-374.06-196.99-151.7 25.73-172.68 330.24-325.85 315.72-128.6-12.2-110.9-230.73-128.15-358.76-12.16-90.14 65.87-176.25 44.1-264.57-26.42-107.2-167.12-163.46-176.72-273.45-10.15-116.29 33.01-248.75 124.87-320.79Z" clip-rule="evenodd" style="opacity:.154"/><path fill="url(#b)" fill-rule="evenodd" d="M1103.43 115.43c146.42-19.45 275.33-155.84 413.5-103.59 188.09 71.13 409 212.64 407.06 413.88-1.94 201.25-259.28 278.6-414.96 405.96-130 106.35-240.24 294.39-405.6 265.3-163.7-28.8-161.93-274.12-284.34-386.66-134.95-124.06-436-101.46-445.82-284.6-9.68-180.38 247.41-246.3 413.54-316.9 101.01-42.93 207.83 21.06 316.62 6.61Z" clip-rule="evenodd" style="opacity:.154"/><defs><linearGradient id="b" x1="373" x2="1995.44" y1="1100" y2="118.03" gradientUnits="userSpaceOnUse"><stop stop-color="#D83333"/><stop offset="1" stop-color="#F041FF"/></linearGradient><linearGradient id="a" x1="107.37" x2="1130.66" y1="1993.35" y2="1026.31" gradientUnits="userSpaceOnUse"><stop stop-color="#3245FF"/><stop offset="1" stop-color="#BC52EE"/></linearGradient></defs></svg>

src/assets/logo-title.svg

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="21.129419mm"
+   height="9.3295746mm"
+   viewBox="0 0 74.868021 33.057548"
+   id="svg4376"
+   version="1.1"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   sodipodi:docname="AP in C Green Mock UP.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4378" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="329.77692"
+     inkscape:cy="530.2417"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:window-width="2546"
+     inkscape:window-height="1386"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="true"
+     inkscape:pagecheckerboard="1"
+     inkscape:deskcolor="#505050"
+     inkscape:export-bgcolor="#ffffff00">
+    <inkscape:page
+       x="0"
+       y="0"
+       width="74.868019"
+       height="33.057549"
+       id="page2"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4381">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-262.90298,-476.37904)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#10ac25;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="279.60336"
+       y="517.86682"
+       id="text4159-4"
+       transform="scale(1.0283363,0.97244452)"
+       inkscape:export-xdpi="120.07"
+       inkscape:export-ydpi="120.07"
+       inkscape:export-filename="text4159-4.svg"><tspan
+         sodipodi:role="line"
+         x="279.60336"
+         y="517.86682"
+         style="font-size:15.425px;line-height:1.25"
+         id="tspan4167-2">Perren</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(-262.90298,-476.37904)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#10ac25;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="260.65689"
+       y="506.06656"
+       id="text3344-4-5"
+       inkscape:export-xdpi="120.07"
+       inkscape:export-ydpi="120.07"><tspan
+         sodipodi:role="line"
+         id="tspan3346-7-6"
+         x="260.65689"
+         y="506.06656"
+         style="font-size:40px;line-height:1.25">C</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#10ac25;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="270.34253"
+       y="498.55893"
+       id="text3348-1-8"
+       transform="scale(1.0028223,0.99718564)"
+       inkscape:export-xdpi="120.07"
+       inkscape:export-ydpi="120.07"><tspan
+         sodipodi:role="line"
+         id="tspan3350-3-1"
+         x="270.34253"
+         y="498.55893"
+         style="font-size:16.283px;line-height:1.25">A</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#10ac25;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="96.614212"
+       y="537.43079"
+       id="text3344-5-7-6"
+       transform="matrix(0.88187751,-0.35574603,0.36069903,0.98843971,0,0)"
+       inkscape:export-xdpi="120.07"
+       inkscape:export-ydpi="120.07"><tspan
+         sodipodi:role="line"
+         id="tspan3370-7-8"
+         x="96.614212"
+         y="537.43079"
+         style="font-size:14.587px;line-height:1.25">P</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#10ac25;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="287.28516"
+       y="490.68661"
+       id="text4159"
+       inkscape:export-xdpi="120.07"
+       inkscape:export-ydpi="120.07"><tspan
+         sodipodi:role="line"
+         id="tspan4161"
+         x="287.28516"
+         y="490.68661"
+         style="font-size:15px;line-height:1.25">Corwin</tspan><tspan
+         sodipodi:role="line"
+         x="287.28516"
+         y="509.43661"
+         style="font-size:15px;line-height:1.25"
+         id="tspan4167"> </tspan></text>
+  </g>
+</svg>

src/components/Carousel.astro

@@ -0,0 +1,8 @@
+---
+const { images } = Astro.props;
+---
+<div class="carousel">
+    {images.map(img => (
+            <img src={img} alt="carousel item" style="width:100%; max-width:600px; margin: 1rem auto; display:block;" />
+    ))}
+</div>

src/components/Navbar.astro

@@ -0,0 +1,150 @@
+---
+import {Image} from 'astro:assets';
+import {Astronav, MenuItems, MenuIcon, Dropdown, DropdownItems} from "astro-navbar";
+
+import logoTitle from "../assets/logo-title.svg";
+
+const navItems = [
+    {name: 'Home', href: '/'},
+    {
+        name: 'Experience↓',
+        href: "#",
+        dropdown: [
+            {name: 'SpaceX    - Hardware Test Engineer II', href: '/experience/spacex-hardware-test-engineer'},
+            {
+                name: 'SpaceX    - Avionics Test Engineer (Intern)',
+                href: '/experience/spacex-avionics-test-engineer-intern'
+            },
+            {name: 'SARL      - Automation Engineer (Student)', href: '/experience/sarl-automation-engineer-student'},
+            {
+                name: 'CEOAS OMG - Software/Electronics Engineer (Student)',
+                href: '/experience/ceoas-omg-software-electronics-engineer-student'
+            },
+            {
+                name: 'OSURC     - Member/Officer/Sub-Team Lead (Student)',
+                href: '/experience/osurc-member-officer-sub-team-lead'
+            },
+        ]
+    },
+    {name: 'Projects↓', href: '/project/project'},
+    {name: 'Hobbies↓', href: '/hobby/hobby'},
+    {name: 'Resume', href: '/resume'},
+    {name: 'Contact', href: '/contact'}
+];
+---
+
+<header class="navbar lg:flex p-5 gap-5">
+    <Astronav>
+        <div class="flex w-full justify-between">
+            <a href="/">
+                <Image src={logoTitle} alt="Logo Title" height="50" loading="eager"/>
+            </a>
+            <div class="block lg:hidden">
+                <MenuIcon class="w-4 h-4 text-gray-800"/>
+            </div>
+        </div>
+        <MenuItems class="hidden lg:flex">
+            <ul class="flex flex-col lg:flex-row lg:gap-5">
+                <li>
+                    <a href="/">Home</a>
+                </li>
+                <!--<li>-->
+                <!--    <Dropdown class="group">-->
+                <!--        <button class="flex items-center">-->
+                <!--            <span> Experience </span>-->
+                <!--            <svg-->
+                <!--                    xmlns="http://www.w3.org/2000/svg"-->
+                <!--                    fill="none"-->
+                <!--                    viewBox="0 0 24 24"-->
+                <!--                    stroke-width="3"-->
+                <!--                    stroke="currentColor"-->
+                <!--                    class="w-3 h-3 mt-0.5 group-open:rotate-180">-->
+                <!--                <path-->
+                <!--                        stroke-linecap="round"-->
+                <!--                        stroke-linejoin="round"-->
+                <!--                        d="M19.5 8.25l-7.5 7.5-7.5-7.5"></path>-->
+                <!--            </svg>-->
+                <!--        </button>-->
+                <!--        <DropdownItems class="relative">-->
+                <!--            <div class="bg-black px-1 py-2 absolute top-0">-->
+                <!--                <ul>-->
+                <!--                    <li>-->
+                <!--                        <a class="whitespace-nowrap" href="#">SpaceX</a>-->
+                <!--                    </li>-->
+                <!--                    <li>-->
+                <!--                        <a class="whitespace-nowrap" href="#">Sinnhuber Aquatic Research Laboratory</a>-->
+                <!--                    </li>-->
+                <!--                    <li>-->
+                <!--                        <a class="whitespace-nowrap" href="#">CEOAS Ocean Mixing Group</a>-->
+                <!--                    </li>-->
+                <!--                </ul>-->
+                <!--            </div>-->
+                <!--        </DropdownItems>-->
+                <!--    </Dropdown>-->
+                <!--</li>-->
+                <!--<li>-->
+                <!--    <Dropdown class="group">-->
+                <!--        <button class="flex items-center">-->
+                <!--            <span> Projects </span>-->
+                <!--            <svg-->
+                <!--                    xmlns="http://www.w3.org/2000/svg"-->
+                <!--                    fill="none"-->
+                <!--                    viewBox="0 0 24 24"-->
+                <!--                    stroke-width="3"-->
+                <!--                    stroke="currentColor"-->
+                <!--                    class="w-3 h-3 mt-0.5 group-open:rotate-180">-->
+                <!--                <path-->
+                <!--                        stroke-linecap="round"-->
+                <!--                        stroke-linejoin="round"-->
+                <!--                        d="M19.5 8.25l-7.5 7.5-7.5-7.5"></path>-->
+                <!--            </svg>-->
+                <!--        </button>-->
+                <!--        <DropdownItems class="relative">-->
+                <!--            <div class="bg-black absolute top-0">-->
+                <!--                <ul>-->
+                <!--                    <li>-->
+                <!--                        <a href="#">Placeholder 1</a>-->
+                <!--                    </li>-->
+                <!--                </ul>-->
+                <!--            </div>-->
+                <!--        </DropdownItems>-->
+                <!--    </Dropdown>-->
+                <!--</li>-->
+                <!--<li>-->
+                <!--    <Dropdown class="group">-->
+                <!--        <button class="flex items-center">-->
+                <!--            <span> Hobbies </span>-->
+                <!--            <svg-->
+                <!--                    xmlns="http://www.w3.org/2000/svg"-->
+                <!--                    fill="none"-->
+                <!--                    viewBox="0 0 24 24"-->
+                <!--                    stroke-width="3"-->
+                <!--                    stroke="currentColor"-->
+                <!--                    class="w-3 h-3 mt-0.5 group-open:rotate-180">-->
+                <!--                <path-->
+                <!--                        stroke-linecap="round"-->
+                <!--                        stroke-linejoin="round"-->
+                <!--                        d="M19.5 8.25l-7.5 7.5-7.5-7.5"></path>-->
+                <!--            </svg>-->
+                <!--        </button>-->
+                <!--        <DropdownItems class="relative">-->
+                <!--            <div class="bg-black absolute top-0">-->
+                <!--                <ul>-->
+                <!--                    <li>Menu 1</li>-->
+                <!--                    <li>Menu 2</li>-->
+                <!--                    <li>Menu 3</li>-->
+                <!--                </ul>-->
+                <!--            </div>-->
+                <!--        </DropdownItems>-->
+                <!--    </Dropdown>-->
+                <!--</li>-->
+                <!--<li>-->
+                <!--    <a href="/resume">Resume</a>-->
+                <!--</li>-->
+                <li>
+                    <a href="/contact">Contact</a>
+                </li>
+            </ul>
+        </MenuItems>
+    </Astronav>
+</header>

src/components/Welcome.astro

@@ -1,211 +0,0 @@
----
-import astroLogo from '../assets/astro.svg';
-import background from '../assets/background.svg';
----
-
-<div id="container">
-	<!--<img id="background" src={background.src} alt="" fetchpriority="high" />-->
-	<main>
-		<h1>This is a test</h1>
-		<!--<section id="hero">-->
-		<!--	<a href="https://astro.build"-->
-		<!--		><img src={astroLogo.src} width="115" height="48" alt="Astro Homepage" /></a-->
-		<!--	>-->
-		<!--	<h1>-->
-		<!--		To get started, open the <code><pre>src/pages</pre></code> directory in your project.-->
-		<!--	</h1>-->
-		<!--	<section id="links">-->
-		<!--		<a class="button" href="https://docs.astro.build">Read our docs</a>-->
-		<!--		<a href="https://astro.build/chat"-->
-		<!--			>Join our Discord <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 127.14 96.36"-->
-		<!--				><path-->
-		<!--					fill="currentColor"-->
-		<!--					d="M107.7 8.07A105.15 105.15 0 0 0 81.47 0a72.06 72.06 0 0 0-3.36 6.83 97.68 97.68 0 0 0-29.11 0A72.37 72.37 0 0 0 45.64 0a105.89 105.89 0 0 0-26.25 8.09C2.79 32.65-1.71 56.6.54 80.21a105.73 105.73 0 0 0 32.17 16.15 77.7 77.7 0 0 0 6.89-11.11 68.42 68.42 0 0 1-10.85-5.18c.91-.66 1.8-1.34 2.66-2a75.57 75.57 0 0 0 64.32 0c.87.71 1.76 1.39 2.66 2a68.68 68.68 0 0 1-10.87 5.19 77 77 0 0 0 6.89 11.1 105.25 105.25 0 0 0 32.19-16.14c2.64-27.38-4.51-51.11-18.9-72.15ZM42.45 65.69C36.18 65.69 31 60 31 53s5-12.74 11.43-12.74S54 46 53.89 53s-5.05 12.69-11.44 12.69Zm42.24 0C78.41 65.69 73.25 60 73.25 53s5-12.74 11.44-12.74S96.23 46 96.12 53s-5.04 12.69-11.43 12.69Z"-->
-		<!--				></path></svg-->
-		<!--			>-->
-		<!--		</a>-->
-		<!--	</section>-->
-		<!--</section>-->
-	</main>
-
-	<!--<a href="https://astro.build/blog/astro-5/" id="news" class="box">-->
-	<!--	<svg width="32" height="32" fill="none" xmlns="http://www.w3.org/2000/svg"-->
-	<!--		><path-->
-	<!--			d="M24.667 12c1.333 1.414 2 3.192 2 5.334 0 4.62-4.934 5.7-7.334 12C18.444 28.567 18 27.456 18 26c0-4.642 6.667-7.053 6.667-14Zm-5.334-5.333c1.6 1.65 2.4 3.43 2.4 5.333 0 6.602-8.06 7.59-6.4 17.334C13.111 27.787 12 25.564 12 22.666c0-4.434 7.333-8 7.333-16Zm-6-5.333C15.111 3.555 16 5.556 16 7.333c0 8.333-11.333 10.962-5.333 22-3.488-.774-6-4-6-8 0-8.667 8.666-10 8.666-20Z"-->
-	<!--			fill="#111827"></path></svg-->
-	<!--	>-->
-	<!--	<h2>What's New in Astro 5.0?</h2>-->
-	<!--	<p>-->
-	<!--		From content layers to server islands, click to learn more about the new features and-->
-	<!--		improvements in Astro 5.0-->
-	<!--	</p>-->
-	<!--</a>-->
-</div>
-
-<style>
-	#background {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		z-index: -1;
-		filter: blur(100px);
-	}
-
-	#container {
-		font-family: Inter, Roboto, 'Helvetica Neue', 'Arial Nova', 'Nimbus Sans', Arial, sans-serif;
-		height: 100%;
-	}
-
-	main {
-		height: 100%;
-		display: flex;
-		justify-content: center;
-	}
-
-	#hero {
-		display: flex;
-		align-items: start;
-		flex-direction: column;
-		justify-content: center;
-		padding: 16px;
-	}
-
-	h1 {
-		font-size: 22px;
-		margin-top: 0.25em;
-	}
-
-	#links {
-		display: flex;
-		gap: 16px;
-	}
-
-	#links a {
-		display: flex;
-		align-items: center;
-		padding: 10px 12px;
-		color: #111827;
-		text-decoration: none;
-		transition: color 0.2s;
-	}
-
-	#links a:hover {
-		color: rgb(78, 80, 86);
-	}
-
-	#links a svg {
-		height: 1em;
-		margin-left: 8px;
-	}
-
-	#links a.button {
-		color: white;
-		background: linear-gradient(83.21deg, #3245ff 0%, #bc52ee 100%);
-		box-shadow:
-			inset 0 0 0 1px rgba(255, 255, 255, 0.12),
-			inset 0 -2px 0 rgba(0, 0, 0, 0.24);
-		border-radius: 10px;
-	}
-
-	#links a.button:hover {
-		color: rgb(230, 230, 230);
-		box-shadow: none;
-	}
-
-	pre {
-		font-family:
-			ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono',
-			monospace;
-		font-weight: normal;
-		background: linear-gradient(14deg, #d83333 0%, #f041ff 100%);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-		background-clip: text;
-		margin: 0;
-	}
-
-	h2 {
-		margin: 0 0 1em;
-		font-weight: normal;
-		color: #111827;
-		font-size: 20px;
-	}
-
-	p {
-		color: #4b5563;
-		font-size: 16px;
-		line-height: 24px;
-		letter-spacing: -0.006em;
-		margin: 0;
-	}
-
-	code {
-		display: inline-block;
-		background:
-			linear-gradient(66.77deg, #f3cddd 0%, #f5cee7 100%) padding-box,
-			linear-gradient(155deg, #d83333 0%, #f041ff 18%, #f5cee7 45%) border-box;
-		border-radius: 8px;
-		border: 1px solid transparent;
-		padding: 6px 8px;
-	}
-
-	.box {
-		padding: 16px;
-		background: rgba(255, 255, 255, 1);
-		border-radius: 16px;
-		border: 1px solid white;
-	}
-
-	#news {
-		position: absolute;
-		bottom: 16px;
-		right: 16px;
-		max-width: 300px;
-		text-decoration: none;
-		transition: background 0.2s;
-		backdrop-filter: blur(50px);
-	}
-
-	#news:hover {
-		background: rgba(255, 255, 255, 0.55);
-	}
-
-	@media screen and (max-height: 368px) {
-		#news {
-			display: none;
-		}
-	}
-
-	@media screen and (max-width: 768px) {
-		#container {
-			display: flex;
-			flex-direction: column;
-		}
-
-		#hero {
-			display: block;
-			padding-top: 10%;
-		}
-
-		#links {
-			flex-wrap: wrap;
-		}
-
-		#links a.button {
-			padding: 14px 18px;
-		}
-
-		#news {
-			right: 16px;
-			left: 16px;
-			bottom: 2.5rem;
-			max-width: 100%;
-		}
-
-		h1 {
-			line-height: 1.5;
-		}
-	}
-</style>

src/content/config.ts

@@ -1,20 +0,0 @@
-// 1. Import utilities from `astro:content`
-import { defineCollection } from 'astro:content';
-
-// 2. Import loader(s)
-import { glob } from 'astro/loaders';
-
-// 3. Define your collection(s)
-const experiences = defineCollection({
-    loader: glob({ pattern: "*.md", base: "src/content/experience" })
-})
-
-const projects = defineCollection({
-    loader: glob({ pattern: "*.md", base: "src/content/projects" })
-})
-const hobbies = defineCollection({
-    loader: glob({ pattern: "*.md", base: "src/content/hobbies" })
-})
-
-// 4. Export a single `collections` object to register your collection(s)
-export const collections = { experiences, projects, hobbies };

src/layouts/BaseLayout.astro

@@ -1,17 +1,20 @@
 ---
+import './src/styles/global.css'
+import Navbar from '../components/Navbar.astro';
+
 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/png" href="/favicon.png"/>
-    <meta name="viewport" content="width=device-width"/>
-    <meta name="generator" content={Astro.generator}/>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{pageTitle}</title>
 </head>
-<body class="container mx-auto">
-<h1>{pageTitle}</h1>
-<slot/>
+<body>
+<Navbar />
+<main style="padding: 2rem;">
+    <slot />
+</main>
 </body>
 </html>

src/pages/contact.astro

@@ -0,0 +1,13 @@
+---
+import BaseLayout from '../layouts/BaseLayout.astro';
+---
+
+<BaseLayout>
+    <div>Email:
+        <a href="mailto:caperren@caperren.com">caperren@caperren.com</a>
+    </div>
+    <div>
+        Phone:
+        <a href="tel:360-298-4396">360-298-4396</a>
+    </div>
+</BaseLayout>

src/pages/experience/[id].astro

@@ -1,18 +0,0 @@
----
-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 experiences = await getCollection('experiences');
-    return experiences.map(experience => ({
-        params: {id: experience.id},
-        props: {experience: experience},
-    }));
-}
-// 2. For your template, you can get the entry directly from the prop
-const {experience} = Astro.props;
-const {Content} = await render(experience);
----
-<BaseLayout title={experience.id}>
-    <Content/>
-</BaseLayout>

src/pages/hobby/[id].astro

@@ -1,18 +0,0 @@
----
-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, 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);
----
-<BaseLayout title={hobby.id}>
-    <Content/>
-</BaseLayout>

src/pages/index.astro

@@ -1,59 +1,9 @@
 ---
-import {getCollection} from 'astro:content';
-import BaseLayout from "../layouts/BaseLayout.astro";
+import BaseLayout from '../layouts/BaseLayout.astro';
+import {Image} from 'astro:assets';
 
-const experiences = await getCollection('experiences');
-const projects = await getCollection('projects');
-const hobbies = await getCollection('hobbies');
+import headshot from "../assets/headshot.png";
 ---
 <BaseLayout>
-    <h1>My Experiences</h1>
-    <ul>
-        {experiences.map(experience => (
-                <li><a href={`/experience/${experience.id}`}>{experience.id}</a></li>
-        ))}
-    </ul>
-    <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>
-
-
-<!--import { getCollection, render } from 'astro:content';-->
-<!--import type { CollectionEntry } from 'astro:content';-->
-
-<!--// 1. Generate a new path for every collection entry-->
-<!--export async function getStaticPaths() {-->
-<!--	const project = await getCollection('project');-->
-<!--	console.log(project)-->
-<!--	return project.map(post => ({-->
-<!--		params: { slug: post.slug }, props: { post },-->
-<!--	}));-->
-<!--}-->
-<!--// 2. For your template, you can get the entry directly from the prop-->
-
-<!--const { post } = Astro.props;-->
-<!--const { Content } = await render(post);-->
-<!--// const { Content } = await entry.render();-->
-<!-- -&#45;&#45;-->
-<!--<BaseLayout pageTitle="">-->
-<!--&lt;!&ndash;	<Baseout pageTitle={entry.data.title}>&ndash;&gt;-->
-<!--&lt;!&ndash;	<h1 class="text-2xl font-bold pt-10">{entry.data.title}</h1>&ndash;&gt;-->
-<!--&lt;!&ndash;	<p class="text-sm py-2">{entry.data.date}</p>&ndash;&gt;-->
-<!--&lt;!&ndash;	<h2 class="font-bold py-2">Tags</h2>&ndash;&gt;-->
-<!--&lt;!&ndash;	&lt;!&ndash;<ul class="list-disc list-inside py-2">&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;	&lt;!&ndash;	{entry.data.tags?.map((tag) => <li><a href={`/tags/${tag}`}>{tag}</a></li>)}&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;	&lt;!&ndash;</ul>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;	<div class="prose">&ndash;&gt;-->
-<!--&lt;!&ndash;		&lt;!&ndash;<Content />&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;	</div>&ndash;&gt;-->
+    <Image class="mx-auto block" src={headshot} alt="headshot" loading="eager"/>
+</BaseLayout>

src/pages/project/[id].astro

@@ -1,18 +0,0 @@
----
-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},
-    }));
-}
-// 2. For your template, you can get the entry directly from the prop
-const {project} = Astro.props;
-const {Content} = await render(project);
----
-<BaseLayout title={project.id}>
-    <Content/>
-</BaseLayout>

src/pages/resume.astro

@@ -0,0 +1,6 @@
+---
+import BaseLayout from '../layouts/BaseLayout.astro';
+---
+
+<BaseLayout>
+</BaseLayout>

src/styles/global.css

@@ -0,0 +1,29 @@
+@import "tailwindcss";
+
+@theme {
+    --color-caperren-green: #10ac25;
+}
+
+body {
+    margin: 0;
+    font-family: system-ui, sans-serif;
+    background-color: #000000;
+    color: var(--color-caperren-green);
+}
+a {
+    color: var(--color-caperren-green);
+    text-decoration: none;
+}
+.navbar {
+    align-items: center;
+    background-color: #000000;
+    border-bottom: 2px solid var(--color-caperren-green);
+}
+.navbar a, .navbar span {
+    font-weight: bold;
+    white-space: nowrap;
+}
+
+/*.astronav-dropdown .group {*/
+/*    background-color: black;*/
+/*}*/