Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from Gatsby to Astro #197

Merged
merged 103 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
29040bf
I... am inevitable
WhiteHoodHacker Aug 14, 2024
093ebf2
And I... am Iron Man
WhiteHoodHacker Aug 14, 2024
c2b311a
Fix broken README
WhiteHoodHacker Aug 14, 2024
acd1220
Update README.md
WhiteHoodHacker Aug 14, 2024
edf3bb4
Return back to credit names
WhiteHoodHacker Aug 16, 2024
38889d9
Merge branch 'astro' of https://github.com/sigpwny/sigpwny.com into a…
WhiteHoodHacker Aug 16, 2024
9083312
Remove extra profiles
WhiteHoodHacker Aug 16, 2024
85a1302
Migrate FA2019-SP2021
WhiteHoodHacker Aug 16, 2024
81e6353
Migrate FA2021-FA2022
WhiteHoodHacker Aug 16, 2024
d7768d5
Migrate SP2023-FA2024
WhiteHoodHacker Aug 16, 2024
2b81631
Fix display timezone
WhiteHoodHacker Aug 17, 2024
8002f1f
Fix bad timezone
WhiteHoodHacker Aug 17, 2024
ab524ba
Display timezone in meeting
WhiteHoodHacker Aug 17, 2024
d6e33c1
Deprecate image and assets field
WhiteHoodHacker Aug 17, 2024
ee3f3a8
Fix sidebar and meeting countdown tag
WhiteHoodHacker Aug 19, 2024
d3c328a
Auto-close mobile nav
WhiteHoodHacker Aug 19, 2024
718030a
Improve navbar mobile performance
WhiteHoodHacker Aug 19, 2024
f3c1cbc
Add 404 page
WhiteHoodHacker Aug 19, 2024
227a37d
init events
reteps Aug 20, 2024
5ea06cb
split to EventCard
reteps Aug 20, 2024
6432851
init publication content
reteps Aug 20, 2024
8f81d4e
init publications homepage
reteps Aug 20, 2024
0c15516
fix pdf assets
reteps Aug 20, 2024
a8c96b2
Fix vite copy location
WhiteHoodHacker Aug 20, 2024
5a9d3ba
Lift page routes
WhiteHoodHacker Aug 20, 2024
2757e68
Add back CTA links to navbar
WhiteHoodHacker Aug 20, 2024
74322f2
404 page fixes
WhiteHoodHacker Aug 20, 2024
b52f67f
Add home and join page assets
WhiteHoodHacker Aug 20, 2024
2b8e913
Remove events template
WhiteHoodHacker Aug 20, 2024
f031ba2
BREAKING CHANGE: Set up monorepo structure, upgrade Astro, switch to …
WhiteHoodHacker Aug 20, 2024
1fa7d75
Update GitHub Actions for monorepo
WhiteHoodHacker Aug 20, 2024
4fe823d
Rename deploy-sigpwny-com.yml to deploy.yml
WhiteHoodHacker Aug 20, 2024
e95337c
Update deploy.yml
WhiteHoodHacker Aug 20, 2024
dc40acb
Update workflow node version
WhiteHoodHacker Aug 20, 2024
4d8599b
Fix package-lock.json
WhiteHoodHacker Aug 20, 2024
9706d2c
Update deploy.yml
WhiteHoodHacker Aug 20, 2024
638e9ca
Merge branch 'astro' of github.com:sigpwny/sigpwny.com into astro
WhiteHoodHacker Aug 20, 2024
a9aad5a
Specify working directory for Cloudflare Pages action
WhiteHoodHacker Aug 20, 2024
a451810
Fix working directory issues?
WhiteHoodHacker Aug 21, 2024
b3d1ec1
Add test
WhiteHoodHacker Aug 21, 2024
8d7c86c
Merge branch 'astro' of github.com:sigpwny/sigpwny.com into astro
WhiteHoodHacker Aug 21, 2024
fd81231
Remove test
WhiteHoodHacker Aug 21, 2024
627d305
FIx markdown rendering, add markdown pages
WhiteHoodHacker Aug 21, 2024
e3cd1fa
refactor _global and init fallctf.com
reteps Aug 21, 2024
62cf9d3
create _global/components, _global/utils for site configs, and move B…
reteps Aug 21, 2024
3d39960
WIP
reteps Aug 21, 2024
ef3a701
wip GH action
reteps Aug 21, 2024
32f7c5c
fix GH action yaml
reteps Aug 21, 2024
dbaca20
seperate content layer export and import
reteps Aug 21, 2024
537181e
wip GH action
reteps Aug 21, 2024
7b484f7
wip GH action (switch to inputs)
reteps Aug 21, 2024
b82fe5b
wip GH action - add input typing
reteps Aug 21, 2024
c9049af
wip GH action - fixup input
reteps Aug 21, 2024
bb3411c
wip GH action - fixup secrets
reteps Aug 21, 2024
d6c908d
wip GH action - move fallctf to seperate deployment
reteps Aug 21, 2024
e7b5b88
rename secret
reteps Aug 21, 2024
104e345
fixup secret
reteps Aug 21, 2024
8470476
fixup secret (again)
reteps Aug 21, 2024
9437633
secrets must be secret...right
reteps Aug 21, 2024
6255bed
Fix deployment writing?
WhiteHoodHacker Aug 21, 2024
d73a673
Fix build caching?
WhiteHoodHacker Aug 21, 2024
5685be1
Set workflow level permissions
WhiteHoodHacker Aug 21, 2024
4ad4547
Fix fallctf workflow
WhiteHoodHacker Aug 21, 2024
38827dc
Workflow updates
WhiteHoodHacker Aug 21, 2024
8e4a7d8
Move checkout
WhiteHoodHacker Aug 21, 2024
45b6a20
Update working directory name?
WhiteHoodHacker Aug 21, 2024
73a5b7b
Fix action file name
WhiteHoodHacker Aug 21, 2024
bc8d383
Fix filename frfr
WhiteHoodHacker Aug 21, 2024
e276d69
Add required shell parameter
WhiteHoodHacker Aug 21, 2024
1c53043
init uiuc.tf (CI workflows broken)
reteps Aug 21, 2024
8899245
Fix working-directory key
WhiteHoodHacker Aug 21, 2024
6256026
Fix uiuc.tf workflow, maybe fix deployments for sigpwny.com
WhiteHoodHacker Aug 21, 2024
61fdde1
Fix missing gitHubToken parameter
WhiteHoodHacker Aug 21, 2024
40ca50b
Update README.md
WhiteHoodHacker Aug 21, 2024
9e635f6
Fix status badge layout
WhiteHoodHacker Aug 21, 2024
2785361
Fix Link component inserting extra whitespace
WhiteHoodHacker Aug 21, 2024
f116557
Clean up FAQ
WhiteHoodHacker Aug 21, 2024
7f142f6
Rename lib to utils
WhiteHoodHacker Aug 22, 2024
d05ad1b
Collections are defined in individual sites instead, with schemas bei…
WhiteHoodHacker Aug 22, 2024
12739fd
Deprecate React Link component, improve Astro Link component, improve…
WhiteHoodHacker Aug 22, 2024
818f0db
Improve workflow path triggers
WhiteHoodHacker Aug 22, 2024
1989c88
wip home page
WhiteHoodHacker Aug 23, 2024
52513ab
create publications page
reteps Aug 23, 2024
87de062
Add updated SIGPwny stack
WhiteHoodHacker Aug 24, 2024
ba22688
init fallctf event layout
reteps Aug 25, 2024
605fae2
init event page
reteps Aug 25, 2024
3f7afb5
Add pwny rainbow colors, format stack, fix FAQ
WhiteHoodHacker Aug 25, 2024
0e572e8
Hide events from navbar, show temporary page for events
WhiteHoodHacker Aug 25, 2024
b15a549
Fix recursive redirects
WhiteHoodHacker Aug 25, 2024
19d8a38
Add meeting schedule disclaimer, clean up
WhiteHoodHacker Aug 25, 2024
396b387
Temporarily remove links from SIGPwnyStack component
WhiteHoodHacker Aug 25, 2024
355b41f
Hide test meeting
WhiteHoodHacker Aug 25, 2024
d1a07d3
Fix Event schema, add Card component, add sponsors
WhiteHoodHacker Aug 25, 2024
2e8d2e4
Update sponsors CTA prose
WhiteHoodHacker Aug 25, 2024
57c929f
Publications now uses general Card component
WhiteHoodHacker Aug 25, 2024
62c5bcc
Use default values in schemas, fix meeting SEO, update publications
WhiteHoodHacker Aug 25, 2024
d7979ea
Add /join beginner meetings row
WhiteHoodHacker Aug 25, 2024
6ce1aef
Clean up
WhiteHoodHacker Aug 25, 2024
414f316
Fix type error
WhiteHoodHacker Aug 25, 2024
b39ed6c
Merge branch 'main' into astro
WhiteHoodHacker Aug 25, 2024
4f4ef37
Add CSAW
WhiteHoodHacker Aug 25, 2024
397bb32
JavaScript moment
WhiteHoodHacker Aug 25, 2024
e77f4bd
More JavaScript moments
WhiteHoodHacker Aug 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
63 changes: 63 additions & 0 deletions .github/actions/build-astro/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Build Astro site
description: Builds an Astro site with build caching
inputs:
working-directory:
description: Working directory to build site from
required: false
type: string
default: '.'
build-directory:
description: Output directory of built site (from working directory)
required: false
type: string
default: 'dist'
cache-directory:
description: Cache directory (from working directory)
required: false
type: string
default: '.cache'
runs:
using: composite
steps:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: latest
cache: npm
cache-dependency-path: ${{ inputs.working-directory }}/package-lock.json

- name: Restore cached build artifacts and node modules
id: cache-build
uses: actions/cache@v3
env:
cache-name: cache-build-and-modules
with:
path: |
${{ inputs.working-directory }}/.astro
${{ inputs.working-directory }}/${{ inputs.cache-directory }}
${{ inputs.working-directory }}/${{ inputs.build-directory }}
${{ inputs.working-directory }}/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles(format('{0}/**/package-lock.json', inputs.working-directory)) }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-

- if: ${{ steps.cache-build.outputs.cache-hit != 'true' }}
name: (On cache miss) List the state of node modules
continue-on-error: true
run: npm list
shell: bash
working-directory: ${{ inputs.working-directory }}

- if: ${{ steps.cache-build.outputs.cache-hit != 'true' }}
name: (On cache miss) Install node modules
continue-on-error: true
run: npm ci
shell: bash
working-directory: ${{ inputs.working-directory }}

- name: Build site
run: npm run build
shell: bash
working-directory: ${{ inputs.working-directory }}
45 changes: 45 additions & 0 deletions .github/workflows/deploy-fallctf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI/CD (fallctf.com)
on:
push:
paths:
- '_global/**'
- '!_global/content/**'
- '_global/content/events/**'
- '_global/content/profiles/**'
- '.github/**'
- 'fallctf.com/**'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
CI: true
CI_WORKING_DIR: fallctf.com
CI_BUILD_DIR: dist
CI_CACHE_DIR: .cache
jobs:
deploy:
name: Deploy (fallctf.com)
runs-on: ubuntu-latest
permissions:
contents: read
deployments: write
steps:
- name: Check out repository code
uses: actions/checkout@v3

- name: Build site
uses: ./.github/actions/build-astro
with:
working-directory: ${{ env.CI_WORKING_DIR }}
build-directory: ${{ env.CI_BUILD_DIR }}
cache-directory: ${{ env.CI_CACHE_DIR }}

- name: Deploy to Cloudflare Pages
uses: cloudflare/pages-action@v1
with:
apiToken: ${{ secrets.CLOUDFLARE_PAGES_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: ${{ vars.CLOUDFLARE_PROJECT_NAME_FALLCTF }}
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
workingDirectory: ${{ env.CI_WORKING_DIR }}
directory: ${{ env.CI_BUILD_DIR }}
42 changes: 42 additions & 0 deletions .github/workflows/deploy-sigpwny.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: CI/CD (sigpwny.com)
on:
push:
paths:
- '_global/**'
- '.github/**'
- 'sigpwny.com/**'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
CI: true
CI_WORKING_DIR: sigpwny.com
CI_BUILD_DIR: dist
CI_CACHE_DIR: .cache
jobs:
deploy:
name: Deploy (sigpwny.com)
runs-on: ubuntu-latest
permissions:
contents: read
deployments: write
steps:
- name: Check out repository code
uses: actions/checkout@v3

- name: Build site
uses: ./.github/actions/build-astro
with:
working-directory: ${{ env.CI_WORKING_DIR }}
build-directory: ${{ env.CI_BUILD_DIR }}
cache-directory: ${{ env.CI_CACHE_DIR }}

- name: Deploy to Cloudflare Pages
uses: cloudflare/pages-action@v1
with:
apiToken: ${{ secrets.CLOUDFLARE_PAGES_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: ${{ vars.CLOUDFLARE_PROJECT_NAME_SIGPWNY }}
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
workingDirectory: ${{ env.CI_WORKING_DIR }}
directory: ${{ env.CI_BUILD_DIR }}
45 changes: 45 additions & 0 deletions .github/workflows/deploy-uiuctf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI/CD (uiuc.tf)
on:
push:
paths:
- '_global/**'
- '!_global/content/**'
- '_global/content/events/**'
- '_global/content/profiles/**'
- '.github/**'
- 'uiuc.tf/**'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
CI: true
CI_WORKING_DIR: uiuc.tf
CI_BUILD_DIR: dist
CI_CACHE_DIR: .cache
jobs:
deploy:
name: Deploy (uiuc.tf)
runs-on: ubuntu-latest
permissions:
contents: read
deployments: write
steps:
- name: Check out repository code
uses: actions/checkout@v3

- name: Build site
uses: ./.github/actions/build-astro
with:
working-directory: ${{ env.CI_WORKING_DIR }}
build-directory: ${{ env.CI_BUILD_DIR }}
cache-directory: ${{ env.CI_CACHE_DIR }}

- name: Deploy to Cloudflare Pages
uses: cloudflare/pages-action@v1
with:
apiToken: ${{ secrets.CLOUDFLARE_PAGES_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: ${{ vars.CLOUDFLARE_PROJECT_NAME_UIUCTF }}
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
workingDirectory: ${{ env.CI_WORKING_DIR }}
directory: ${{ env.CI_BUILD_DIR }}
65 changes: 0 additions & 65 deletions .github/workflows/deploy.yml

This file was deleted.

16 changes: 8 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
node_modules/
.cache/
public
src/gatsby-types.d.ts
.DS_store
_site/
.vscode/
.prettierrc
# macOS-specific files
.DS_Store

# jetbrains setting folder
.idea/

# vscode setting folder
.vscode/
Loading
Loading