update readme, add infra doc, change to UTC+10

Author: glasnt

README.md

@@ -1,43 +1,67 @@
-# PyConline AU 2020 website
+# PyConline AU 2021 website
 
-To build this website, you will need the following:
+This website is generated using [statik](https://github.com/thanethomson/statik) with automatic deployments by [Netlify](https://www.netlify.com/)
 
-- **Python 3.7** installed and activated.
-- **Node.js** and **Yarn** installed.
-- **Poetry** installed; see [the installation documentation](https://python-poetry.org/docs/#installation).
+For more information, see [infrastructure.md](infrastructure.md)
 
-Then:
+## Submitting changes
 
-- Run `poetry install`. Poetry will create a virtualenv for you.
-- Run `yarn install`.
-- Run `poetry run supervisord`. Supervisor will start up the two processes you'll need for local development: `parcel` (to build frontend static assets) and `statik` (to build the site itself).
+Pull requests submitted to this repo automatically generate change previews using [Netlify](https://www.netlify.com/). Click the "**deploy/netlify**" check link to see your preview. 
 
-From there, the [Statik documentation](https://github.com/thanethomson/statik/wiki) will be the place to look for most things.
+## Local development
 
-Deployment is automated, and runs on Netlify; see the `netlify.toml` for details. When you file a pull request against this repo, Netlify will build the site (provided the original branch is also inside this repo; sorry, folks outside the core team). A "check" will come up with the name **deploy/netlify**; click Details next to it to go to the preview for that PR.
+If your change is larger and you require a local development environment you will require a number of programs. 
 
-## Timezones!
+Links provided favour macOS using [Homebrew](https://brew.sh/), but will refer to general download information as well. 
 
-It turns out that, regrettably, the world does not run entirely on the `Australia/Adelaide` timezone. To accommodate those who insist on using whole-hour UTC offsets, all times should be written like this:
+* **[Python 3.7](https://www.python.org/downloads/)** minimum
+ * we recommend installing via [pyenv](https://github.com/pyenv/pyenv) ([brew](https://formulae.brew.sh/formula/pyenv) or [download](https://github.com/pyenv/pyenv#installation))
+* **[Node.js](https://nodejs.org/en/)** ([brew](https://formulae.brew.sh/formula/node) or [download](https://nodejs.org/en/download/))
+* **[Poetry](https://python-poetry.org)** ([brew](https://formulae.brew.sh/formula/poetry) or [downoad](https://python-poetry.org/docs/#installation))
+
+Once installed, fork this repo and clone, then to install this codebase's dependencies:
+
+```shell
+poetry install   # python dependencies, creates virtualenv for you
+yarn install     # javascript dependencies
+```
+
+Finally, start the local webserver: 
+
+```shell
+poetry run supervisord
+```
+
+## Changes from previous years
+
+2021 is running with a home timezone of "+10:00". It still uses some of the [timezone hacks](https://github.com/pyconau/2020-website#timezones) from 2020, but without the half hour offset. 
+
+However, all times should still be written as completely as possible. 
 
 ```
-<time datetime="2020-07-16T08:30+09:30">Thursday 16 July, 8:30am ACST</time>
+<time datetime="2021-07-16T08:00+10:00">
+	Friday 16 July, 8:00am AEST
+</time>
 ```
 
-The site has some JavaScript that will pick this up, and if the user's timezone differs from the one in the timestamp, append the local time. (For instance, they might see _Thursday 16 July, 8:30am ACST (9:00am AEST)_ or _Thursday 16 July, 8:30am ACST (Wed, 7:00pm ET)_.)
+The site has some JavaScript that will pick this up, and if the user's timezone differs from the one in the timestamp, append the local time. (For instance, they might see _Friday 16 July, 8:00am AEST (10:00am NZST)_ or _Friday 16 July, 8:00am ACST (Thurs, 7:00pm ET)_.)
 
 This works in HTML and Markdown (since Markdown can have arbitrary HTML in most places).
 
-Note that the colon between the offset hours and minutes **must be present** (e.g. `+0930` won't work)!
+Note that the colon between the offset hours and minutes **must be present** (e.g. `+1000` won't work)!
 
-## Local development issues
+## Issues with local development
 
-Are you on macOS Catalina and getting hundreds of `API_UNAVAILABLE`/`clang` issues when running `poetry install`?
+### macOS issues with `API_UNAVAILABLE`
 
-Try [this tip](https://github.com/gorakhargosh/watchdog/issues/628#issuecomment-581480649):
+If you are running macOS Catalina and getting hundreds of `API_UNAVAILABLE`/`clang` issues when running `poetry install`, try [this tip](https://github.com/gorakhargosh/watchdog/issues/628#issuecomment-581480649):
 
-- Check how many SDKs you have installed in `/Library/Developer/CommandLineTools/SDKs`.
-- If you have both `MacOSX10.14.sdk` and `MacOSX10.15.sdk`:
+- Check how many SDKs you have installed: 
+
+  ```
+  ls /Library/Developer/CommandLineTools/SDKs
+  ```
+- If you have both `MacOSX10.14.sdk` and `MacOSX10.15.sdk`, remove the older version:
 
   ```
   rm -rf /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk

config.yml

@@ -1,4 +1,4 @@
-project-name: PyCon AU 2020
+project-name: PyCon AU 2021
 base-path: /
 context:
   dynamic:

data/Page/backstage.md

@@ -16,7 +16,7 @@ There are three systems you'll have access to throughout the course of the event
 
 You'll gain access to both Discord and Venueless through your ticket! The order confirmation screen has all the links you need to get in.
 
-* **If you haven't redeemed your ticket yet**, look for an email with the subject *[PyConline AU 2020] Your speaker ticket for PyConline AU 2020*, sent around <time datetime="2020-08-19T23:00:00+0930">Wednesday 19 August, 11pm ACST</time>. Then, follow the prompts to redeem your ticket.
+* **If you haven't redeemed your ticket yet**, look for an email with the subject *[PyConline AU 2020] Your speaker ticket for PyConline AU 2020*, sent around TODO ADD DATE>. Then, follow the prompts to redeem your ticket.
 * **If you have redeemed your ticket already**, look for an email with the subject *[PyConline AU 2020] Your order*, sent around the time you redeemed it.
 
 

frontend/backstage.ts

@@ -23,20 +23,20 @@ const TIME_COMPACT = {
   timeZoneName: "short",
   hour12: false,
 }
-const TIME_COMPACT_ADL = { ...TIME_COMPACT, timeZone: "Australia/Adelaide" }
+const TIME_COMPACT_MEL = { ...TIME_COMPACT, timeZone: "Australia/Melbourne" }
 const TIME_HRMIN = {
   hour: "2-digit",
   minute: "2-digit",
   timeZoneName: "short",
   hour12: false,
 }
-const TIME_HRMIN_ADL = { ...TIME_HRMIN, timeZone: "Australia/Adelaide" }
+const TIME_HRMIN_MEL = { ...TIME_HRMIN, timeZone: "Australia/Melbourne" }
 
 function clockTick(output: HTMLElement) {
   const now = DateTime.local()
   output.innerText = now
-    .setZone("Australia/Adelaide")
-    .toLocaleString(TIME_COMPACT_ADL)
+    .setZone("Australia/Melbourne")
+    .toLocaleString(TIME_COMPACT_MEL)
   setTimeout(clockTick.bind(null, output), 1000 - (now.toMillis() % 1000))
 }
 
@@ -73,7 +73,7 @@ export default function () {
         true,
       ) as HTMLElement
       rtt.querySelector(".reltime-fixed")!.innerHTML = `${dt.toLocaleString(
-        TIME_HRMIN_ADL,
+        TIME_HRMIN_MEL,
       )} (${dt.toLocaleString(TIME_HRMIN)})`
       const relative = rtt.querySelector(".reltime-relative")
       setInterval(() => {

frontend/program.ts

@@ -1,13 +1,13 @@
 import { DateTime, LocalZone, DateTimeFormatOptions } from "luxon"
 
-const ZONE = "Australia/Adelaide"
+const ZONE = "Australia/Melbourne"
 const TIME_ONLY: DateTimeFormatOptions = {
   hour: "numeric",
   minute: "numeric",
 }
 const TIME_ONLY_DIFF_DAY = { ...TIME_ONLY, weekday: "short" }
 const TIME_ONLY_TZ = { ...TIME_ONLY, timeZoneName: "short" }
-const TIME_ONLY_ACST = { ...TIME_ONLY, timeZone: "Australia/Adelaide" }
+const TIME_ONLY_AEST = { ...TIME_ONLY, timeZone: "Australia/Melbourne" }
 
 const HOUR_MARKER = { hour: "numeric" }
 const HOUR_MARKER_DIFF_DAY = { ...HOUR_MARKER, weekday: "short" }
@@ -26,8 +26,8 @@ export default function scheduleInit(schedule: HTMLElement) {
     const startLocal = start.toLocal()
     const startLocalIsDiffDay = startLocal.weekday !== start.weekday
     time.innerText = `${start.toLocaleString(
-      TIME_ONLY_ACST,
-    )}\u2013${end.toLocaleString(TIME_ONLY_ACST)} (${startLocal.toLocaleString(
+      TIME_ONLY_AEST,
+    )}\u2013${end.toLocaleString(TIME_ONLY_AEST)} (${startLocal.toLocaleString(
       startLocalIsDiffDay ? TIME_ONLY_DIFF_DAY : TIME_ONLY,
     )}\u2013${end.toLocal().toLocaleString(TIME_ONLY_TZ)})`
     console.log(start, end)
@@ -77,7 +77,7 @@ export default function scheduleInit(schedule: HTMLElement) {
     schedule.appendChild(newRule)
   })
   const acstLabel = document.createElement("s-tz-header")
-  acstLabel.innerText = "ACST"
+  acstLabel.innerText = "AEST"
   schedule.appendChild(acstLabel)
   const localLabel = document.createElement("s-tz-header")
   localLabel.classList.add("local")

infrastructure.md

@@ -0,0 +1,68 @@
+# Infrastructure
+
+[Statik](https://github.com/thanethomson/statik) uses data models to assist in developing a staticly generated website.
+ 
+
+## Models
+
+A number of models are defined in this repo. For each model, there are multiple files separated into folders of like type: 
+
+ * `views/`
+   * defines a path, context (all elements of a model (below), or a single model instance), and a template (below). 
+ * `templates/`
+   * defined using jinja templating
+ * `models/`
+   * defines a model with various keys and datatypes, in yaml
+ * `data/`
+   * defintes instances of a model, using the model datatypes, in yaml
+ 
+ 
+The currently defined models are: 
+ 
+ * `Page`: Static pages (the most common for the structure of the wesbite)
+ * `News`: posts in `/news`
+ * `Person`: people, usually organisers or speakers
+ * `Track`: a track of talks, with one or more organisers defined as a `Person`.
+ * `Session`: a talk, with one or more speakers defined as a `Person`, and a track defined in `Track`.
+ * `Sponsor`: a sponsor, which may have a workshop
+ * `Workshop`: a sponsor workshop
+ * `SpecialSponsor`: a node for additional listings on the Sponsor page. 
+
+
+Full details are always more current in the code. 
+
+
+## Infrastructure
+
+There are some other folders of stuff: 
+
+ * `assets/`:
+   * `people/`: avatars of instances of `Person`
+   * `sponsor-logos`: logos of instances of `Sponsor`
+   * `diagrams/`, misc: misc images
+* `frontend/`: sass (high level CSS) and typescript (high level javascript) things that power the pretty. 
+* 
+
+
+## Redirects and config as code
+
+Some of these files are important. Of important note: 
+
+* `_redirects`: defines domain for annual websites. 
+* `.github`: defines GitHub actions
+* `netlify.toml`: defines page redirects, and build commands
+* `config.yaml`: the main page's `Page` definition.
+* `package.json` and `yarn.lock`: defines JavaScript dependencies for the front end.
+* `pyproject.toml` and `poetry.lock`: defines Python dependencies for the back end.
+* `tsconfig.json`: configuration for typescript
+* `.pre-commit-config.yaml` and `.prettierrc`: a precommit config to check for linting and other errors before committing (not automatically run)
+
+   
+## Local Infrastructure
+
+If you are developing locally a number of other folders will appear. These are explicitly defined in `.gitignore` and *should not be committed to the repository*. 
+
+* `node_modules/`: local JavaScript packages
+* `public/`: the locally built version of the website
+* `assets/build/`: compiled front-end bits
+* `.cache/`: local cache

netlify.toml

@@ -1,7 +1,7 @@
 [build]
 publish = "public/"
 command = """
-export TZ=Australia/Adelaide
+export TZ=Australia/Melbourne
 pip3 install -q poetry &&
 poetry config virtualenvs.in-project true &&
 poetry install &&