@rileybathurst/paddle 1.9.10 → 1.9.12

package/package.json

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

package/src/index.tsx

@@ -38,6 +38,7 @@ export * from "./types/paddle-location-types";
 export * from "./types/paddle-location-deck-types";
 export * from "./types/paddle-gatsby-image-type";
 export * from "./types/paddle-purchase-types";
+export * from "./types/paddle-purchase-image-types";
 export * from "./types/paddle-brand-types";
 export * from "./types/paddle-book-now-types";
 export * from "./types/paddle-testimonial-types";

package/src/paddle-location-deck.tsx

@@ -16,7 +16,7 @@ export const PaddleLocationDeck = ({
           key={location.id}
           season_start={season_start}
           season_end={season_end}
-          phoneNumber={phone}
+          phone={phone}
           {...location}
         />
       ))}

package/src/paddle-purchase.tsx

@@ -5,6 +5,7 @@ import type { PaddleGatsbyImageType } from "./types/paddle-gatsby-image-type";
 import { PaddleInchesRemainder } from "./paddle-inches-remainder";
 import { PaddleTextureBackgrounds } from "./paddle-texture-backgrounds";
 import { PaddlePurchaseTypes } from "./types/paddle-purchase-types";
+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 {
@@ -46,16 +47,7 @@ const Badges = ({ inflatable, demo, discount }: BadgeTypes) => {
   return null;
 }
 
-interface PurchaseTypes extends PaddlePurchaseTypes {
-  sportSlug: string;
-  brandSlug: string;
-  baseOne: { image: PaddleGatsbyImageType };
-  baseTwo: { image: PaddleGatsbyImageType };
-  baseThree: { image: PaddleGatsbyImageType };
-  topOne: { image: PaddleGatsbyImageType };
-  topTwo: { image: PaddleGatsbyImageType };
-  topThree: { image: PaddleGatsbyImageType };
-};
+
 export const PaddlePurchase = ({
   id,
   title,
@@ -75,7 +67,7 @@ export const PaddlePurchase = ({
   baseThree,
   topOne,
   topTwo,
-  topThree }: PurchaseTypes) => {
+  topThree }: PaddlePurchaseAndImageTypes) => {
 
   return (
     <article key={id} className="purchase">

package/src/paddle-texture-backgrounds.tsx

@@ -3,12 +3,24 @@ import { GatsbyImage } from "gatsby-plugin-image";
 import type { PaddleGatsbyImageType } from "./types/paddle-gatsby-image-type";
 
 type textureTypes = {
-  baseOne: { image: PaddleGatsbyImageType };
-  baseTwo: { image: PaddleGatsbyImageType };
-  baseThree: { image: PaddleGatsbyImageType };
-  topOne: { image: PaddleGatsbyImageType };
-  topTwo: { image: PaddleGatsbyImageType };
-  topThree: { image: PaddleGatsbyImageType };
+  baseOne: {
+    image: PaddleGatsbyImageType;
+  };
+  baseTwo: {
+    image: PaddleGatsbyImageType;
+  };
+  baseThree: {
+    image: PaddleGatsbyImageType;
+  };
+  topOne: {
+    image: PaddleGatsbyImageType;
+  };
+  topTwo: {
+    image: PaddleGatsbyImageType;
+  };
+  topThree: {
+    image: PaddleGatsbyImageType;
+  };
 };
 export const PaddleTextureBackgrounds = ({ baseOne, baseTwo, baseThree, topOne, topTwo, topThree }: textureTypes) => {
   const baseTextures = [

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

@@ -25,9 +25,8 @@ export interface PaddleLocationTypes {
 
   season_start?: string;
   season_end?: string;
-  phoneNumber?: string;
+  phone?: string;
 
   offSeasonDetails?: string;
-  phone?: boolean;
   weatherPermitting?: boolean;
 }

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

@@ -0,0 +1,11 @@
+import type { PaddleGatsbyImageType } from "./paddle-gatsby-image-type";
+import type { PaddlePurchaseTypes } from "./paddle-purchase-types";
+
+export type PaddlePurchaseAndImageTypes = PaddlePurchaseTypes & {
+  baseOne: { image: PaddleGatsbyImageType };
+  baseTwo: { image: PaddleGatsbyImageType };
+  baseThree: { image: PaddleGatsbyImageType };
+  topOne: { image: PaddleGatsbyImageType };
+  topTwo: { image: PaddleGatsbyImageType };
+  topThree: { image: PaddleGatsbyImageType };
+};

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

@@ -1,6 +1,6 @@
 import type { PaddleGatsbyImageType } from "./paddle-gatsby-image-type";
 
-export type PaddlePurchaseTypes = {
+type BasePaddlePurchaseTypes = {
   id: React.Key;
   title: string;
   slug: string;
@@ -12,10 +12,19 @@ export type PaddlePurchaseTypes = {
   demo: boolean;
   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 } }
+);