From 6187cc9168b4d9f24a57e422ef767e1e18c6173b Mon Sep 17 00:00:00 2001 From: Joel Addison Date: Sat, 14 Oct 2023 17:20:06 +1000 Subject: [PATCH] Updates for Everything Open 2024 --- .gitlab-ci.yml | 24 +++++++++---------- fixtures/sessions/conference.section.json | 4 ++-- .../sessions/proposals.proposalsection.json | 4 ++-- fixtures/sites.json | 4 ++-- k8s/deployment_template.jsonnet | 2 +- .../registrasion/migrations/0001_initial.py | 1 + pinaxcon/settings.py | 24 +++++++++---------- pinaxcon/templates/nav.html | 2 +- pinaxcon/templates/site_base.html | 14 +++++------ static/src/img/eo2023.svg | 1 - static/src/img/eo2024.svg | 1 + vendor/registrasion/registrasion/views.py | 2 +- vendor/symposion/schedule/views.py | 2 +- 13 files changed, 43 insertions(+), 42 deletions(-) delete mode 100644 static/src/img/eo2023.svg create mode 100644 static/src/img/eo2024.svg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a40df37d..200a1308 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: DOCKER_TLS_CERTDIR: "/certs" - CONTAINER_PREFIX: 2023 + CONTAINER_PREFIX: 2024 CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/$CONTAINER_PREFIX:$CI_COMMIT_SHA build-image: @@ -18,7 +18,7 @@ build-image: - docker build --pull -f docker/Dockerfile -t $CONTAINER_IMAGE . - docker push $CONTAINER_IMAGE only: - - conf/2023 + - conf/2024 k8s-deploy-staging: image: google/cloud-sdk @@ -26,15 +26,15 @@ k8s-deploy-staging: script: - echo "${CA_CERT}" > 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 --token "${KUBE_TOKEN}" set image deployment/symposion-app symposion-app=$CONTAINER_IMAGE when: manual only: - - dev/2023 + - dev/2024 environment: - name: 2023/staging - url: https://staging-eo2023.osaconftools.net/ + name: 2024/staging + url: https://staging-eo2024.osaconftools.net/ k8s-deploy-prod: image: google/cloud-sdk @@ -42,15 +42,15 @@ k8s-deploy-prod: script: - echo "${CA_CERT}" > 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 --token "${KUBE_TOKEN}" set image deployment/symposion-app symposion-app=$CONTAINER_IMAGE when: manual only: - - conf/2023 + - conf/2024 environment: - name: 2023/prod - url: https://2023.everythingopen.au/ + name: 2024/prod + url: https://2024.everythingopen.au/ .docs_template: &sphinx image: alpine @@ -70,7 +70,7 @@ pages: stage: build only: - master - - conf/2023 + - conf/2024 environment: name: docs url: https://laconfdev.gitlab.io/symposion_app/ @@ -80,4 +80,4 @@ build-sphinx: stage: build except: - master - - conf/2023 + - conf/2024 diff --git a/fixtures/sessions/conference.section.json b/fixtures/sessions/conference.section.json index 6ebe8211..72cbae58 100644 --- a/fixtures/sessions/conference.section.json +++ b/fixtures/sessions/conference.section.json @@ -6,8 +6,8 @@ "conference": 1, "name": "Main Conference", "slug": "main", - "start_date": "2023-03-14", - "end_date": "2023-03-16" + "start_date": "2024-04-16", + "end_date": "2024-04-18" } } ] diff --git a/fixtures/sessions/proposals.proposalsection.json b/fixtures/sessions/proposals.proposalsection.json index 70c78dc5..20be5c5f 100644 --- a/fixtures/sessions/proposals.proposalsection.json +++ b/fixtures/sessions/proposals.proposalsection.json @@ -4,8 +4,8 @@ "pk": 1, "fields": { "section": 1, - "start": "2022-12-07T12:00:00Z", - "end": "2023-01-09T12:00:00Z", + "start": "2023-10-14T12:00:00Z", + "end": "2023-11-13T12:00:00Z", "closed": false, "published": true } diff --git a/fixtures/sites.json b/fixtures/sites.json index 3b6f3e08..4b17c093 100644 --- a/fixtures/sites.json +++ b/fixtures/sites.json @@ -3,8 +3,8 @@ "model": "sites.site", "pk": 1, "fields": { - "domain": "2023.everythingopen.au", - "name": "Everything Open 2023" + "domain": "2024.everythingopen.au", + "name": "Everything Open 2024" } } ] diff --git a/k8s/deployment_template.jsonnet b/k8s/deployment_template.jsonnet index 76dea795..70bd9f48 100644 --- a/k8s/deployment_template.jsonnet +++ b/k8s/deployment_template.jsonnet @@ -121,7 +121,7 @@ function (slug, sha) { "value": "UA-000000000-1" } ], - "image": "registry.gitlab.com/laconfdev/symposion_app/2023:" + sha, + "image": "registry.gitlab.com/laconfdev/symposion_app/2024:" + sha, "imagePullPolicy": "Always", "livenessProbe": { "failureThreshold": 3, diff --git a/pinaxcon/registrasion/migrations/0001_initial.py b/pinaxcon/registrasion/migrations/0001_initial.py index 4406895c..830227dd 100644 --- a/pinaxcon/registrasion/migrations/0001_initial.py +++ b/pinaxcon/registrasion/migrations/0001_initial.py @@ -31,6 +31,7 @@ _PAST_EVENTS = ( (2020, "LCA2020 Gold Coast"), (2021, "LCA2021 Online"), (2022, "LCA2022 Online"), + (2023, "EO2023 Melbourne"), ) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 452ea942..5bdcc2c1 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -517,21 +517,21 @@ CONFERENCE_NAME = os.environ.get('CONFERENCE_NAME', 'Everything Open') CONFERENCE_NAME_SHORT = os.environ.get('CONFERENCE_NAME_SHORT', 'EO') CONFERENCE_EMAIL = os.environ.get('CONFERENCE_EMAIL', DEFAULT_FROM_EMAIL) CONF_TZINFO = pytz.timezone(TIME_ZONE) -CONF_START = CONF_TZINFO.localize(datetime(2023, 3, 14)) -CONF_END = CONF_TZINFO.localize(datetime(2023, 3, 16)) -CONF_MINICONF_END = CONF_TZINFO.localize(datetime(2023, 3, 14, 23, 59)) -EARLY_BIRD_DEADLINE = CONF_TZINFO.localize(datetime(2023, 1, 28)) -PENGUIN_DINNER_TICKET_DATE = date(2023, 3, 15) -SPEAKER_DINNER_TICKET_DATE = date(2023, 3, 14) -PDNS_TICKET_DATE = date(2023, 3, 16) +CONF_START = CONF_TZINFO.localize(datetime(2024, 4, 16)) +CONF_END = CONF_TZINFO.localize(datetime(2024, 4, 18)) +CONF_MINICONF_END = CONF_TZINFO.localize(datetime(2024, 4, 16, 23, 59)) +EARLY_BIRD_DEADLINE = CONF_TZINFO.localize(datetime(2024, 1, 28)) +PENGUIN_DINNER_TICKET_DATE = date(2024, 4, 17) +SPEAKER_DINNER_TICKET_DATE = date(2024, 4, 16) +PDNS_TICKET_DATE = date(2024, 4, 16) TSHIRT_PRICE = Decimal("25.00") -CONTRIBUTOR = Ticket("Contributor", Decimal("300.00"), Decimal("250.00")) -PROFESSIONAL = Ticket("Professional", Decimal("125.00"), Decimal("100.00")) -HOBBYIST = Ticket("Hobbyist", Decimal("70.00"), None) -STUDENT = Ticket("Student", Decimal("30.00"), None) -MINICONF_ONLY = Ticket("Miniconf Only", Decimal("25.00"), None) +CONTRIBUTOR = Ticket("Contributor", Decimal("1099.00"), Decimal("999.00")) +PROFESSIONAL = Ticket("Professional", Decimal("799.00"), Decimal("699.00")) +HOBBYIST = Ticket("Hobbyist", Decimal("399.00"), Decimal("299.00")) +STUDENT = Ticket("Student", Decimal("149.00"), None) +MINICONF_ONLY = Ticket("Miniconf Only", Decimal("149.00"), None) MEDIA = Ticket("Media", Decimal("0.0"), None) SPEAKER = Ticket("Speaker", Decimal("0.0"), None) diff --git a/pinaxcon/templates/nav.html b/pinaxcon/templates/nav.html index 3d1c9647..f1a0fed9 100644 --- a/pinaxcon/templates/nav.html +++ b/pinaxcon/templates/nav.html @@ -4,7 +4,7 @@