From 3eeb97be6d0da0821b827a41034040a93d6ad367 Mon Sep 17 00:00:00 2001 From: Daisy Leigh Brenecki Date: Sun, 19 Feb 2023 18:11:15 +1100 Subject: [PATCH] WIP GitHub Pages deployment --- .github/dependabot.yml | 12 ---- .github/workflows/build.yml | 49 ++++++++++++++ .github/workflows/update_schedule.yml | 32 --------- package.json | 3 +- src/components/Navigation.astro | 2 +- src/components/Switcher.astro | 17 +++++ src/components/SwitcherItem.astro | 32 +++++++++ src/layouts/base.scss | 16 +---- src/pages/{conduct.md => conduct.mdx} | 97 +++++++++++++++------------ src/pages/covid.mdx | 22 ++++++ src/vars.scss | 14 ++++ 11 files changed, 191 insertions(+), 105 deletions(-) delete mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/update_schedule.yml create mode 100644 src/components/Switcher.astro create mode 100644 src/components/SwitcherItem.astro rename src/pages/{conduct.md => conduct.mdx} (51%) create mode 100644 src/pages/covid.mdx create mode 100644 src/vars.scss diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 819301b..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: 2 -updates: - - package-ecosystem: npm - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - - package-ecosystem: pip - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..28d04f2 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,49 @@ +name: Build website +on: + push: + branches: + - main + workflow_dispatch: + +permissions: + contents: read + pages: write + id-token: write + +concurrency: + group: "pages" + cancel-in-progress: true + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3.3.0 + with: + node-version: "18.2.x" + - uses: pnpm/action-setup@v2.2.2 + with: + version: 6.0.2 + - name: Setup Pages + id: pages + uses: actions/configure-pages@v3 + - run: pnpm install + - run: pnpm build + - name: Upload artifact + uses: actions/upload-pages-artifact@v1 + with: + path: ${{ env.BUILD_PATH }}/dist + + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + needs: build + runs-on: ubuntu-latest + name: Deploy + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v1 diff --git a/.github/workflows/update_schedule.yml b/.github/workflows/update_schedule.yml deleted file mode 100644 index b171a55..0000000 --- a/.github/workflows/update_schedule.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Update schedule -on: - push: - branches: [ghci] - #schedule: - # - cron: "*/20 * * * *" - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: "3.8" - - run: pip install poetry - - run: poetry install - - run: poetry run python schedule-sync.py - env: - PRETALX_TOKEN: ${{ secrets.PRETALX_TOKEN }} - - run: git diff - - uses: EndBug/add-and-commit@v4 - with: - add: | - assets/people - data/Person - data/Session - author_name: Robot - author_email: beep-boop@local - message: "Auto-update of schedule" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 846852a..c6e848c 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "start": "astro dev" + "start": "astro dev", + "build": "astro build" }, "keywords": [], "author": "", diff --git a/src/components/Navigation.astro b/src/components/Navigation.astro index 1515aa3..82c9f3f 100644 --- a/src/components/Navigation.astro +++ b/src/components/Navigation.astro @@ -15,7 +15,7 @@ const {navClass, logo} = Object.assign({}, {logo: true}, Astro.props as Props)
  • Sponsor
  • Program
  • Attend
    • -
  • Conduct
    • +
  • Safety
    • 18–22 August 2023 •  + @import '../vars.scss'; + .switcher { + width: fit-content; + display: flex; + flex-direction: row; + margin: 0 auto; + border: 2px solid $wattle-leaf; + border-radius: 7px; + padding: 2px; + space-between: 2px; + margin-bottom: 20px; + } + +
    + +
    \ No newline at end of file diff --git a/src/components/SwitcherItem.astro b/src/components/SwitcherItem.astro new file mode 100644 index 0000000..6472b5d --- /dev/null +++ b/src/components/SwitcherItem.astro @@ -0,0 +1,32 @@ +--- +import logoImg from '../imgs/Logo_Standard.svg' +export type Props = { + href: string + selected?: boolean +} +const {href, selected} = Astro.props as Props +--- + + \ No newline at end of file diff --git a/src/layouts/base.scss b/src/layouts/base.scss index 530bd8c..bbace63 100644 --- a/src/layouts/base.scss +++ b/src/layouts/base.scss @@ -1,21 +1,7 @@ @import "reset-css/sass/_reset.scss"; @import "sheng/sheng.scss"; @import url("https://fonts.googleapis.com/css?family=Catamaran:400,400i,700|PT+Sans:400,700&display=swap"); - -$heading-font: "PT Sans", sans-serif; -$body-font: Catamaran, sans-serif; - -// Heading colours are WCAG AA Large compatible, generated by: -// https://accessible-colors.com/ - -$wattle-leaf: #00b159; -$wattle-leaf-headings: #00ab56; -$wattle-flower: #ffc518; -$wattle-flower-headings: #bd8d00; -$desert-sand: #f36f3a; -$desert-sand-headings: #f36b35; -$red-centre: #e01d43; -$lorikeet-blue: #5b57a5; +@import "../vars.scss"; @mixin app-mode { @media (max-width: 767.9999px) { diff --git a/src/pages/conduct.md b/src/pages/conduct.mdx similarity index 51% rename from src/pages/conduct.md rename to src/pages/conduct.mdx index faf025e..29bb8a0 100644 --- a/src/pages/conduct.md +++ b/src/pages/conduct.mdx @@ -1,34 +1,41 @@ --- -title: Conduct +title: Covid-19 information order: 999 # always rightmost link -layout: '../layouts/Page.astro' +layout: "../layouts/Page.astro" --- +import Switcher from "../components/Switcher.astro" +import SwitcherItem from "../components/SwitcherItem.astro" + +{ + + + + Code of conduct + + Covid-19 information + +} + # Code of conduct All attendees of PyCon AU agree to be bound by the Linux Australia code of conduct. -Linux Australia aims to provide fun, welcoming and professional environments so -that diverse groups of people—regardless of age, race, gender identity or -expression, background, disability, appearance, sexuality, walk of life, or -religion—can get together to learn from and be inspired by each other about -all things Free and Open Source. +All Linux Australia events are intended to be environments where delegates +can get together to learn from and be inspired by each other about all things +Free and Open Source. Linux Australia aims to foster an atmosphere of trust, +openness, candour and safety where all delegates respect the diversity of each +other’s talents, abilities and experiences and value the input of others. -Linux Australia is committed to the ideals expressed in our [Values -Statement](http://linux.org.au/values) and ask all our members, speakers, -volunteers, attendees and guests to adopt these principles. We are a diverse -community. +Linux Australia is committed to the ideals expressed in our Values Statement +[http://linux.org.au/values] and ask all our members, speakers, volunteers, +attendees and guests to adopt these principles. We are a diverse community. Sometimes this means we need to work harder to ensure we're creating an environment of trust and respect where all who come to participate feel comfortable and included. We value your participation and appreciate your help in realising this goal. -## How to make a report - -Closer to the event, we'll update this page with information on how to report. We'll also provide this information as part of morning plenary sessions. - - ## Be respectful Respect yourself, and respect others. Be courteous to those around you. If @@ -41,13 +48,13 @@ considerate to all patrons of these locations. All presentation material should be suitable for people aged 12 and above. -Any public presentation which is part of any event, including but not limited -to keynotes, presentations, lightning talks, addresses, mailing list posts and -forums, is subject to this code of conduct and thus may not contain: +Any public presentation or communication which is part of any event and/or +other spaces associated with the conference, is subject to this code of +conduct and thus may not contain: -* sexual or violent imagery; -* exclusionary language; -* insults or ad-hominem attacks. +- sexual or violent imagery; +- exclusionary language; +- insults or ad-hominem attacks. Presenters are asked to avoid language which is not appropriate for an all-ages audience as much as possible. @@ -61,7 +68,7 @@ If presenters are unsure whether their material is suitable, they are encouraged to show it to the conference’s speaker liaison or mailing list/forum moderators before their session. -## Be aware +## Be aware. We ask everyone to be aware that we will not tolerate intimidation, harassment, or any abusive, discriminatory or derogatory behaviour @@ -74,13 +81,13 @@ seriously. The complaint will be treated appropriately with discretion. Should event organisers or moderators consider it appropriate, measures they may take include: -* the individuals may be told to apologise -* the individuals may be told to stop/modify their behaviour appropriately -* the individuals may be warned that enforcement action may be taken if the +- the individuals may be told to apologise +- the individuals may be told to stop/modify their behaviour appropriately +- the individuals may be warned that enforcement action may be taken if the behaviour continues -* the individuals may be asked to immediately leave the venue and/or will be +- the individuals may be asked to immediately leave the venue and/or will be prohibited from continuing to attend the event -* the incident may be reported to the appropriate authorities +- the incident may be reported to the appropriate authorities ## What does that mean for me? @@ -90,28 +97,30 @@ any intimidation, harassment, or abusive or discriminatory behaviour. Here are some examples of behaviours that have occurred at past events which are not appropriate: -* offensive verbal or written remarks related to gender, sexual orientation, - disability, physical appearance, body size, race or religion; -* sexual or violent images in public spaces (including presentation slides); -* deliberate intimidation; -* stalking or following; -* unwanted photography or recording; -* sustained disruption of talks or other events; -* intoxication at an event venue; -* inappropriate physical contact; -* unwelcome sexual attention; -* sexist, racist, or other exclusionary jokes; -* unwarranted exclusion from conference or related events based on - age, gender, sexual orientation, disability, physical appearance, body size, - race, religion; +- offensive verbal or written remarks related but not limited to age, + gender, gender identity, gender expression, sex characteristics, sexual + orientation, disability, physical appearance, body size, race or religion; +- sexual or violent images in public spaces (including presentation slides); +- deliberate intimidation; +- stalking or following; +- unwanted photography or recording; +- sustained disruption of talks or other events; +- intoxication at an event venue; +- inappropriate physical contact; +- unwelcome sexual attention; +- sexist, racist, or other exclusionary jokes; +- unwarranted exclusion from conference or related events based on + attributes such as (but not limited to) age, gender, gender identity, gender + expression, sex characteristics, sexual orientation, disability, physical + appearance, body size, race, religion; We want everyone to have a good time at our events. ## Questions? If you’re not sure about anything you’ve just read please contact the -organisers or the Linux Australia Council at [council@linux.org.au](mailto:council@linux.org.au) +organisers or the Linux Australia Council at council@linux.org.au. This document is available to be re-used or modified under the terms of the Creative Commons Attribution-ShareAlike 3.0 Australia licence, available -from [CreativeCommons.org](https://creativecommons.org/licenses/by-sa/3.0/au/) +from https://creativecommons.org/licenses/by-sa/3.0/au/ diff --git a/src/pages/covid.mdx b/src/pages/covid.mdx new file mode 100644 index 0000000..35f7342 --- /dev/null +++ b/src/pages/covid.mdx @@ -0,0 +1,22 @@ +--- +title: Conduct +order: 999 # always rightmost link +layout: "../layouts/Page.astro" +--- + +import Switcher from "../components/Switcher.astro" +import SwitcherItem from "../components/SwitcherItem.astro" + +{ + + + Code of conduct + + Covid-19 information + + +} + +# Covid-19 information + +TODO put content here diff --git a/src/vars.scss b/src/vars.scss new file mode 100644 index 0000000..3c51160 --- /dev/null +++ b/src/vars.scss @@ -0,0 +1,14 @@ +$heading-font: "PT Sans", sans-serif; +$body-font: Catamaran, sans-serif; + +// Heading colours are WCAG AA Large compatible, generated by: +// https://accessible-colors.com/ + +$wattle-leaf: #00b159; +$wattle-leaf-headings: #00ab56; +$wattle-flower: #ffc518; +$wattle-flower-headings: #bd8d00; +$desert-sand: #f36f3a; +$desert-sand-headings: #f36b35; +$red-centre: #e01d43; +$lorikeet-blue: #5b57a5;