@rileybathurst/paddle 1.9.15 → 1.9.17

package/package.json

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

package/src/paddle-location-deck.tsx

@@ -12,16 +12,17 @@ export const PaddleLocationDeck = ({
   
   // TODO: testing
   console.log("PaddleLocationDeck phone", phone);
+  console.log(typeof 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,18 +174,18 @@ export const PaddleLocation = ({
   addressRegion,
   postalCode,
   commonName,
-  season_start,
-  season_end,
-  phone,
   offSeasonDetails,
-  weatherPermitting
+  weatherPermitting,
+  showThePhone,
+  phone,
+  season_start,
+  season_end
 }: PaddleLocationTypes) => {
 
-  const phoneDidgits = Number(phone);
-
     
   // TODO: testing
   console.log("PaddleLocation phone", phone);
+  console.log(typeof phone);
 
   const content = (
     <Content
@@ -210,7 +207,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"
@@ -220,17 +217,17 @@ export const PaddleLocation = ({
       >
         {content}
       </a>
-      {phone && (
-        <Phone phone={phoneDidgits} />
+      {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 && (
-        <Phone phone={phoneDidgits} />
+      {showThePhone && phone && (
+        <Phone phone={phone} />
       )}
     </div>
   );

package/src/phone.tsx

@@ -1,13 +1,19 @@
 import * as React from "react";
 
 interface FormatPhoneNumberTypes {
-  phoneNumberString: number;
+  phone: number;
 }
-const FormatPhoneNumber = ({ phoneNumberString }: FormatPhoneNumberTypes) => {
-  const phoneNumber = String(phoneNumberString);
+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;
@@ -19,7 +25,6 @@ type PhoneTypes = {
 
 const Phone = ({ phone }: PhoneTypes) => {
 
-    
   // TODO: testing
   console.log("phone", phone);
 
@@ -28,7 +33,7 @@ const Phone = ({ phone }: PhoneTypes) => {
     rel="noopener noreferrer"
     className="button location-phone"
     >
-      Phone: <FormatPhoneNumber phoneNumberString={phone} />
+      Phone: <FormatPhoneNumber phone={phone} />
     </a>
   );
 };

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

@@ -1,9 +1,8 @@
 import type { PaddleLocationTypes } from "./paddle-location-types";
 
 export type PaddleLocationDeckTypes = {
-  background?: string;
-  season_start?: string; // ? should this be optional? it created a problem with tours
-  season_end?: string;
-  phone?: string;
+  season_start: string;
+  season_end: string;
+  phone: number;
   nodes: PaddleLocationTypes[];
 };

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

@@ -15,7 +15,6 @@ export interface PaddleLocationTypes {
     season_start: string;
     season_end: string;
   };
-  background?: string;
 
   streetAddress?: string;
   addressLocality?: string;
@@ -23,10 +22,12 @@ export interface PaddleLocationTypes {
   postalCode?: string;
   commonName?: string;
 
-  season_start?: string;
-  season_end?: string;
-  phone?: string;
+  showThePhone: boolean;
 
   offSeasonDetails?: string;
   weatherPermitting?: boolean;
+
+  phone: number;
+  season_start: string;
+  season_end: string;
 }