Skip to content

Commit

Permalink
WIP GitHub Pages deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
daisylb committed Feb 19, 2023
1 parent 96de1f4 commit 3eeb97b
Show file tree
Hide file tree
Showing 11 changed files with 191 additions and 105 deletions.
12 changes: 0 additions & 12 deletions .github/dependabot.yml

This file was deleted.

49 changes: 49 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
with:
node-version: "18.2.x"
- uses: pnpm/[email protected]
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
32 changes: 0 additions & 32 deletions .github/workflows/update_schedule.yml

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navigation.astro
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const {navClass, logo} = Object.assign({}, {logo: true}, Astro.props as Props)
<li><a href="/sponsor">Sponsor</a></li>
<li><a href="/program">Program</a></li>
<li><a href="/attend">Attend</a></li>
<li><a href="/conduct">Conduct</a></li>
<li><a href="/conduct">Safety</a></li>
</ul>
<div class="dates">
18&ndash;22 August 2023&emsp;&bull;&emsp;<span class="location"
Expand Down
17 changes: 17 additions & 0 deletions src/components/Switcher.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<style lang="scss">
@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;
}
</style>
<div class="switcher">
<slot />
</div>
32 changes: 32 additions & 0 deletions src/components/SwitcherItem.astro
Original file line number Diff line number Diff line change
@@ -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
---
<style lang="scss">
@import '../vars.scss';
a {
border-radius: 4px;
margin-right: 2px;
font-family: $heading-font;
color: $wattle-leaf;
font-weight: bold;
text-decoration: none;
font-size: 20px;
padding: 3px 12px;
&:last-child {
margin-right: 0;
}
&:hover {
background-color: rgba($wattle-leaf, 0.2);
}
&.selected {
background-color: $wattle-leaf;
color: white;
}
}
</style>
<a href={href} class={selected ? 'selected' : null}><slot /></a>
16 changes: 1 addition & 15 deletions src/layouts/base.scss
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
97 changes: 53 additions & 44 deletions src/pages/conduct.md → src/pages/conduct.mdx
Original file line number Diff line number Diff line change
@@ -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"

{

<Switcher>
<SwitcherItem href="/conduct/" selected>
Code of conduct
</SwitcherItem>
<SwitcherItem href="/covid/">Covid-19 information</SwitcherItem>
</Switcher>
}

# 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&mdash;regardless of age, race, gender identity or
expression, background, disability, appearance, sexuality, walk of life, or
religion&mdash;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
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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?

Expand All @@ -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 [[email protected]](mailto:[email protected])
organisers or the Linux Australia Council at [email protected].

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/
22 changes: 22 additions & 0 deletions src/pages/covid.mdx
Original file line number Diff line number Diff line change
@@ -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"

{

<Switcher>
<SwitcherItem href="/conduct/">Code of conduct</SwitcherItem>
<SwitcherItem href="/covid/" selected>
Covid-19 information
</SwitcherItem>
</Switcher>
}

# Covid-19 information

TODO put content here
14 changes: 14 additions & 0 deletions src/vars.scss
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 3eeb97b

Please sign in to comment.