@rileybathurst/paddle 1.9.16 → 1.9.18

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rileybathurst/paddle",
   "private": false,
-  "version": "1.9.16",
+  "version": "1.9.18",
   "type": "module",
   "scripts": {
     "dev": "tsc --noEmit && stay-gold && vite",

package/src/paddle-location-deck.tsx

@@ -9,19 +9,16 @@ export const PaddleLocationDeck = ({
   season_end,
   phone
 }: PaddleLocationDeckTypes) => {
-  
-  // TODO: testing
-  console.log("PaddleLocationDeck phone", phone);
 
   return (
     <section className="location-deck">
       {nodes.map((location: PaddleLocationTypes) => (
         <PaddleLocation
           key={location.id}
+          {...location}
           season_start={season_start}
           season_end={season_end}
           phone={phone}
-          {...location}
         />
       ))}
     </section>

package/src/paddle-location.tsx

@@ -54,13 +54,17 @@ const Season = ({
 
     return (
       <div>
-        <p>We&apos;re closed for the season</p>
+        {offSeasonDetails ? (
+          <p>{offSeasonDetails}</p>
+        ) : (
+          <p>We&apos;re closed for the season</p>
+        )}
 
         {currentDay < seasonStartDate ? (
           <p>We will reopen {season_start}, Weather Permitting</p>
         ) : null}
 
-        {offSeasonDetails ? <p>{offSeasonDetails}</p> : null}
+        
       </div>
     );
   }
@@ -68,7 +72,6 @@ const Season = ({
   console.warn(`No season start or end date provided for ${name}. Defaulting to off season.`);
   return (
     <div>
-      <p>We&apos;re closed for the season</p>
       {offSeasonDetails ? <p>{offSeasonDetails}</p> : null}
     </div>
   );
@@ -87,11 +90,10 @@ type ContentTypes = {
   opening_time: string;
   closing_time: string;
 
-  season_start?: string;
-  season_end?: string;
+  season_start: string;
+  season_end: string;
 
   offSeasonDetails?: string;
-  phone?: number;
   weatherPermitting?: boolean;
 
   streetAddress?: string;
@@ -116,7 +118,6 @@ const Content = ({
   season_start,
   season_end,
   offSeasonDetails,
-  phone,
 }: ContentTypes) => {
   return (
     <React.Fragment>
@@ -156,10 +157,6 @@ const Content = ({
             <Markdown>{description.data.description}</Markdown>
           </div>
         )}
-
-        {phone && (
-          <Phone phone={phone} />
-        )}
       </div>
     </React.Fragment>
   );
@@ -177,17 +174,14 @@ export const PaddleLocation = ({
   addressRegion,
   postalCode,
   commonName,
-  season_start,
-  season_end,
-  phone,
   offSeasonDetails,
-  weatherPermitting
+  weatherPermitting,
+  showThePhone,
+  phone,
+  season_start,
+  season_end
 }: PaddleLocationTypes) => {
-
-    
-  // TODO: testing
-  console.log("PaddleLocation phone", phone);
-
+  
   const content = (
     <Content
       svg={svg}
@@ -208,7 +202,7 @@ export const PaddleLocation = ({
   );
 
   return link.includes("http") ? (
-    <div className={`location-wrapper ${phone ? 'phone-spacer' : ''}`}>
+    <div className={`location-wrapper ${showThePhone ? 'phone-spacer' : ''}`}>
       <a
         href={link}
         className="location"
@@ -218,16 +212,16 @@ export const PaddleLocation = ({
       >
         {content}
       </a>
-      {phone && (
+      {showThePhone && phone && (
         <Phone phone={phone} />
       )}
     </div>
   ) : (
-    <div className={`location-wrapper ${phone ? 'phone-spacer' : ''}`}>
+    <div className={`location-wrapper ${showThePhone ? 'phone-spacer' : ''}`}>
       <Link to={link} className="location">
         {content}
       </Link>
-      {phone && (
+      {showThePhone && phone && (
         <Phone phone={phone} />
       )}
     </div>

package/src/paddle-purchase.tsx

@@ -5,11 +5,7 @@ import { PaddleInchesRemainder } from "./paddle-inches-remainder";
 import { PaddleTextureBackgrounds } from "./paddle-texture-backgrounds";
 import { PaddlePurchaseAndImageTypes } from "./types/paddle-purchase-image-types";
 
-// TODO: I'm not sure if this is needed or I can loop it easier
-interface NameTypes {
-  name: string;
-}
-function Name({ name }: NameTypes) {
+function Name({ name }: { name: string }) {
   return (
     <div className="badge">
       <h5 className="capitalize">{name}</h5>

package/src/phone.tsx

@@ -6,14 +6,9 @@ interface FormatPhoneNumberTypes {
 const FormatPhoneNumber = ({ phone }: FormatPhoneNumberTypes) => {
   const phoneNumber = String(phone);
 
-  // TODO: testing
-  console.log("FormatPhoneNumber phone", phone);
   const cleaned = `${phoneNumber}`.replace(/\D/g, "");
   const match = cleaned.match(/^(\d{3})(\d{3})(\d{4})$/);
   if (match) {
-
-    // TODO: testing
-    console.log("match", match);
     return `(${match[1]}) ${match[2]}-${match[3]}`;
   }
   return null;
@@ -25,9 +20,6 @@ type PhoneTypes = {
 
 const Phone = ({ phone }: PhoneTypes) => {
 
-  // TODO: testing
-  console.log("phone", phone);
-
   return (
     <a href={`tel:${phone}`}
     rel="noopener noreferrer"

package/src/types/paddle-location-deck-types.ts

@@ -3,6 +3,6 @@ import type { PaddleLocationTypes } from "./paddle-location-types";
 export type PaddleLocationDeckTypes = {
   season_start: string;
   season_end: string;
-  phone?: number;
+  phone: number;
   nodes: PaddleLocationTypes[];
 };

package/src/types/paddle-location-types.ts

@@ -22,10 +22,12 @@ export interface PaddleLocationTypes {
   postalCode?: string;
   commonName?: string;
 
-  season_start: string;
-  season_end: string;
-  phone: number;
+  showThePhone: boolean;
 
   offSeasonDetails?: string;
   weatherPermitting?: boolean;
+
+  phone: number;
+  season_start: string;
+  season_end: string;
 }

package/src/types/paddle-purchase-types.ts

@@ -1,6 +1,6 @@
 import type { PaddleGatsbyImageType } from "./paddle-gatsby-image-type";
 
-type BasePaddlePurchaseTypes = {
+export type PaddlePurchaseTypes = {
   id: React.Key;
   title: string;
   slug: string;
@@ -13,18 +13,17 @@ type BasePaddlePurchaseTypes = {
   discount?: number;
   cutout: PaddleGatsbyImageType;
 
+  sport: {
+    slug: string
+  };
+  brand: {
+    slug: string
+  };
+
   baseOne: { image: PaddleGatsbyImageType };
   baseTwo: { image: PaddleGatsbyImageType };
   baseThree: { image: PaddleGatsbyImageType };
   topOne: { image: PaddleGatsbyImageType };
   topTwo: { image: PaddleGatsbyImageType };
   topThree: { image: PaddleGatsbyImageType };
-};
-
-export type PaddlePurchaseTypes = BasePaddlePurchaseTypes & (
-  | { sport: { slug: string }; sportSlug?: string }
-  | { sportSlug: string; sport?: { slug: string } }
-) & (
-  | { brand: { slug: string }; brandSlug?: string }
-  | { brandSlug: string; brand?: { slug: string } }
-);
+};