Skip to content

Commit

Permalink
Customise some items, start doing CI
Browse files Browse the repository at this point in the history
  • Loading branch information
penelopeysm committed Feb 19, 2024
1 parent 73d981a commit d088a4f
Show file tree
Hide file tree
Showing 18 changed files with 67 additions and 471 deletions.
65 changes: 25 additions & 40 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,39 @@
name: ci
name: Deploy to GitHub Pages

on:
# Trigger the workflow every time you push to the `main` branch
# Using a different branch name? Replace `main` with your branch’s name
push:
branches: [main]
pull_request:
branches: [main]
# Allows you to run this workflow manually from the Actions tab on GitHub.
workflow_dispatch:

# Allow this job to clone the repo and create a page deployment
permissions:
contents: read
pages: write
id-token: write

jobs:
lint:
name: Check for build and type issues
build:
runs-on: ubuntu-latest

steps:
- name: checkout
- name: Checkout your repository using git
uses: actions/checkout@v4

- name: install node
uses: actions/setup-node@v3
with:
node-version: 18

- name: install pnpm
uses: pnpm/action-setup@v2
with:
version: 8
run_install: false

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Setup pnpm cache
uses: actions/cache@v3
- name: Install, build, and upload your site output
uses: withastro/action@v1
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install dependencies
run: pnpm install
path: .
node-version: 18
package-manager: pnpm@latest

# use astro check for issues
- name: Run check
run: pnpm astro check

# ensure build works
- name: Run build
run: pnpm build
deploy:
needs: build
runs-on: ubuntu-latest
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v3
32 changes: 0 additions & 32 deletions .github/workflows/stale.yml

This file was deleted.

2 changes: 0 additions & 2 deletions netlify.toml

This file was deleted.

6 changes: 3 additions & 3 deletions public/manifest.webmanifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Astro Theme Cactus Demo",
"short_name": "Astro_Cactus",
"description": "Starter blog site for Astro",
"name": "Penny's Blog",
"short_name": "pysm_blog",
"description": "A blog, mostly about classical music.",
"icons": [
{
"src": "/192x192.png",
Expand Down
Binary file added public/rosie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 8 additions & 12 deletions src/components/BaseHead.astro
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ const socialImageURL = new URL(ogImage ? ogImage : "/social-card.png", Astro.url
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<title>{siteTitle}</title>

{/* Google Fonts */}
<link href="https://fonts.googleapis.com" rel="preconnect" />
<link crossorigin href="https://fonts.gstatic.com" rel="preconnect" />
<link
href="https://fonts.googleapis.com/css2?family=Fira+Mono:wght@400;700&family=Fira+Sans:ital,wght@0,400;0,600;1,400;1,600&display=swap"
rel="stylesheet"
/>

{/* Icons / Favicon */}
<link href="/favicon.ico" rel="icon" sizes="any" />
<link href="/icon.svg" rel="icon" type="image/svg+xml" />
Expand Down Expand Up @@ -67,16 +75,4 @@ const socialImageURL = new URL(ogImage ? ogImage : "/social-card.png", Astro.url
{/* RSS auto-discovery */}
<link href="/rss.xml" rel="alternate" title={siteConfig.title} type="application/rss+xml" />

{/* Webmentions */}
{
siteConfig.webmentions && (
<>
<link href={siteConfig.webmentions.link} rel="webmention" />
{siteConfig.webmentions.pingback && (
<link href={siteConfig.webmentions.pingback} rel="pingback" />
)}
</>
)
}

<meta content={Astro.generator} name="generator" />
2 changes: 1 addition & 1 deletion src/components/layout/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const year = new Date().getFullYear();
>
<div class="me-0 sm:me-4">
&copy; {siteConfig.author}
{year}.<span class="inline-block">&nbsp;🚀&nbsp;Astro Cactus</span>
{year}
</div>
<nav
aria-label="More on this site"
Expand Down
25 changes: 5 additions & 20 deletions src/components/layout/Header.astro
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,12 @@ const url = new URL(Astro.request.url);
class="inline-flex items-center grayscale hover:filter-none sm:relative sm:inline-block"
href="/"
>
<svg
aria-hidden="true"
<img
alt="ACNH Rosie"
class="me-3 h-10 w-6 sm:absolute sm:start-[-4.5rem] sm:me-0 sm:h-20 sm:w-12"
fill="none"
focusable="false"
viewBox="0 0 272 480"
xmlns="http://www.w3.org/2000/svg"
>
<title>Logo</title>
<path
d="M181.334 93.333v-40L226.667 80v40l-45.333-26.667ZM136.001 53.333 90.667 26.667v426.666L136.001 480V53.333Z"
fill="#B04304"></path>
<path
d="m136.001 119.944 45.333-26.667 45.333 26.667-45.333 26.667-45.333-26.667ZM90.667 26.667 136.001 0l45.333 26.667-45.333 26.666-45.334-26.666ZM181.334 53.277l45.333-26.666L272 53.277l-45.333 26.667-45.333-26.667ZM0 213.277l45.333-26.667 45.334 26.667-45.334 26.667L0 213.277ZM136 239.944l-45.333-26.667v53.333L136 239.944Z"
fill="#FF5D01"></path>
<path
d="m136 53.333 45.333-26.666v120L226.667 120V80L272 53.333V160l-90.667 53.333v240L136 480V306.667L45.334 360V240l45.333-26.667v53.334L136 240V53.333Z"
fill="#53C68C"></path>
<path d="M45.334 240 0 213.334v120L45.334 360V240Z" fill="#B04304"></path>
</svg>
<span class="text-xl font-bold sm:text-2xl">Astro Cactus</span>
src="/rosie.png"
/>
<span class="text-xl font-bold sm:text-2xl">Penny's Corner</span>
</a>
<nav
aria-label="Main menu"
Expand Down
56 changes: 0 additions & 56 deletions src/content/post/webmentions/index.md

This file was deleted.

2 changes: 0 additions & 2 deletions src/layouts/BlogPost.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import type { CollectionEntry } from "astro:content";
import BlogHero from "@/components/blog/Hero.astro";
import TOC from "@/components/blog/TOC.astro";
import WebMentions from "@/components/blog/webmentions/index.astro";
import BaseLayout from "./Base.astro";
Expand All @@ -30,7 +29,6 @@ const { headings } = await post.render();
class="prose prose-sm prose-cactus mt-12 prose-headings:font-semibold prose-headings:text-accent-2 prose-headings:before:absolute prose-headings:before:-ms-4 prose-headings:before:text-accent prose-headings:before:content-['#'] prose-th:before:content-none"
>
<slot />
<WebMentions />
</div>
</article>
</div>
Expand Down
47 changes: 0 additions & 47 deletions src/pages/about.astro

This file was deleted.

Loading

0 comments on commit d088a4f

Please sign in to comment.