diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ccf3af3c..27565f95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build SwiftLeeds +name: Build All Services on: pull_request: @@ -78,6 +78,11 @@ jobs: runs-on: ubuntu-latest needs: build + strategy: + max-parallel: 1 # Shouldn't cause issues, but let's deploy one conference at a time + matrix: + conference: [swiftleeds, kotlinleeds] + steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -92,14 +97,14 @@ jobs: id: deployment with: step: start - env: ${{ github.head_ref || github.ref_name }} + env: ${{ matrix.conference }}-${{ github.head_ref || github.ref_name }} ref: ${{ github.head_ref || github.ref_name }} - name: Deploy to Cloud Run id: deploy uses: google-github-actions/deploy-cloudrun@v2 with: - service: swiftleeds-web-${{ github.head_ref || github.ref_name }}-be + service: ${{ matrix.conference }}-web-${{ github.head_ref || github.ref_name }}-be region: europe-west1 image: europe-west1-docker.pkg.dev/swiftleeds-website/swiftleeds-web/web:${{ github.head_ref || github.ref_name }}-latest flags: "--allow-unauthenticated" @@ -119,6 +124,7 @@ jobs: FLICKR_KEY=${{ secrets.FLICKR_KEY }} FLICKR_SECRET=${{ secrets.FLICKR_SECRET }} REFUND_PERIOD=${{ secrets.REFUND_PERIOD }} + CONFERENCE=${{ matrix.conference }} - name: Update GitHub Deployment uses: bobheadxi/deployments@v1 diff --git a/.github/workflows/close.yml b/.github/workflows/close.yml index c7e2f6f8..482c76f4 100644 --- a/.github/workflows/close.yml +++ b/.github/workflows/close.yml @@ -1,4 +1,4 @@ -name: Destroy SwiftLeeds +name: Shutdown Services on: pull_request: @@ -9,6 +9,10 @@ jobs: if: github.repository_owner == 'SwiftLeeds' runs-on: ubuntu-latest + strategy: + matrix: + conference: [swiftleeds, kotlinleeds] + steps: - name: Authenticate with Google Cloud uses: "google-github-actions/auth@v2" @@ -19,11 +23,10 @@ jobs: uses: "google-github-actions/setup-gcloud@v2" - name: Destroy Google Cloud Run Servce - run: gcloud run services delete --quiet --region europe-west2 swiftleeds-web-${{ github.head_ref || github.ref_name }}-be + run: gcloud run services delete --quiet --region europe-west1 ${{ matrix.conference }}-web-${{ github.head_ref || github.ref_name }}-be - name: Destroy GitHub Deployment uses: bobheadxi/deployments@v1 with: step: deactivate-env - env: ${{ github.head_ref || github.ref_name }} - + env: ${{ matrix.conference }}-${{ github.head_ref || github.ref_name }} diff --git a/Public/css/kotlin.css b/Public/css/kotlin.css new file mode 100644 index 00000000..c4c96498 --- /dev/null +++ b/Public/css/kotlin.css @@ -0,0 +1,106 @@ +body { + display: flex; + align-items: center; + justify-content: center; + height: 100vh; + margin: 0; + overflow: hidden; /* Prevent content from overflowing */ +} + +.half { + position: absolute; + top: 0; + width: 50vw; + height: 100vh; +} + +.center-column-flex { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; +} + +.center-row-flex { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; +} + +.right-half { + right: 0; + background: white; +} + +.left-half { + left: 0; + background: radial-gradient(89.53% 145.96% at 0.34% 100.79%, rgb(239, 72, 87) 0px, rgb(222, 73, 112) 17.58%, rgb(180, 77, 176) 50.31%, rgb(127, 82, 255) 97.03%); +} + +.background-container { + z-index: 999; +} + +/* Style for the form container */ +.tito-register-interest-form { + max-width: 80%; + margin: 0 auto; +} + +/* Style for the name field */ +.tito-register-interest-form--name { + margin-bottom: 20px; + display: flex; + flex-direction: column; +} + +.tito-name-label { + align-items: center; +} + +/* Style for the email field */ +.tito-register-interest-form--email { + margin-bottom: 20px; + display: flex; + flex-direction: column; +} + +.tito-email-label { + align-items: center; +} + +/* Style for the input fields with rounded corners and adjusted drop shadow */ +.tito-register-interest-name-field, +.tito-register-interest-email-field { + width: 100%; + padding: 8px; + margin-top: 8px; + box-sizing: border-box; + border: 1px solid #ccc; + border-radius: 5px; /* Rounded corners */ + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1), 0 8px 16px rgba(0, 0, 0, 0.1); /* Adjusted drop shadow */ +} + +/* Style for the submit button with the new green color */ +.tito-register-interest-form button { + background-color: rgb(25, 195, 125); /* New green color */ + color: white; + padding: 10px 15px; + border: none; + border-radius: 4px; + cursor: pointer; + font-size: 16px; +} + +/* Hover effect for the submit button */ +.tito-register-interest-form button:hover { + background-color: #1a8041; /* Darker green on hover */ +} + +@media (max-width: 770px) { + /* Style changes for screens with a width of 762x685 or smaller */ + .white-text-media-query { + color: #27282c; + } +} diff --git a/Public/img/Kotlin_Icon.svg b/Public/img/Kotlin_Icon.svg new file mode 100644 index 00000000..3480717d --- /dev/null +++ b/Public/img/Kotlin_Icon.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Resources/Views/Kotlin/home.leaf b/Resources/Views/Kotlin/home.leaf new file mode 100644 index 00000000..80a86ade --- /dev/null +++ b/Resources/Views/Kotlin/home.leaf @@ -0,0 +1,43 @@ + + + + + + + KotlinLeeds - The Unique Android Kotlin Conferece in the UK + + + + + + + +
+
+
+
+
+

Hello, KotlinLeeds!

+

We've got something coming soon...

+
+
+ Icon +
+
+ + Click here to register interest + +
+
+
+ + + + + diff --git a/Sources/App/configure.swift b/Sources/App/configure.swift index 85b9f793..68708ee9 100644 --- a/Sources/App/configure.swift +++ b/Sources/App/configure.swift @@ -51,7 +51,15 @@ public func configure(_ app: Application) async throws { // Routes app.routes.defaultMaxBodySize = "10mb" - try routes(app) + + switch app.conference { + case .kotlinleeds: + app.get { req in + req.view.render("Kotlin/home") + } + case .swiftleeds: + try routes(app) + } // APNS if @@ -65,3 +73,13 @@ public func configure(_ app: Application) async throws { app.logger.warning("Skipping APNS Setup") } } + +extension Application { + enum Conference: String { + case kotlinleeds, swiftleeds + } + + var conference: Conference { + Environment.get("CONFERENCE").flatMap { Conference(rawValue: $0) } ?? .swiftleeds + } +}