Skip to content

Commit

Permalink
New design for Bjerk (#794)
Browse files Browse the repository at this point in the history
  • Loading branch information
simenandre authored Nov 11, 2024
1 parent 4093de6 commit 349e733
Show file tree
Hide file tree
Showing 80 changed files with 2,268 additions and 1,327 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:
branches: [main]
schedule:
- cron: '37 7 * * 1'
- cron: "37 7 * * 1"

jobs:
analyze:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ jobs:
- name: Upload website
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount:
'${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}'
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}"
expires: 30d
target: dev
projectId: bjerk-io
Expand Down Expand Up @@ -62,4 +61,4 @@ jobs:
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Apply formatting changes
branch: ${{ github.head_ref }}
branch: ${{ github.head_ref }}
16 changes: 7 additions & 9 deletions .github/workflows/on-push-to-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:
id-token: write

concurrency:
group: 'next-pages'
group: "next-pages"
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -71,9 +71,8 @@ jobs:
if: ${{ steps.branch-names.outputs.current_branch == env.NEXT_BRANCH }}
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount:
'${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}'
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}"
projectId: bjerk-io
channelId: live
target: next
Expand All @@ -82,10 +81,9 @@ jobs:
if: ${{ steps.branch-names.outputs.current_branch != env.NEXT_BRANCH }}
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount:
'${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}'
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}"
projectId: bjerk-io
expires: 30d
channelID: ${{ steps.branch-names.outputs.current_branch }}
target: next
channelID: ${{ steps.branch-names.outputs.current_branch }}
target: next
13 changes: 6 additions & 7 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: On Push
on:
schedule:
# Schedule for every day at 12:00 CEST
- cron: '0 10 * * *'
- cron: "0 10 * * *"
workflow_dispatch:
push:
branches:
Expand All @@ -15,7 +15,7 @@ permissions:
id-token: write

concurrency:
group: 'pages'
group: "pages"
cancel-in-progress: true

jobs:
Expand All @@ -40,7 +40,7 @@ jobs:

- name: Lint 🔨
run: pnpm lint

update-next:
name: Update next
runs-on: ubuntu-latest
Expand All @@ -63,7 +63,7 @@ jobs:
uses: peter-evans/create-pull-request@v6
with:
branch: promote/main-to-next
title: 'Promote changes in main → next'
title: "Promote changes in main → next"
body: |
This PR promotes changes from the main branch to the next branch.
Expand Down Expand Up @@ -96,9 +96,8 @@ jobs:
- name: Upload website
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount:
'${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}'
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BJERK_IO }}"
channelId: live
target: prod
projectId: bjerk-io
12 changes: 12 additions & 0 deletions .prettierrc.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/** @type {import("prettier").Config} */
export default {
plugins: ["prettier-plugin-astro"],
overrides: [
{
files: "*.astro",
options: {
parser: "astro",
},
},
],
};
748 changes: 526 additions & 222 deletions CHANGELOG.md

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ Next branches are development channels for this website. There is a permanent
next website available at https://next.bjerk.io/. This website is deployed when
pushing to the [`next`](https://github.com/bjerkio/website/tree/next) branch.

You can also deploy a temporary next website by pushing to a branch named `next-<name>`.
The URL for that branch will be available in the GitHub Actions logs.
You can also deploy a temporary next website by pushing to a branch named
`next-<name>`. The URL for that branch will be available in the GitHub Actions
logs.

The `next` branch is kept update to date with `main` branches with an auto update
workflow.
The `next` branch is kept update to date with `main` branches with an auto
update workflow.

## Legacy

Expand All @@ -57,5 +58,4 @@ We love contributions! Before submitting a Pull Request, it's always good to
start with a new issue first. Another good way to start is [searching in our
codebase for TODOs][todos].

[todos]:
https://github.com/search?q=repo%3Abjerkio%2Fwebsite%20TODO%3A&type=code
[todos]: https://github.com/search?q=repo%3Abjerkio%2Fwebsite%20TODO%3A&type=code
5 changes: 3 additions & 2 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { defineConfig } from "astro/config";
import remarkGfm from "remark-gfm";
import Icons from "unplugin-icons/vite";

import sitemap from "@astrojs/sitemap";

import alpinejs from "@astrojs/alpinejs";

// https://astro.build/config
export default defineConfig({
site: "https://bjerk.io",
Expand All @@ -17,5 +18,5 @@ export default defineConfig({
markdown: {
remarkPlugins: [remarkGfm],
},
integrations: [sitemap()],
integrations: [sitemap(), alpinejs()],
});
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@
"type": "module",
"version": "0.0.3",
"packageManager": "[email protected]",
"prettier": "@simenandre/prettier",
"scripts": {
"format": "biome format ./ --write && prettier --write src/content",
"format": "prettier --write .",
"lint": "biome lint --apply ./",
"release": "commit-and-tag-version",
"dev": "astro dev",
"start": "astro dev",
"build": "astro build",
"preview": "astro preview",
"astro": "astro"
},
"dependencies": {
"@astrojs/alpinejs": "^0.4.0",
"@astrojs/sitemap": "^3.0.3",
"@fontsource-variable/sora": "^5.0.15",
"@fontsource/ibm-plex-sans": "^5.1.0",
"@types/alpinejs": "^3.0.0",
"alpinejs": "^3.0.0",
"astro": "^4.0.0",
"date-fns": "^2.30.0",
"date-fns-tz": "^2.0.0",
Expand All @@ -28,10 +30,10 @@
"@biomejs/biome": "^1.4.0",
"@iconify-json/ph": "^1.1.6",
"@iconify-json/tabler": "^1.1.103",
"@simenandre/prettier": "^5.0.0",
"prettier-plugin-astro": "^0.14.1",
"commit-and-tag-version": "^12.4.2",
"prettier": "^3.0.3",
"schema-dts": "^1.1.2",
"vitest": "^0.34.6"
}
}
}
Loading

0 comments on commit 349e733

Please sign in to comment.