From e7f7cf435d707b32713bbc6afd35d26a999a1481 Mon Sep 17 00:00:00 2001 From: ericthelemur Date: Thu, 2 Nov 2023 17:48:17 +0000 Subject: [PATCH] Move lighttpd redirects to this repo --- .gitignore | 3 ++- content/event_info.md | 2 +- content/timeline.html | 2 +- content/whats_on.md | 2 +- redirects.conf | 14 ++++++++++++++ templates/guide.html | 4 ++-- templates/index.html | 22 +++++++++++----------- templates/parts/footer.html | 8 ++++---- templates/parts/nav.html | 6 +++--- 9 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 redirects.conf diff --git a/.gitignore b/.gitignore index cda12bc..980d87c 100644 --- a/.gitignore +++ b/.gitignore @@ -247,4 +247,5 @@ Temporary Items # End of https://www.toptal.com/developers/gitignore/api/macos -node_modules \ No newline at end of file +node_modules +.vscode \ No newline at end of file diff --git a/content/event_info.md b/content/event_info.md index 2823232..d881215 100644 --- a/content/event_info.md +++ b/content/event_info.md @@ -20,7 +20,7 @@ WASD submissions close on **{{ subs_close_date }}**.

Where?

-WASD {{ event_year }} will be held on campus, as well as streamed live on the WASD [Twitch channel](https://twitch.tv/warwickspeedrun). +WASD {{ event_year }} will be held on campus, as well as streamed live on the WASD [Twitch channel](https://warwickspeed.run/twitch).

Who?

diff --git a/content/timeline.html b/content/timeline.html index 84d14a9..e18b58d 100644 --- a/content/timeline.html +++ b/content/timeline.html @@ -1,7 +1,7 @@ {{ timeline_line }} -

Submissions Open: Our Oengus page is open to your signups! See our How To section for tips & advice!

+

Submissions Open: Our Oengus page is open to your signups! See our How To section for tips & advice!

Submissions Close: Oengus submissions are closed, so we can decide on ....

Runs Accepted: Selecting which runs we have accepted (we will attempt to contact runners via Discord, please respond promptly)

Schedule Announced: The schedule will be released on all our socials, etc.

diff --git a/content/whats_on.md b/content/whats_on.md index e523760..6af32e4 100644 --- a/content/whats_on.md +++ b/content/whats_on.md @@ -3,7 +3,7 @@ #### Weekend-Long Stream ![A wide-angle shot of the event](/dist/img/speedrunning.jpg) -Two days of speedrunning in aid of [SpecialEffect](https://specialeffect.org) live on Warwick campus and streamed live on the WASD [Twitch channel](https://twitch.tv/warwickspeedrun). Come and say hi! +Two days of speedrunning in aid of [SpecialEffect](https://specialeffect.org) live on Warwick campus and streamed live on the WASD [Twitch channel](https://warwickspeed.run/twitch). Come and say hi!
diff --git a/redirects.conf b/redirects.conf new file mode 100644 index 0000000..da8454a --- /dev/null +++ b/redirects.conf @@ -0,0 +1,14 @@ +url.redirect = ( + "/discord" => "https://discord.gg/jnqV9Uwnm5", + "/vods" => "https://www.youtube.com/@WarwickSpeedrun", + "/twitch" => "https://www.twitch.tv/warwickspeedrun", + "/twitter" => "https://twitter.com/WarwickSpeedrun", + "/signup" => "https://oengus.fun/wasd2024", + "/donate" => "https://donate.tiltify.com/@warwickspeedrun/wasd-24", + + "/howto" => "https://warwickspeed.run/#howto", + "/how-to" => "https://warwickspeed.run/#howto", + "/guide" => "https://warwickspeed.run/guide.html", + "/schedule" => "https://warwickspeed.run/#schedule" + +) diff --git a/templates/guide.html b/templates/guide.html index 61e2a8c..79bdf45 100644 --- a/templates/guide.html +++ b/templates/guide.html @@ -3,9 +3,9 @@
-

| WASD 2023 Runners Guide

+

| WASD 2023 Runners Guide

-

WASD 2023 will be held on-site in the University of Warwick, in the SU Atrium. We will also be streaming it live to Twitch.

+

WASD 2023 will be held on-site in the University of Warwick, in the SU Atrium. We will also be streaming it live to Twitch.

{{ timeline_line }} diff --git a/templates/index.html b/templates/index.html index 0545c62..3c80ec5 100644 --- a/templates/index.html +++ b/templates/index.html @@ -18,16 +18,16 @@

WASD will be in-person on campus, and streamed on Twitch.

- - + +
- Sign up - How To - - + Sign up + How To + +
@@ -112,7 +112,7 @@

Event Info

Schedule

-

Times are listed in GMT. To check other time zones, check Oengus


+

Times are listed in GMT. To check other time zones, check Oengus


{{ schedule }}
@@ -133,15 +133,15 @@

What's On

Want to take part in WASD {{ event_year }}? Submit a run!

- +

Sign ups close on {{ subs_close_date }}.

- +
- +

How to

@@ -153,7 +153,7 @@

How to

- {{footer}} + {{ footer }} diff --git a/templates/parts/footer.html b/templates/parts/footer.html index 0487303..7c48376 100644 --- a/templates/parts/footer.html +++ b/templates/parts/footer.html @@ -9,11 +9,11 @@

Socials

    -
    • -
  • +
    • +
    • -
    • -
    • +
diff --git a/templates/parts/nav.html b/templates/parts/nav.html index de20b49..5acd71c 100644 --- a/templates/parts/nav.html +++ b/templates/parts/nav.html @@ -1,10 +1,10 @@