fixing conflicts with upstream pull

Author: domitriusclark

netlify.toml

@@ -12,8 +12,18 @@
 
 [[redirects]]
   from = "/conference"
-  to = "https://jamstackconf.com/"
-  status = 302
+  to = "/conf"
+  status = 301
+
+[[redirects]]
+  from = "/conf"
+  to = "https://jamstackconf.com/conf/"
+  status = 200
+
+[[redirects]]
+  from = "/conf/*"
+  to = "https://jamstackconf.com/conf/:splat"
+  status = 200
 
 [[redirects]]
   from = "/discord"
@@ -45,14 +55,9 @@
   to = "https://res.cloudinary.com/netlify/image/fetch/c_fit,l_text:Roboto_56_bold::term,co_rgb:FFFFFF,g_north_west,y_75,x_100,w_1000/c_fit,l_text:Roboto_38_light::summary,co_rgb:FFFFFF,g_north_west,y_200,x_160,w_885/https://jamstack.org/img/og/glossary-card-bg.png"
   status = 200
 
-[[redirects]]
-  from = "/conf/"
-  to = "https://jamstackconf.com/"
-  status = 302
-
 [[redirects]]
   from = "/conf/cfp"
-  to = "https://docs.google.com/forms/d/e/1FAIpQLSeR5W4m9owqDBJEq2EuRUNXFTOeLCxFPUn0qbuCE15o4SWDFg/viewform"
+  to = "https://docs.google.com/forms/d/e/1FAIpQLSc-z50GyD7zXzr_JCn2M1NBFZ-h65kSdu7zn43V1u2qAKO3ew/viewform"
   status = 302
 
 [[redirects]]

package.json

@@ -15,14 +15,13 @@
     "build": "npm-run-all build:html build:css",
     "build:html": "eleventy",
     "build:css": "postcss src/css/tailwind.css -o dist/css/styles.css",
-    "watch:html": "ELEVENTY_ENV=dev eleventy --watch --quiet",
+    "watch:html": "ELEVENTY_ENV=dev eleventy --serve --port=8080 --quiet",
     "watch:css": "postcss src/css/tailwind.css -o dist/css/styles.css --watch",
-    "serve": "npx live-server dist --quiet --port=8090",
-    "start": "npm-run-all --parallel watch:html watch:css serve",
+    "start": "npm-run-all --parallel watch:html watch:css",
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@11ty/eleventy": "^0.11.1",
+    "@11ty/eleventy": "^1.0.0",
     "@11ty/eleventy-cache-assets": "^2.1.0",
     "@zachleat/filter-container": "^1.0.3",
     "autoprefixer": "^10.2.5",
@@ -45,8 +44,5 @@
     "postcss-import": "^13.0.0",
     "spdx-correct": "^3.1.1",
     "tailwindcss": "^2.0.3"
-  },
-  "devDependencies": {
-    "live-server": "^1.2.1"
   }
-}
+}

src/site/_data/announcementbar.json

@@ -1,5 +1,5 @@
 {
-  "text": "Women of Jamstack is now live!",
-  "cta": "Check it out!",
-  "url": "/women-of-jamstack/"
+  "text": "",
+  "cta": "Fill out the 2022 Jamstack Community Survey and get a free sticker!",
+  "url": "https://netlify.qualtrics.com/jfe/form/SV_0BRbhN47gyZWYNo?Source=jamstack_eyebrow"
 }

src/site/img/conf-2022-tout.png

@@ -24,6 +24,23 @@ layout: layouts/base.njk
   </div>
 </section>
 
+<section class="mb-10">
+  <div class="border-2 border-white block rounded-xl shadow-lg text-center ">
+    <img src="/img/conf-2022-tout.png" alt="Jamstack Conf 2022" class="rounded-xl w-2/3 mx-auto my-6">
+    <p class="text-xl md:text-2xl mb-5 px-5">
+      <span class="font-bold">7-8 Nov 2022</span>
+      <span>·</span>
+      <span>San Francisco and online</span>
+    </p>
+    <p class="text-lg md:text-xl mb-5 w-2/3 md:w-1/2 mx-auto">
+      Join 20,000+ web developers for two days dedicated to building modern web projects.
+    </p>
+    <p class="mb-5">
+      <a href="https://jamstackconf.com" class="cta">Attend Jamstack Conf</a>
+    </p>
+  </div>
+</section>
+
 {% include "components/join-the-movement.njk" %}
 
 <section class=" mb-16">

src/site/index.njk

@@ -11,7 +11,7 @@ excludeFromSitemap: true
   <h1>Thanks for filling out the Jamstack community survey</h1>
   {{ zinger.cta(
     "Share the survey",
-    "https://twitter.com/intent/tweet?text=%F0%9F%8E%89I%20completed%20the%20Jamstack%20Community%20Survey.%20Share%20your%20feedback%20and%20unlock%20a%20special%20edition%20Jamstack%20sticker!&url=https%3A%2F%2Fwww.surveymonkey.com%2Fr%2Fjamstack-share-survey",
+    "https://twitter.com/intent/tweet?text=%F0%9F%92%AB%20I%20completed%20the%20%2722%20Jamstack%20Community%20Survey.%20Share%20your%20feedback%20and%20unlock%20a%20special%20edition%20Jamstack%20sticker!%20&url=https%3A%2F%2Fnetlify.qualtrics.com%2Fjfe%2Fform%2FSV_0BRbhN47gyZWYNo%3FSource%3Dsurvey_share_page",
     "bg-gradient-card-sunrise card-shadow hover:card-shadow-sunrise mb-9"
     )
   }}

src/site/survey-closed.njk

@@ -6,17 +6,17 @@ layout: layouts/base.njk
 
 {% import "components/zinger-cta.njk" as zinger %}
 
-<section class="my-20">
+<section class="my-10">
   <h1>Thanks for filling out the Jamstack community survey</h1>
   {{ zinger.cta(
     "Share the survey",
-    "https://twitter.com/intent/tweet?text=%F0%9F%8E%89I%20completed%20the%20Jamstack%20Community%20Survey.%20Share%20your%20feedback%20and%20unlock%20a%20special%20edition%20Jamstack%20sticker!&url=https%3A%2F%2Fwww.surveymonkey.com%2Fr%2Fjamstack-share-survey",
+    "https://twitter.com/intent/tweet?text=%F0%9F%92%AB%20I%20completed%20the%20%2722%20Jamstack%20Community%20Survey.%20Share%20your%20feedback%20and%20unlock%20a%20special%20edition%20Jamstack%20sticker!%20&url=https%3A%2F%2Fnetlify.qualtrics.com%2Fjfe%2Fform%2FSV_0BRbhN47gyZWYNo%3FSource%3Dsurvey_share_page",
     "bg-gradient-card-sunrise card-shadow hover:card-shadow-sunrise mb-9"
     )
   }}
-  
+
   <h2>Jamstack Sticker Giveaway</h2>
-  
+
   <p>Share the survey with your network and we’ll share some sticker love! Complete this form, including a link to your shared post (social, blog, newsletter), and we’ll get your sticker in the mail.</p>
   <p class="text-xs">*Offer is limited to the first 1,000 respondents.</p>
 
@@ -26,12 +26,14 @@ layout: layouts/base.njk
     <![endif]-->
     <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2.js"></script>
     <script>
-      hbspt.forms.create({
-      region: "na1",
-      portalId: "7477936",
-      formId: "632eaa19-27d2-42b7-bef4-7bfd35531865"
-    });
+      hbspt
+        .forms
+        .create({region: "na1", portalId: "7477936", formId: "ec8f8d14-d79d-4bae-8e15-9345f302764c"});
     </script>
   </div>
   <p>Stickers will be sent after campaign has ended, or maximum has been reached. Stickers will be shipped with U.S. domestic or international postage stamps. Delivery is not guarenteed or trackable.</p>
+
+  <div class="flex items-center justify-center mt-10 p-10 border-4 rounded-lg border-pink-500 ">
+    <a class="text-xl text-white" href="www.jamstackconf.com">Save the date for Jamstack Conf and get 20% off the ticket cost!</a>
+  </div>
 </section>