Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates for Everything Open 2024

Browse source
This commit is contained in:
Joel Addison 2023-10-14 17:20:06 +10:00
parent 7e98582b6d
commit 6187cc9168
13 changed files with 43 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.gitlab-ci.yml
View file

@ -4,7 +4,7 @@ stages:
variables: variables:
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
CONTAINER_PREFIX: 2023 CONTAINER_PREFIX: 2024
CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/$CONTAINER_PREFIX:$CI_COMMIT_SHA CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/$CONTAINER_PREFIX:$CI_COMMIT_SHA
build-image: build-image:
@ -18,7 +18,7 @@ build-image:
- docker build --pull -f docker/Dockerfile -t $CONTAINER_IMAGE . - docker build --pull -f docker/Dockerfile -t $CONTAINER_IMAGE .
- docker push $CONTAINER_IMAGE - docker push $CONTAINER_IMAGE
only: only:
- conf/2023 - conf/2024
k8s-deploy-staging: k8s-deploy-staging:
image: google/cloud-sdk image: google/cloud-sdk
@ -26,15 +26,15 @@ k8s-deploy-staging:
script: script:
- echo "${CA_CERT}" > cert.crt - echo "${CA_CERT}" > cert.crt
- kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt
- kubectl config set-context cluster --cluster=cluster --namespace=eo2023-staging --user=gitlab-ci - kubectl config set-context cluster --cluster=cluster --namespace=eo2024-staging --user=gitlab-ci
- kubectl config use-context cluster - kubectl config use-context cluster
- kubectl --token "${KUBE_TOKEN}" set image deployment/symposion-app symposion-app=$CONTAINER_IMAGE - kubectl --token "${KUBE_TOKEN}" set image deployment/symposion-app symposion-app=$CONTAINER_IMAGE
when: manual when: manual
only: only:
- dev/2023 - dev/2024
environment: environment:
name: 2023/staging name: 2024/staging
url: https://staging-eo2023.osaconftools.net/ url: https://staging-eo2024.osaconftools.net/
k8s-deploy-prod: k8s-deploy-prod:
image: google/cloud-sdk image: google/cloud-sdk
@ -42,15 +42,15 @@ k8s-deploy-prod:
script: script:
- echo "${CA_CERT}" > cert.crt - echo "${CA_CERT}" > cert.crt
- kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt - kubectl config set-cluster cluster --server="${KUBE_SERVER}" --embed-certs=true --certificate-authority=cert.crt
- kubectl config set-context cluster --cluster=cluster --namespace=eo2023-prod --user=gitlab-ci - kubectl config set-context cluster --cluster=cluster --namespace=eo2024-prod --user=gitlab-ci
- kubectl config use-context cluster - kubectl config use-context cluster
- kubectl --token "${KUBE_TOKEN}" set image deployment/symposion-app symposion-app=$CONTAINER_IMAGE - kubectl --token "${KUBE_TOKEN}" set image deployment/symposion-app symposion-app=$CONTAINER_IMAGE
when: manual when: manual
only: only:
- conf/2023 - conf/2024
environment: environment:
name: 2023/prod name: 2024/prod
url: https://2023.everythingopen.au/ url: https://2024.everythingopen.au/
.docs_template: &sphinx .docs_template: &sphinx
image: alpine image: alpine
@ -70,7 +70,7 @@ pages:
stage: build stage: build
only: only:
- master - master
- conf/2023 - conf/2024
environment: environment:
name: docs name: docs
url: https://laconfdev.gitlab.io/symposion_app/ url: https://laconfdev.gitlab.io/symposion_app/
@ -80,4 +80,4 @@ build-sphinx:
stage: build stage: build
except: except:
- master - master
- conf/2023 - conf/2024

4
fixtures/sessions/conference.section.json
View file

@ -6,8 +6,8 @@
"conference": 1, "conference": 1,
"name": "Main Conference", "name": "Main Conference",
"slug": "main", "slug": "main",
"start_date": "2023-03-14", "start_date": "2024-04-16",
"end_date": "2023-03-16" "end_date": "2024-04-18"
} }
} }
] ]

4
fixtures/sessions/proposals.proposalsection.json
View file

@ -4,8 +4,8 @@
"pk": 1, "pk": 1,
"fields": { "fields": {
"section": 1, "section": 1,
"start": "2022-12-07T12:00:00Z", "start": "2023-10-14T12:00:00Z",
"end": "2023-01-09T12:00:00Z", "end": "2023-11-13T12:00:00Z",
"closed": false, "closed": false,
"published": true "published": true
} }

4
fixtures/sites.json
View file

@ -3,8 +3,8 @@
"model": "sites.site", "model": "sites.site",
"pk": 1, "pk": 1,
"fields": { "fields": {
"domain": "2023.everythingopen.au", "domain": "2024.everythingopen.au",
"name": "Everything Open 2023" "name": "Everything Open 2024"
} }
} }
] ]

2
k8s/deployment_template.jsonnet
View file

@ -121,7 +121,7 @@ function (slug, sha) {
"value": "UA-000000000-1" "value": "UA-000000000-1"
} }
], ],
"image": "registry.gitlab.com/laconfdev/symposion_app/2023:" + sha, "image": "registry.gitlab.com/laconfdev/symposion_app/2024:" + sha,
"imagePullPolicy": "Always", "imagePullPolicy": "Always",
"livenessProbe": { "livenessProbe": {
"failureThreshold": 3, "failureThreshold": 3,

1
pinaxcon/registrasion/migrations/0001_initial.py
View file

@ -31,6 +31,7 @@ _PAST_EVENTS = (
(2020, "LCA2020 Gold Coast"), (2020, "LCA2020 Gold Coast"),
(2021, "LCA2021 Online"), (2021, "LCA2021 Online"),
(2022, "LCA2022 Online"), (2022, "LCA2022 Online"),
(2023, "EO2023 Melbourne"),
) )

24
pinaxcon/settings.py
View file

@ -517,21 +517,21 @@ CONFERENCE_NAME = os.environ.get('CONFERENCE_NAME', 'Everything Open')
CONFERENCE_NAME_SHORT = os.environ.get('CONFERENCE_NAME_SHORT', 'EO') CONFERENCE_NAME_SHORT = os.environ.get('CONFERENCE_NAME_SHORT', 'EO')
CONFERENCE_EMAIL = os.environ.get('CONFERENCE_EMAIL', DEFAULT_FROM_EMAIL) CONFERENCE_EMAIL = os.environ.get('CONFERENCE_EMAIL', DEFAULT_FROM_EMAIL)
CONF_TZINFO = pytz.timezone(TIME_ZONE) CONF_TZINFO = pytz.timezone(TIME_ZONE)
CONF_START = CONF_TZINFO.localize(datetime(2023, 3, 14)) CONF_START = CONF_TZINFO.localize(datetime(2024, 4, 16))
CONF_END = CONF_TZINFO.localize(datetime(2023, 3, 16)) CONF_END = CONF_TZINFO.localize(datetime(2024, 4, 18))
CONF_MINICONF_END = CONF_TZINFO.localize(datetime(2023, 3, 14, 23, 59)) CONF_MINICONF_END = CONF_TZINFO.localize(datetime(2024, 4, 16, 23, 59))
EARLY_BIRD_DEADLINE = CONF_TZINFO.localize(datetime(2023, 1, 28)) EARLY_BIRD_DEADLINE = CONF_TZINFO.localize(datetime(2024, 1, 28))
PENGUIN_DINNER_TICKET_DATE = date(2023, 3, 15) PENGUIN_DINNER_TICKET_DATE = date(2024, 4, 17)
SPEAKER_DINNER_TICKET_DATE = date(2023, 3, 14) SPEAKER_DINNER_TICKET_DATE = date(2024, 4, 16)
PDNS_TICKET_DATE = date(2023, 3, 16) PDNS_TICKET_DATE = date(2024, 4, 16)
TSHIRT_PRICE = Decimal("25.00") TSHIRT_PRICE = Decimal("25.00")
CONTRIBUTOR = Ticket("Contributor", Decimal("300.00"), Decimal("250.00")) CONTRIBUTOR = Ticket("Contributor", Decimal("1099.00"), Decimal("999.00"))
PROFESSIONAL = Ticket("Professional", Decimal("125.00"), Decimal("100.00")) PROFESSIONAL = Ticket("Professional", Decimal("799.00"), Decimal("699.00"))
HOBBYIST = Ticket("Hobbyist", Decimal("70.00"), None) HOBBYIST = Ticket("Hobbyist", Decimal("399.00"), Decimal("299.00"))
STUDENT = Ticket("Student", Decimal("30.00"), None) STUDENT = Ticket("Student", Decimal("149.00"), None)
MINICONF_ONLY = Ticket("Miniconf Only", Decimal("25.00"), None) MINICONF_ONLY = Ticket("Miniconf Only", Decimal("149.00"), None)
MEDIA = Ticket("Media", Decimal("0.0"), None) MEDIA = Ticket("Media", Decimal("0.0"), None)
SPEAKER = Ticket("Speaker", Decimal("0.0"), None) SPEAKER = Ticket("Speaker", Decimal("0.0"), None)

2
pinaxcon/templates/nav.html
View file

@ -4,7 +4,7 @@
<nav class="navbar navbar-expand-lg navbar-light bg-dawn-sea"> <nav class="navbar navbar-expand-lg navbar-light bg-dawn-sea">
<div class="container"> <div class="container">
<a class="navbar-brand" href="/"> <a class="navbar-brand" href="/">
<img src="{% static 'img/eo2023.svg' %}" alt="Everything Open 2023 logo" height="56px"> <img src="{% static 'img/eo2024.svg' %}" alt="Everything Open 2024 logo" height="56px">
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">

14
pinaxcon/templates/site_base.html
View file

@ -21,7 +21,7 @@
<!-- Cards --> <!-- Cards -->
<meta property="og:title" content="{{ head_title }}"> <meta property="og:title" content="{{ head_title }}">
<meta property="og:description" content="Everything Open 2023 - March 14-16 2023, Melbourne, Australia" /> <meta property="og:description" content="Everything Open 2024 - April 16-18 2024, Gladstone, QLD, Australia" />
<meta property="og:url" content="{{ request.scheme }}://{{ request.get_host }}{{ request.path }}"> <meta property="og:url" content="{{ request.scheme }}://{{ request.get_host }}{{ request.path }}">
<meta name="twitter:site" content="@_everythingopen"> <meta name="twitter:site" content="@_everythingopen">
<meta name="twitter:image:alt" content="{{ head_title }}" /> <meta name="twitter:image:alt" content="{{ head_title }}" />
@ -121,12 +121,12 @@
<div class="container py-4"> <div class="container py-4">
<div class="row"> <div class="row">
<div class="col-md-4 pb-4"> <div class="col-md-4 pb-4">
<strong>Everything Open 2023</strong> <br> <strong>Everything Open 2024</strong> <br>
March 14-16 2023 <br> April 16-18 2024 <br>
Naarm (Melbourne), Australia <br> Gladstone, QLD, Australia <br>
Timezone: AEDT - UTC+11 <br> Timezone: AEST - UTC+10 <br>
<a href="mailto:contact@everythingopen.au" alt="Email"><i class="bi-envelope-fill"></i></a>&nbsp;&nbsp;<a <a href="mailto:contact@everythingopen.au" alt="Email"><i class="bi-envelope-fill"></i></a>&nbsp;&nbsp;<a
href="https://twitter.com/_everythingopen" alt="Twitter"><i class="bi-twitter"></i></a>&nbsp;&nbsp;<a href="https://twitter.com/_everythingopen" alt="X"><i class="bi-twitter"></i></a>&nbsp;&nbsp;<a
href="https://www.linkedin.com/showcase/everythingopen/" alt="LinkedIn"><i class="bi-linkedin"></i></a> href="https://www.linkedin.com/showcase/everythingopen/" alt="LinkedIn"><i class="bi-linkedin"></i></a>
<a href="mailto:{{ settings.CONFERENCE_EMAIL }}" alt="Email"><i class="far fa-envelope"></i></a>&nbsp;&nbsp;<a <a href="mailto:{{ settings.CONFERENCE_EMAIL }}" alt="Email"><i class="far fa-envelope"></i></a>&nbsp;&nbsp;<a
@ -140,7 +140,7 @@
<div class="col-md-4 pb-4 text-right"> <div class="col-md-4 pb-4 text-right">
<small> <small>
<a href="#">Back to top</a><br> <a href="#">Back to top</a><br>
&copy; 2022 Everything Open and <a href="http://linux.org.au/">Linux Australia</a><br> &copy; 2023 Everything Open and <a href="http://linux.org.au/">Linux Australia</a><br>
Linux is a registered trademark of Linus Torvalds <br> Linux is a registered trademark of Linus Torvalds <br>
<a href="/colophon/">Colophon</a> <a href="/colophon/">Colophon</a>
</small> </small>

1
static/src/img/eo2023.svg
View file

File diff suppressed because one or more lines are too long
Side by side

Before

Width:  |  Height:  |  Size: 5.7 KiB

1
static/src/img/eo2024.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

2
vendor/registrasion/registrasion/views.py vendored
View file

@ -348,7 +348,7 @@ def _guided_registration_profile_and_voucher(request):
title="Profile and Personal Information", title="Profile and Personal Information",
form=profile_form, form=profile_form,
description=("<div class=\"text-info\"><em>You can come back and edit these details any time before " description=("<div class=\"text-info\"><em>You can come back and edit these details any time before "
"March 10 2023.</em></div>"), "April 15 2024.</em></div>"),
) )
return [voucher_section, profile_section] return [voucher_section, profile_section]

2
vendor/symposion/schedule/views.py vendored
View file

@ -303,7 +303,7 @@ def schedule_json(request):
class EventFeed(ICalFeed): class EventFeed(ICalFeed):
product_id = '-//2023.everythingopen.au/schedule//EN' product_id = '-//2024.everythingopen.au/schedule//EN'
timezone = settings.TIME_ZONE timezone = settings.TIME_ZONE
filename = 'conference.ics' filename = 'conference.ics'