Ready-ing for GHA deployment

Author: rickychilcott

.github/workflows/pages.yml

@@ -0,0 +1,49 @@
+name: Deploy to GitHub Pages
+
+on:
+  push:
+    branches: [main, master]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+
+      - name: Build with Jekyll
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

Gemfile

@@ -7,4 +7,5 @@ group :jekyll_plugins do
   gem "jekyll-sitemap"
   gem "jekyll-feed"
   gem "jekyll-coffeescript"
+  gem "jekyll-redirect-from"
 end

Gemfile.lock

@@ -74,6 +74,8 @@ GEM
       coffee-script-source (~> 1.12)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (3.1.0)
       sass-embedded (~> 1.75)
     jekyll-sitemap (1.4.0)
@@ -171,6 +173,7 @@ DEPENDENCIES
   jekyll
   jekyll-coffeescript
   jekyll-feed
+  jekyll-redirect-from
   jekyll-sitemap
 
 RUBY VERSION

_config.yml

@@ -37,3 +37,4 @@ plugins:
   - jekyll-sitemap
   - jekyll-feed
   - jekyll-coffeescript
+  - jekyll-redirect-from

_includes/head.html

@@ -47,9 +47,6 @@
     <script src="js/respond.min.js"></script>
   <![endif]-->
 
-  <!-- Google Recaptcha -->
-  <script src="https://www.google.com/recaptcha/api.js" async defer></script>
-
   <!-- Stoked -->
   <script
     src="https://rakefire.stokedhq.com/get-stoked.js"

_includes/sections/contact.html

@@ -23,14 +23,18 @@ <h3>Contact Info</h3>
       </div>
       <div class="col-md-6 to-animate">
         <h3>Contact Form</h3>
-        <form action="/#submit-success" method="post">
+        <form action="https://api.web3forms.com/submit" method="post">
+          <input type="hidden" name="access_key" value="fece4eca-24ff-4c9b-a4b8-25be504f053b">
+          <input type="hidden" name="subject" value="Rakefire Enquiry">
+          <input type="hidden" name="redirect" value="https://rakefire.io/#submit-success">
+          <input type="checkbox" name="botcheck" style="display: none;">
           <div class="form-group">
             <label class="sr-only" for="name">Name</label>
             <input class="form-control" id="name" placeholder="Name" name="name" type="text">
           </div>
           <div class="form-group">
             <label class="sr-only" for="email">Email</label>
-            <input class="form-control" id="email" placeholder="Email" name="_replyto" type="email">
+            <input class="form-control" id="email" placeholder="Email" name="email" type="email">
           </div>
           <div class="form-group">
             <label class="sr-only" for="phone">Phone</label>
@@ -41,11 +45,6 @@ <h3>Contact Form</h3>
             <textarea class="form-control" cols="30" id="message" name="message" placeholder="Message"
               rows="5"></textarea>
           </div>
-          <input type="hidden" name="_subject" value="Rakefire Enquiry">
-          <input type="hidden" name="_to" value="ricky@rakefire.io">
-          <input type="hidden" name="_cc" value="jim@rakefire.io">
-          <!-- <input type="hidden" name="_cc" value="phil@rakefire.io"> -->
-          <div class="g-recaptcha" data-sitekey="6LfKBEYUAAAAAE5kwioYDyIqqzpTO4akzcetKxcy"></div>
           <div class="form-group">
             <input class="btn btn-primary btn-lg" type="submit" value="Send Message">
           </div>

_plugins/cloudannon_redirects.rb

@@ -0,0 +1,45 @@
+# Generates redirect pages from _data/redirects.csv
+# Each row creates a page with redirect_to frontmatter,
+# which jekyll-redirect-from uses to generate HTML redirect pages.
+
+module RedirectPages
+  class RedirectPage < Jekyll::Page
+    def initialize(site, from, to)
+      @site = site
+      @base = site.source
+
+      from = "/#{from}" unless from.start_with?("/")
+
+      @dir = from
+      @name = "index.html"
+
+      self.process(@name)
+      self.data = {
+        "redirect_to" => to,
+        "sitemap" => false,
+        "layout" => nil
+      }
+      self.content = ""
+    end
+  end
+
+  class Generator < Jekyll::Generator
+    safe true
+    priority :low
+
+    def generate(site)
+      redirects = site.data["redirects"]
+      return unless redirects
+
+      redirects.each do |redirect|
+        from = redirect["from"]
+        to = redirect["to"]
+
+        next if from.nil? || from.empty? || to.nil? || to.empty?
+
+        site.pages << RedirectPage.new(site, from, to)
+        Jekyll.logger.info "Redirect:", "#{from} -> #{to}"
+      end
+    end
+  end
+end