Replace Formspree forms with Google Forms

GCCR · Aug 3, 2023 · c1decbf · c1decbf
1 parent d75c662
commit c1decbf
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 45 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,4 +16,5 @@ install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
   end
 
   # Performance-booster for watching directories on Windows
-  gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
+  gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
+gem "webrick", "~> 1.8"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,43 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.5)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.5)
-    concurrent-ruby (1.1.10)
-    dnsruby (1.61.9)
-      simpleidn (~> 0.1)
+    commonmarker (0.23.10)
+    concurrent-ruby (1.2.2)
+    dnsruby (1.70.0)
+      simpleidn (~> 0.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.8.1)
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (226)
+    github-pages (228)
       github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.2)
+      jekyll (= 3.9.3)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.2.0)
+      jekyll-commonmark-ghpages (= 0.4.0)
       jekyll-default-layout (= 0.1.4)
       jekyll-feed (= 0.15.1)
       jekyll-gist (= 1.5.0)
@@ -71,10 +71,10 @@ GEM
       jemoji (= 0.12.0)
       kramdown (= 2.3.2)
       kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.3)
+      liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.13.4, < 2.0)
+      nokogiri (>= 1.13.6, < 2.0)
       rouge (= 3.26.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.17.9)
@@ -83,17 +83,17 @@ GEM
       octokit (~> 4.0)
       public_suffix (>= 3.0, < 5.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.14.1)
+    html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.2)
+    jekyll (3.9.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
       kramdown (>= 1.17, < 3)
@@ -109,11 +109,11 @@ GEM
       coffee-script-source (~> 1.11.1)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.2.0)
-      commonmarker (~> 0.23.4)
+    jekyll-commonmark-ghpages (0.4.0)
+      commonmarker (~> 0.23.7)
       jekyll (~> 3.9.0)
       jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 4.0)
+      rouge (>= 2.0, < 5.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
     jekyll-feed (0.15.1)
@@ -201,31 +201,29 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.15.0)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    minitest (5.19.0)
+    nokogiri (1.15.3-x86_64-linux)
       racc (~> 1.4)
-    octokit (4.25.0)
+    octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.6.0)
-    rb-fsevent (0.11.1)
+    racc (1.7.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (3.26.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -245,19 +243,20 @@ GEM
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.10)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2022.1)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     wdm (0.1.1)
-    zeitwerk (2.5.4)
+    webrick (1.8.1)
+    zeitwerk (2.6.11)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   github-pages
@@ -267,6 +266,7 @@ DEPENDENCIES
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.1)
+  webrick (~> 1.8)
 
 BUNDLED WITH
-   2.3.15
+   2.4.8
diff --git a/_includes/contact.html b/_includes/contact.html
@@ -4,10 +4,15 @@
     <div class="row">
       <div class="col-lg-12 text-center">
         <h2 class="section-heading text-uppercase">Contact Us</h2>
-        <p class="section-heading"> <i>please feel free to send us an email at [email protected]</i></p>
+        <p class="section-heading"> <i>please feel free to send us an email at [email protected], or access our contact form below</i></p>
       </div>
     </div>  
-    <form
+    <div class="col-lg-12 text-center">
+      <a href="https://forms.gle/ZbojYRaQ7d7tAsFv7" target="_blank" class="btn btn-primary btn-xl text-uppercase">Contact Form</a>
+      <!-- <button id="googleFormButton" class="btn btn-primary btn-xl text-uppercase"  type="submit">Contact Form</button> -->
+    </div>
+    <!-- 230802 formspree is too expensive, migrating to google form -->
+    <!-- <form
       action="https://formspree.io/mknvrbar"
       method="POST">
       
@@ -33,6 +38,6 @@ <h2 class="section-heading text-uppercase">Contact Us</h2>
           </form>
         </div>
       </div>
-    </form>
+    </form> -->
   </div>
 </section>
diff --git a/join.html b/join.html
@@ -134,8 +134,11 @@ <h2 class="mb-0">
             </div>
             <div id="collapseThree" class="collapse show" aria-labelledby="headingThree" data-parent="#accordionExample">
               <div class="card-body">
-
-                <form action="https://formspree.io/xknvvoyd" method="POST">
+                <p>To apply for GCCR membership, please fill out the form linked below</p>
+                <a href="https://forms.gle/mv2qyaM99xp7mEUe9" target="_blank" class="btn btn-primary btn-xl text-uppercase">Membership Form</a>
+
+                <!-- Depriciated to google forms -->
+                <!-- <form action="https://formspree.io/xknvvoyd" method="POST">
                   <div class="row">
                     <div class="col-md-12">
                       <form id="joinForm" name="sentForm" novalidate="novalidate">
@@ -201,7 +204,8 @@ <h2 class="mb-0">
                       </form>
                     </div>
                   </div>
-                </form>
+                </form> -->
+
               </div>
             </div>
           </div>