@rileybathurst/paddle 1.9.17 → 1.9.19

package/package.json

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

package/src/paddle-location-deck.tsx

@@ -9,10 +9,6 @@ export const PaddleLocationDeck = ({
   season_end,
   phone
 }: PaddleLocationDeckTypes) => {
-  
-  // TODO: testing
-  console.log("PaddleLocationDeck phone", phone);
-  console.log(typeof phone);
 
   return (
     <section className="location-deck">

package/src/paddle-location.tsx

@@ -181,12 +181,7 @@ export const PaddleLocation = ({
   season_start,
   season_end
 }: PaddleLocationTypes) => {
-
-    
-  // TODO: testing
-  console.log("PaddleLocation phone", phone);
-  console.log(typeof phone);
-
+  
   const content = (
     <Content
       svg={svg}

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>
@@ -58,8 +54,8 @@ export const PaddlePurchase = ({
   demo,
   discount,
   cutout,
-  sportSlug,
-  brandSlug,
+  sport,
+  brand,
   baseOne,
   baseTwo,
   baseThree,
@@ -80,13 +76,13 @@ export const PaddlePurchase = ({
           topThree={topThree}
         />
         <Link
-          to={`/retail/${sportSlug}/${brandSlug}/${slug}`}
+          to={`/retail/${sport.slug}/${brand.slug}/${slug}`}
           className="image-link"
         >
           {cutout && (
             <GatsbyImage
               image={cutout.localFile?.childImageSharp?.gatsbyImageData}
-              alt={cutout.alternativeText || `${title} by ${brandSlug}`}
+              alt={cutout.alternativeText || `${title} by ${brand.name}`}
               className="cutout"
               objectFit="contain"
             />
@@ -99,7 +95,7 @@ export const PaddlePurchase = ({
         />
       </div>
       <h4 className="purchase__title">
-        <Link to={`/retail/${sportSlug}/${brandSlug}/${slug}`}>{title}</Link>
+        <Link to={`/retail/${sport.slug}/${brand.slug}/${slug}`}>{title}</Link>
       </h4>
       <hr />
       <p>{excerpt}</p>

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-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,21 @@ type BasePaddlePurchaseTypes = {
   discount?: number;
   cutout: PaddleGatsbyImageType;
 
+  sport: {
+    id: React.Key;
+    slug: string
+    title: string;
+  };
+  brand: {
+    id: React.Key;
+    slug: string
+    name: 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 } }
-);
+};