Feedback

pizza-to-the-polls · Dec 12, 2023 · 5fc61a0 · 5fc61a0
1 parent 8f05c51
commit 5fc61a0
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 188 deletions.
diff --git a/public/images/give-icon.png b/public/images/give-icon.png
diff --git a/public/images/pics/photo_6.jpeg b/public/images/pics/photo_6.jpeg
diff --git a/public/images/pics/photo_7.jpg b/public/images/pics/photo_7.jpg
diff --git a/src/components.d.ts b/src/components.d.ts
@@ -27,8 +27,6 @@ export namespace Components {
     }
     interface PageContact {
     }
-    interface PageCovid {
-    }
     interface PageCrustclub {
         "history"?: RouterHistory;
     }
@@ -163,12 +161,6 @@ declare global {
         prototype: HTMLPageContactElement;
         new (): HTMLPageContactElement;
     };
-    interface HTMLPageCovidElement extends Components.PageCovid, HTMLStencilElement {
-    }
-    var HTMLPageCovidElement: {
-        prototype: HTMLPageCovidElement;
-        new (): HTMLPageCovidElement;
-    };
     interface HTMLPageCrustclubElement extends Components.PageCrustclub, HTMLStencilElement {
     }
     var HTMLPageCrustclubElement: {
@@ -338,7 +330,6 @@ declare global {
         "page-about": HTMLPageAboutElement;
         "page-activity": HTMLPageActivityElement;
         "page-contact": HTMLPageContactElement;
-        "page-covid": HTMLPageCovidElement;
         "page-crustclub": HTMLPageCrustclubElement;
         "page-deliveries": HTMLPageDeliveriesElement;
         "page-donate": HTMLPageDonateElement;
@@ -388,8 +379,6 @@ declare namespace LocalJSX {
     }
     interface PageContact {
     }
-    interface PageCovid {
-    }
     interface PageCrustclub {
         "history"?: RouterHistory;
     }
@@ -499,7 +488,6 @@ declare namespace LocalJSX {
         "page-about": PageAbout;
         "page-activity": PageActivity;
         "page-contact": PageContact;
-        "page-covid": PageCovid;
         "page-crustclub": PageCrustclub;
         "page-deliveries": PageDeliveries;
         "page-donate": PageDonate;
@@ -539,7 +527,6 @@ declare module "@stencil/core" {
             "page-about": LocalJSX.PageAbout & JSXBase.HTMLAttributes<HTMLPageAboutElement>;
             "page-activity": LocalJSX.PageActivity & JSXBase.HTMLAttributes<HTMLPageActivityElement>;
             "page-contact": LocalJSX.PageContact & JSXBase.HTMLAttributes<HTMLPageContactElement>;
-            "page-covid": LocalJSX.PageCovid & JSXBase.HTMLAttributes<HTMLPageCovidElement>;
             "page-crustclub": LocalJSX.PageCrustclub & JSXBase.HTMLAttributes<HTMLPageCrustclubElement>;
             "page-deliveries": LocalJSX.PageDeliveries & JSXBase.HTMLAttributes<HTMLPageDeliveriesElement>;
             "page-donate": LocalJSX.PageDonate & JSXBase.HTMLAttributes<HTMLPageDonateElement>;

diff --git a/src/components/app-root/app-root.scss b/src/components/app-root/app-root.scss
@@ -156,7 +156,7 @@
       &:hover,
       &:active,
       &.link-active {
-        color: $white !important;
+        color: $teal !important;
       }
     }
   }

diff --git a/src/components/app-root/app-root.tsx b/src/components/app-root/app-root.tsx
@@ -70,7 +70,6 @@ export class AppRoot {
               <stencil-route url="/about" component="page-about" />
               <stencil-route url="/faq" component="page-faq" />
               <stencil-route url="/activity" component="page-activity" />
-              <stencil-route url="/covid" component="page-covid" />
               <stencil-route url="/contact" component="page-contact" />
               <stencil-route url={["/deliveries/:location/:order", "/deliveries/:location", "/deliveries"]} component="page-deliveries" />
               <stencil-route url="/donate" component="page-donate" />
@@ -119,9 +118,6 @@ export class AppRoot {
                   <li>
                     <stencil-route-link url="/vax-and-snacks">Vax and Snacks</stencil-route-link>
                   </li>
-                  <li>
-                    <stencil-route-link url="/covid">COVID safety</stencil-route-link>
-                  </li>
                   <li>
                     <stencil-route-link url="/privacy">Privacy Policy</stencil-route-link>
                   </li>

diff --git a/src/components/app-root/css/_button.scss b/src/components/app-root/css/_button.scss
@@ -122,6 +122,9 @@
           fill: $color;
         }
       }
+      & a {
+        background-color: transparent !important;
+      }
     }
   }
 

diff --git a/src/components/page-about/page-about.tsx b/src/components/page-about/page-about.tsx
@@ -108,11 +108,6 @@ export class PageAbout {
                     Frequently Asked Questions
                   </stencil-route-link>
                 </li>
-                <li>
-                  <stencil-route-link url="/covid" class="has-text-teal">
-                    COVID Safety
-                  </stencil-route-link>
-                </li>
               </ul>
             </ui-card>
           </ui-main-content>

diff --git a/src/components/page-covid/page-covid.scss b/src/components/page-covid/page-covid.scss
diff --git a/src/components/page-covid/page-covid.tsx b/src/components/page-covid/page-covid.tsx
diff --git a/src/components/page-covid/test/page-covid.e2e.ts b/src/components/page-covid/test/page-covid.e2e.ts
diff --git a/src/components/page-deliveries/page-deliveries.tsx b/src/components/page-deliveries/page-deliveries.tsx
@@ -262,8 +262,6 @@ export class PageDeliveries {
       );
     const combinedItems = [...currentItems.slice(3, 1000), ...pastItems];
 
-    const currentAddress = selectedAddress != null ? foundLocation?.fullAddress || selectedAddress : currentItems?.find(_ => true)?.data?.location.fullAddress;
-
     return (
       <Host>
         <ui-main-content class={{ "selected-location": selectedAddress != null }}>

diff --git a/src/components/page-faq/page-faq.tsx b/src/components/page-faq/page-faq.tsx
@@ -44,46 +44,6 @@ export class PageFAQ {
               <ui-card is-collapsible={true} header-text="Where will you deliver pizzas?">
                 <p>Any polling place in the US, as long as we can find a delivery place that services that location.</p>
               </ui-card>
-              <ui-card is-collapsible={true} header-text="What precautions is Pizza to the Polls taking as a result of COVID&#8209;19?">
-                <p>Pizza to the Polls values the health and safety of our communities, and will be working to mitigate risk of disease transmission:</p>
-                <ui-pizza-list>
-                  <li>
-                    Our{" "}
-                    <stencil-route-link url="/trucks" anchorClass="has-text-teal">
-                      food truck program
-                    </stencil-route-link>{" "}
-                    will be staffed by professionals who’ve been trained in food safety and policies to help reduce the spread of COVID-19, but please keep in mind that it isn’t
-                    possible to eliminate the risk of exposure.
-                  </li>
-                  <li>
-                    For{" "}
-                    <stencil-route-link url="/on-demand" anchorClass="has-text-teal">
-                      on-demand
-                    </stencil-route-link>{" "}
-                    pizza deliveries, we will be supporting local pizzerias with our pizza delivery partners at{" "}
-                    <a href="https://slicelife.com/" target="_blank">
-                      Slice
-                    </a>
-                    . We plan to share{" "}
-                    <a
-                      href="https://www.cdc.gov/coronavirus/2019-ncov/community/organizations/business-employers/bars-restaurants.html"
-                      class="has-text-teal"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                    >
-                      safety recommendations
-                    </a>{" "}
-                    with delivery drivers and restaurants, but it’s up to each person to consider their own personal risks.
-                  </li>
-                </ui-pizza-list>
-                <p>
-                  You can learn more about safety precautions you can take to stay safe at the polls{" "}
-                  <stencil-route-link url="/covid" anchorClass="has-text-teal">
-                    here
-                  </stencil-route-link>
-                  .
-                </p>
-              </ui-card>
               <ui-card is-collapsible={true} header-text="Can I help distribute pizzas?">
                 <p>
                   Yes! When you report a line, let us know that you can receive an order on behalf of Pizza to the Polls. We’ll send you a text once an order has been placed!

diff --git a/src/components/page-home/page-home.scss b/src/components/page-home/page-home.scss
@@ -79,7 +79,7 @@ page-home {
         background-color: $light-red;
         box-shadow: none;
         height: 2.2rem;
-        font-size: 2.2rem;
+        font-size: 1.9rem;
 
         @media ($under-tablet) {
           height: 1rem;
@@ -91,7 +91,7 @@ page-home {
         & {
           color: $blue;
         }
-        margin-left: 10px;
+        margin-left: 14px;
       }
       &:before {
         height: 2.8rem;
@@ -162,9 +162,10 @@ page-home {
       .stat-number {
         font-size: 28px;
         font-weight: 600;
+        color: $blue;
 
         @media ($tablet) {
-          font-size: 32px;
+          font-size: 2.8rem;
         }
       }
 

diff --git a/src/components/page-home/page-home.tsx b/src/components/page-home/page-home.tsx
@@ -43,6 +43,10 @@ export class PageHome {
                 <stencil-route-link class="button button-large is-cyan" url="/donate">
                   Donate now
                 </stencil-route-link>
+                &nbsp;
+                <stencil-route-link class="button button-large is-teal" url="/crustclub">
+                  Join the Crust Club
+                </stencil-route-link>
                 <span class="donate-button-subtext">* All contributions are tax deductible</span>
               </div>
             </div>
@@ -53,7 +57,7 @@ export class PageHome {
         </div>
         <section class="order-pizzas">
           <div class="container">
-            <ui-location-search placeholder="Search for a location to send pizza" onLocationSelected={handleLocationSelected} />
+            <ui-location-search placeholder="Stuck in a long line? Search your location here" onLocationSelected={handleLocationSelected} />
           </div>
         </section>
         <section class="totals">{this.totals && <Stats totals={this.totals} />}</section>
@@ -68,7 +72,6 @@ export class PageHome {
             <img src="/images/give-icon.png" />
             <div class="donate-text">
               <h1 class="has-text-red">Help us send pizza to hungry folks in long lines.</h1>
-              <p>Can you help out with a little dough?</p>
             </div>
             <div class="donate-button">
               <stencil-route-link url="/donate" class="button button-large is-red">

diff --git a/src/components/page-on-demand/page-on-demand.tsx b/src/components/page-on-demand/page-on-demand.tsx
@@ -14,7 +14,7 @@ export class PageOnDemand {
       <ui-main-content class="page">
         <ui-card>
           <h1>On Demand</h1>
-          <img src="/images/pics/photo_5.jpg" alt="Person taking a slice of pizza" class="image" />
+          <img style={{ margin: "0 auto", display: "block" }} src="/images/pics/photo_6.jpeg" alt="Mother and daughter enjoying pizza in front of American flag" class="image" />
           <h2>How to help</h2>
           <h3>1. Report a crowd</h3>
           <p>
@@ -39,6 +39,13 @@ export class PageOnDemand {
           <a class="button is-teal" href="/#report">
             Report a line
           </a>
+          <img style={{ margin: "30px auto 0", display: "block" }} src="/images/pics/photo_7.jpg" alt="Students handing out pizzas to classmates" class="image" />
+          <h1>Pre-Order</h1>
+          <p>
+            Are you a non profit working on voter registration, turnout and education events? Email
+            <a href="mailto:[email protected]">[email protected]</a>
+            for more information!
+          </p>
         </ui-card>
       </ui-main-content>
     );

diff --git a/src/components/ui-main-content/ui-main-content.scss b/src/components/ui-main-content/ui-main-content.scss
@@ -1,9 +1,9 @@
 ui-main-content {
   .background {
-    background-image: url("/images/redpepper.png"), url("/images/pizza-star.svg"), url("/images/basil.png"), url("/images/pizza-yellow.svg");
+    background-image: url("/images/pizza-star.svg"), url("/images/pizza-yellow.svg");
     background-repeat: no-repeat;
-    background-position: 2% 27.4rem, -3% 38rem, 98% 15rem, 102% 25rem;
-    background-size: 3rem, 8rem, 4rem, 10rem;
+    background-position: -3% 38rem, 102% 25rem;
+    background-size: 8rem, 10rem;
     @media ($under-desktop) {
       background: none;
     }

diff --git a/stencil.config.ts b/stencil.config.ts
@@ -11,6 +11,7 @@ export const config: Config = {
   globalStyle: "styles/main.scss",
   globalScript: "src/app.ts",
   taskQueue: "async",
+
   plugins: [
     sourcemaps(),
     replace({
@@ -21,6 +22,7 @@ export const config: Config = {
         "process.env.BUGSNAG_KEY": process.env.BUGSNAG_KEY ? `"${process.env.BUGSNAG_KEY}"` : `null`,
         "process.env.NODE_ENV": process.env.NODE_ENV ? `"${process.env.NODE_ENV}"` : `"dev"`,
       },
+      preventAssignment: false,
     }),
     sass({
       injectGlobalPaths: ["styles/include/vars.scss", "styles/include/mixins.scss"],
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,6 +122,9 @@ @@
               fill: $color;
             }
           }
+          & a {
+            background-color: transparent !important;
+          }
         }
       }
@@ Expand Down @@