diff --git a/Package.resolved b/Package.resolved index e44dcbf3..56be9ece 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "c813346744436891189c6b2ddcdecc17f8a5e93d38b5bb2d0a39c9c3dbc3dd6a", + "originHash" : "f34b43daf638947218dcf50309c6b0f3bdd54b3f76e7050ef8b16d1a53ee1b5b", "pins" : [ { "identity" : "apns", @@ -199,6 +199,15 @@ "version" : "3.33.2" } }, + { + "identity" : "stackdriverlogging", + "kind" : "remoteSourceControl", + "location" : "https://github.com/brainfinance/StackdriverLogging.git", + "state" : { + "revision" : "2b86b3f8de55e1b2f996cf40bb093b8236bb97b3", + "version" : "4.2.0" + } + }, { "identity" : "swift-algorithms", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index 75601dca..a8205bf1 100644 --- a/Package.swift +++ b/Package.swift @@ -16,6 +16,7 @@ let package = Package( .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0"), .package(url: "https://github.com/handya/markdown.git", branch: "fix/xcode-16"), .package(url: "https://github.com/vapor/jwt.git", from: "5.0.0"), + .package(url: "https://github.com/brainfinance/StackdriverLogging.git", from: "4.2.0"), // This package is used by AWSSDKSwiftCore on Linux only. We add it here (but don't utilise it) in order to // add it to the Package.resolved file. This ensures that when Docker resolves this project, it will not ignore @@ -37,6 +38,7 @@ let package = Package( .product(name: "NIOCore", package: "swift-nio"), .product(name: "NIOPosix", package: "swift-nio"), .product(name: "JWT", package: "jwt"), + .product(name: "StackdriverLogging", package: "StackdriverLogging"), ], swiftSettings: swiftSettings ), diff --git a/Public/img/error/dark/bg.jpg b/Public/img/error/dark/bg.jpg new file mode 100644 index 00000000..c794bfdb Binary files /dev/null and b/Public/img/error/dark/bg.jpg differ diff --git a/Public/img/error/dark/layer01.png b/Public/img/error/dark/layer01.png new file mode 100644 index 00000000..2f4c8707 Binary files /dev/null and b/Public/img/error/dark/layer01.png differ diff --git a/Public/img/error/dark/layer02.png b/Public/img/error/dark/layer02.png new file mode 100644 index 00000000..8f200885 Binary files /dev/null and b/Public/img/error/dark/layer02.png differ diff --git a/Public/img/error/dark/layer03.png b/Public/img/error/dark/layer03.png new file mode 100644 index 00000000..8207871e Binary files /dev/null and b/Public/img/error/dark/layer03.png differ diff --git a/Public/img/error/light/bg.jpg b/Public/img/error/light/bg.jpg new file mode 100644 index 00000000..3cf3e6d6 Binary files /dev/null and b/Public/img/error/light/bg.jpg differ diff --git a/Public/img/error/light/layer01.png b/Public/img/error/light/layer01.png new file mode 100644 index 00000000..db6be15e Binary files /dev/null and b/Public/img/error/light/layer01.png differ diff --git a/Public/img/error/light/layer02.png b/Public/img/error/light/layer02.png new file mode 100644 index 00000000..c07bc288 Binary files /dev/null and b/Public/img/error/light/layer02.png differ diff --git a/Public/img/error/light/layer03.png b/Public/img/error/light/layer03.png new file mode 100644 index 00000000..e8582a36 Binary files /dev/null and b/Public/img/error/light/layer03.png differ diff --git a/Resources/Views/Admin/home.leaf b/Resources/Views/Admin/home.leaf index a7d11b36..e11208c5 100644 --- a/Resources/Views/Admin/home.leaf +++ b/Resources/Views/Admin/home.leaf @@ -1,11 +1,11 @@ #extend("base"): - #export("title", "SwiftLeeds") + #export("title", event.event) #export("content"): diff --git a/Resources/Views/Authentication/login.leaf b/Resources/Views/Authentication/login.leaf index f1e048db..02764289 100644 --- a/Resources/Views/Authentication/login.leaf +++ b/Resources/Views/Authentication/login.leaf @@ -1,12 +1,12 @@ #extend("base"): - #export("title", "SwiftLeeds") + #export("title", "Admin") #export("content"): #extend("Shared/_header")
-

Login with your SwiftLeeds account

+

Login with your admin account

diff --git a/Resources/Views/Authentication/register.leaf b/Resources/Views/Authentication/register.leaf index 0e4dddf9..976cced8 100644 --- a/Resources/Views/Authentication/register.leaf +++ b/Resources/Views/Authentication/register.leaf @@ -1,12 +1,12 @@ #extend("base"): - #export("title", "SwiftLeeds") + #export("title", "Admin") #export("content"): #extend("Shared/_header")
-

Create your SwiftLeeds account

+

Create your admin account

diff --git a/Resources/Views/CFP/_cfp.leaf b/Resources/Views/CFP/_cfp.leaf index 1ef86da9..ec396a88 100644 --- a/Resources/Views/CFP/_cfp.leaf +++ b/Resources/Views/CFP/_cfp.leaf @@ -4,10 +4,10 @@
-

Speak at SwiftLeeds #(eventYear)

+

Speak at #(event.event) #(eventYear)

-

Each year, SwiftLeeds operates a Call for Papers (CfP), which allows you to submit your talk to present on the big stage.

+

Each year, #(event.event) operates a Call for Papers (CfP), which allows you to submit your talk to present on the big stage.

No matter your experience, colour, race, or gender, we invite everyone to apply.

@@ -66,7 +66,7 @@

We want to hear from you!

Many potential speakers, especially those from under-represented groups or those who have never spoken at a conference, may rule themselves out unnecessarily.

-

We want to hear from everybody in the Swift community and urge you to submit a proposal. Our team at SwiftLeeds review all talks anonymously.

+

We want to hear from everybody in the #if(event.event == "KotlinLeeds"):Kotlin#else:Swift#endif community and urge you to submit a proposal. Our team at #(event.event) review all talks anonymously.

All our speakers join us for the entire year. This means we offer full speaker training and any support you require throughout the process, from reviewing slides to helping with speaker nerves.

@@ -75,7 +75,7 @@

What makes a good submission?

-

The SwiftLeeds team review all talks anonymously and relies heavily on the title and description of your submission to understand whether it's a good fit for the community. With only 1 in 10 submissions being accepted, here's how you can stand out:

+

The #(event.event) team review all talks anonymously and relies heavily on the title and description of your submission to understand whether it's a good fit for the community. With only 1 in 10 submissions being accepted, here's how you can stand out:

diff --git a/Resources/Views/Home/_hero.leaf b/Resources/Views/Home/_hero.leaf index c1cd7b85..b123484e 100644 --- a/Resources/Views/Home/_hero.leaf +++ b/Resources/Views/Home/_hero.leaf @@ -7,7 +7,7 @@

#if(event.date):#(event.dateFormatted) #endif#(event.year)

-

A Unique#if(event.year >= 2023): 2 Day#endif Swift Conference in the Heart of Leeds

+

A Unique#if(event.year >= 2023): 2 Day#endif #if(event.event == "KotlinLeeds"):Kotlin#else:Swift#endif Conference in the Heart of Leeds

diff --git a/Resources/Views/Home/_info.leaf b/Resources/Views/Home/_info.leaf index b4ff9731..0b4bbf69 100644 --- a/Resources/Views/Home/_info.leaf +++ b/Resources/Views/Home/_info.leaf @@ -5,9 +5,17 @@

About

+ + #if(event.event == "KotlinLeeds"): +

Founded by Adam Rush in 2025, KotlinLeeds brings the UK's first dedicated Kotlin conference to the north of England.

+

Run by a passionate team of community volunteers, KotlinLeeds is a non-profit initiative where every penny goes directly into creating an exceptional conference experience. As the Android counterpart to our established SwiftLeeds conference, we're building on five years of experience delivering world-class mobile development events.

+

In-person conferences are where the Kotlin community truly comes alive. Connect with Android developers, Kotlin Multiplatform pioneers, and backend engineers who share your passion for modern app development.

+

Whether you're building your first Android app or architecting enterprise solutions, KotlinLeeds is where the UK's Kotlin community comes together to learn, share, and grow.

+ #else:

Founded by Adam Rush in 2019, SwiftLeeds has set out to bring a modern, inclusive conference to the north of the UK.

Ran by just a handful of community volunteers, SwiftLeeds is entirely non-profit with every penny going into delivering the best experience possible.

In-person conferences are the best way to meet like-minded people who enjoy building apps with Swift. You can also learn from the best people in the industry and chat about all things Swift.

+ #endif
diff --git a/Resources/Views/Home/_team.leaf b/Resources/Views/Home/_team.leaf index b5ba8d20..75bdebe5 100644 --- a/Resources/Views/Home/_team.leaf +++ b/Resources/Views/Home/_team.leaf @@ -3,12 +3,12 @@

By the Community

-

SwiftLeeds is ran entirely by the community, for the community, with a number of volunteers building out our various systems and ensuring you have the best time possible.

+

#(event.event) is ran entirely by the community, for the community, with a number of volunteers building out our various systems and ensuring you have the best time possible.

More About Us
- SwiftLeeds Team + #(event.event) Team
diff --git a/Resources/Views/Home/_venue_playhouse.leaf b/Resources/Views/Home/_venue_playhouse.leaf index afa1e427..24f04314 100644 --- a/Resources/Views/Home/_venue_playhouse.leaf +++ b/Resources/Views/Home/_venue_playhouse.leaf @@ -34,7 +34,7 @@ + #endif @@ -102,7 +110,7 @@