aneesas · Oct 5, 2026 · Mar 23, 2023 · Mar 23, 2023 · Mar 23, 2023 · Mar 23, 2023
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,7 @@
+node_modules
+dist
+.astro
+.git
+.DS_Store
+*.log
+_site
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,49 @@
+# Builds the site and publishes it to GitHub Pages on every push to main.
+# Pull requests are built (and the site uploaded as an artifact) but not deployed.
+# Repo setting required once: Settings -> Pages -> Source: "GitHub Actions".
+name: Deploy to GitHub Pages
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  # Rebuild on demand from the Actions tab.
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: pages-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+
+      - run: npm ci
+      - run: npm run build
+
+      - uses: actions/upload-pages-artifact@v3
+        with:
+          path: dist
+
+  deploy:
+    if: github.event_name != 'pull_request'
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,16 @@
-docs
-.sass-cache
-_site
-docker/Gemfile
-Gemfile.lock
-_bibliography
-bibliography-master
+# build output
+dist/
+.astro/
+
+# dependencies
+node_modules/
+
+# old Jekyll build checkout (gh-pages branch)
+_site/
+
+# misc
 **/.DS_Store
+*.log
+npm-debug.log*
+.env
+.env.production
diff --git a/.gitmodules b/.gitmodules
diff --git a/00_serve.sh b/00_serve.sh
diff --git a/01_discard-edits.sh b/01_discard-edits.sh
diff --git a/02_build-and-deploy.sh b/02_build-and-deploy.sh
diff --git a/03_open-firefox.sh b/03_open-firefox.sh
diff --git a/404.html b/404.html
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,17 @@
+# Single image used for both local dev (astro dev) and producing the static
+# build (astro build). Node lives only in here — the host needs just Docker.
+FROM node:20-alpine
+
+WORKDIR /app
+
+# Install deps first so this layer is cached unless package.json changes.
+COPY package.json package-lock.json* ./
+RUN npm install
+
+# App source is bind-mounted in dev (see docker-compose.yml); copying it here
+# means the image also works standalone for `npm run build`.
+COPY . .
+
+EXPOSE 4321
+
+CMD ["npm", "run", "dev"]
diff --git a/Gemfile b/Gemfile
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -1,40 +1,95 @@
 # mit-acl.github.io
-
-Jekyll website for Aerospace Controls Laboratory at MIT.
+
+Website for the Aerospace Controls Laboratory at MIT ([acl.mit.edu](https://acl.mit.edu)), built with
+[Astro](https://astro.build). Content is Markdown with a short YAML block at the top of each file.
 
 ## Setup
-We build the static site locally and then push it to the `gh-pages` branch for hosting. This requires you clone the repository and `_site` folder correctly.
 
 ```bash
 git clone git@github.com:mit-acl/mit-acl.github.io.git
-cd mit-acl.github.io.git
-git clone -b gh-pages `git config remote.origin.url` _site
+cd mit-acl.github.io
+```
+
+## Running it locally
+
+You only need **Docker** installed (no Node.js, no Ruby). Then:
+
+```bash
+./serve.sh            # live preview at http://localhost:4321 (auto-reloads as you edit)
+./serve.sh build      # build the static site into ./dist
+./serve.sh preview    # build, then preview the production output at http://localhost:4321
+./serve.sh stop       # stop the dev server
 ```
 
-## Easy build
-- Update [bibliography repo](https://github.com/mit-acl/bibliography) and commit/push any changes
-  - Do not edit the contents of the `_bibliography` directory in this repo. The directory is pulled down fresh from the [bibliography repo](https://github.com/mit-acl/bibliography) on each build. Thus, edits should be made and committed directly to that repo separately.
-- Build and commit the static site into `_site` with bash and Docker: `./build_and_deploy.bash`
-- Check the deployment status [here](https://github.com/mit-acl/mit-acl.github.io/actions)
-- Check the website at: [https://mit-acl.github.io/](https://mit-acl.github.io/)
-
-## Alternative manual build (not recommended)
-If you don't want to install Docker, you can manually build, commit, and push:
-- Update the `_bibliography` submodule with: `git submodule update --remote`
-- Commit your changes to the source repo (i.e. `mit-acl.github.io`)
-- Build the static site into `_site` with your local Jekyll installation: `bundle exec jekyll build`
-- Commit your build to the `gh-pages` branch (i.e. inside `_site`)
-- Check the deployment status [here](https://github.com/mit-acl/mit-acl.github.io/actions)
-- Check the website at: [https://mit-acl.github.io/](https://mit-acl.github.io/)
+The first run builds the Docker image (~30s); after that it starts in a few seconds.
+
+> **Heads up:** editing existing files hot-reloads automatically, but if you **add a new
+> file to `public/`** (e.g. a new image) while the server is running, restart it so the
+> file is picked up: `./serve.sh stop && ./serve.sh`.
+
+## Deploying
+
+Pushing to `main` deploys automatically: the [Deploy to GitHub Pages](.github/workflows/deploy.yml)
+workflow builds the site and publishes it. Check its progress
+[here](https://github.com/mit-acl/mit-acl.github.io/actions). To redeploy without a code change,
+run the workflow manually from the Actions tab.
+
+## Editing content
+
+| What | Where | How to add one |
+|------|-------|----------------|
+| **People** | `src/content/members/<kerberos>.md` | Copy [`howto/template_member.md`](howto/template_member.md); put the headshot in `public/images/members/`. |
+| **Projects** | `src/content/projects/<slug>.md` | Copy [`howto/template_project.md`](howto/template_project.md); `authors` are kerberos IDs, `papers` are BibTeX keys. |
+| **News** | `src/content/news/YYYY-MM-DD-title.md` | Copy [`howto/template_news_post.md`](howto/template_news_post.md). |
+| **Home page intro** | `src/content/pinned/` | The welcome text and statement of values pinned above the news. |
+| **Contact / Thanks pages** | `src/content/pages/` | |
+| **Publications** | `bibliography/ACL_Publications.bib` | Paste a BibTeX entry; see below. |
+| **Faculty / UROPs** | `src/data/people.ts` | Directory-only entries that don't have a profile page. |
+| **Menu, quick links, logos, People sections** | `src/data/site.ts` | Site-wide settings in one place. |
+| **Colors, fonts** | `src/styles/style.scss` | Variables at the top of the file. |
+
+If you mistype a field, the build tells you exactly which file and field is wrong.
+
+Images and other files go under `public/` and are linked without the `public` prefix: a file at
+`public/images/projects/foo.jpg` is linked as `/images/projects/foo.jpg`.
+
+### Publications
+
+All ACL publications live in [`bibliography/ACL_Publications.bib`](bibliography/ACL_Publications.bib)
+(formerly the separate `mit-acl/bibliography` repo, merged here with its history). Add or fix entries
+there and the Publications page rebuilds from it; see [`bibliography/README.md`](bibliography/README.md)
+for the validation and merge scripts. The dev server reads the file once at startup, so restart it
+(`./serve.sh stop && ./serve.sh`) to see bibliography edits.
+
+Projects can cite entries in their Markdown body with `{% reference <BibTeX key> %}`, or list them
+under `papers:` in the front matter.
 
 ## New Students
+
 If you're a new student, you need to be added to the website.
 Reach out to the [current ACL webmaster](https://wikis.mit.edu/confluence/pages/viewpage.action?pageId=123502773) via Slack and provide the following:
 1. A headshot (i.e. `.jpg` or `.png`)
-2. Markdown providing your information. [(See this example.)](https://raw.githubusercontent.com/mit-acl/mit-acl.github.io/master/howto/template_member.md)
-Alternatively, if you're comfortable with GitHub/GitHub pages, you're welcome to make the changes yourself and submit a pull request.
+2. Markdown providing your information. [(See this example.)](howto/template_member.md)
+
+Alternatively, if you're comfortable with GitHub, you're welcome to make the changes yourself and submit a pull request.
+
+## How it's organized
+
+```
+src/
+  content/          Markdown content (members, projects, news, pinned, pages)
+  content.config.ts the allowed fields for each content type
+  data/             site.ts (settings), people.ts (faculty/UROPs)
+  lib/              bibtex.ts (BibTeX parser), citations.ts (AIAA formatting), Markdown plugins
+  components/       Header, Footer, ...
+  layouts/          Default.astro (the page shell)
+  pages/            one file per route (/, /people, /projects, /publications, ...)
+  styles/           style.scss + the theme's Sass partials
+public/             static files served as-is (images, files, the theme's JS, CNAME)
+bibliography/       ACL_Publications.bib, the AIAA citation style, and helper scripts
+```
 
 ## Notes
-* Citations are stored in [this repo](https://github.com/mit-acl/bibliography).
-* Static site builds are stored on [this branch](https://github.com/mit-acl/mit-acl.github.io/tree/gh-pages).
+
 * Derived from [the old private website repo](https://github.com/mit-acl/website). (Didn't fork because of the LFS files committed directly to the old repo.)
+* The visual theme is "Index" by JekyllThemes.io; see [`_LICENSE.md`](_LICENSE.md).