@rileybathurst/paddle 1.8.0 → 1.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rileybathurst/paddle",
   "private": false,
-  "version": "1.8.0",
+  "version": "1.9.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/src/paddle-book-now.tsx

@@ -1,13 +1,13 @@
 import * as React from "react"
 import type { PaddleBookNowTypes } from "./types/paddle-book-now-types";
 
-export const PaddleBookNow = ({ peek_base, strapiLocaleName, specificName, specificLink }: PaddleBookNowTypes) => {
+export const PaddleBookNow = ({ peek_base, strapiBranchName, specificName, specificLink }: PaddleBookNowTypes) => {
   return (
     <a
       href={specificLink || peek_base}
       rel="noopener noreferrer"
       className="book-now"
-      title={`Book now ${specificLink && <> {specificLink} </>} with ${strapiLocaleName} kayak and paddleboard`}
+      title={`Book now ${specificLink && <> {specificLink} </>} with ${strapiBranchName} kayak and paddleboard`}
     >
       {specificName && (<>{specificName} <br /></>)}
       BOOK NOW

package/src/paddle-compare.tsx

@@ -124,7 +124,7 @@ const CompareDetails = ({ key, title, link, sport, duration, start, finish, fitn
 
       <PaddleBookNow
         peek_base={peeks1}
-        strapiLocaleName={strapiLocaleName}
+        strapiBranchName={strapiBranchName}
         specificLink={peeks1}
       />
     </section >
@@ -148,10 +148,10 @@ type PaddleCompareTypes = {
     price: number;
     peek?: string;
   }[];
-  strapiLocaleName: string;
+  strapiBranchName: string;
   peek_base: string;
 };
-export const PaddleCompare = ({ tours, strapiLocaleName, peek_base }: PaddleCompareTypes) => {
+export const PaddleCompare = ({ tours, strapiBranchName, peek_base }: PaddleCompareTypes) => {
 
   const [id1, setID1] = useState(tours[0].id);
   const [id2, setID2] = useState(tours[1].id);
@@ -233,13 +233,13 @@ export const PaddleCompare = ({ tours, strapiLocaleName, peek_base }: PaddleComp
           timeframe={timeframe1}
           start={start1}
           finish={finish1}
-          location={strapiLocaleName}
+          location={strapiBranchName}
           excerpt={excerpt1}
           minimum={minimum1}
           price={price1}
           peeks={peeks1}
           fitness={fitness1}
-          strapiLocaleName={strapiLocaleName}
+          strapiBranchName={strapiBranchName}
           peek_base={peek_base}
         />
         <CompareDetails
@@ -251,13 +251,13 @@ export const PaddleCompare = ({ tours, strapiLocaleName, peek_base }: PaddleComp
           timeframe={timeframe2}
           start={start2}
           finish={finish2}
-          location={strapiLocaleName}
+          location={strapiBranchName}
           excerpt={excerpt2}
           minimum={minimum2}
           price={price2}
           peeks={peeks2}
           fitness={fitness2}
-          strapiLocaleName={strapiLocaleName}
+          strapiBranchName={strapiBranchName}
           peek_base={peek_base}
         />
 

package/src/paddle-seo.tsx

@@ -50,7 +50,7 @@ type SEOtypes = {
   breadcrumbs?: BreadcrumbsTypes;
   // children: React.ReactNode;
 
-  strapiLocale: {
+  strapiBranch: {
     name: string;
     topbar: {
       data: {
@@ -103,21 +103,21 @@ export const PaddleSEO = ({
   ogImage,
   ogImageDescription,
   breadcrumbs,
-  strapiLocale,
+  strapiBranch,
   strapiLocation,
   allStrapiLocation,
   children,
 }: SEOtypes) => {
-  const businessName = `${strapiLocale.name} Kayak & Paddleboard rentals and tours`;
+  const businessName = `${strapiBranch.name} Kayak & Paddleboard rentals and tours`;
 
   const PaddleTitle = title
     ? `${title} | ${businessName}`
-    : `${businessName} | ${strapiLocale.topbar.data.topbar} `;
+    : `${businessName} | ${strapiBranch.topbar.data.topbar} `;
   // TODO: tagline would be a better fallback description
-  const PaddleDescription = description || strapiLocale.slogan;
-  // url: `${strapiLocale.url}${SE0.url}` || strapiLocale.url,
-  const PaddleImage = ogImage || strapiLocale.ogImage;
-  const PaddleImageAlt = ogImageDescription || strapiLocale.ogImageDescription;
+  const PaddleDescription = description || strapiBranch.slogan;
+  // url: `${strapiBranch.url}${SE0.url}` || strapiBranch.url,
+  const PaddleImage = ogImage || strapiBranch.ogImage;
+  const PaddleImageAlt = ogImageDescription || strapiBranch.ogImageDescription;
 
   // const query = '- cash\n - credit card';
   // const formatted = query.split('\n').map((item) => item.trim().replace('- ', '')).join(', ');
@@ -125,9 +125,9 @@ export const PaddleSEO = ({
 
   // TODO: this is now allStrapiLocation.nodes
   // TODO: I think this will be a keylocation piece
-  // console.log(strapiLocale.paymentAccepted);
-  const paymentAcceptedQuery = strapiLocale.paymentAccepted
-    ? strapiLocale.paymentAccepted
+  // console.log(strapiBranch.paymentAccepted);
+  const paymentAcceptedQuery = strapiBranch.paymentAccepted
+    ? strapiBranch.paymentAccepted
     : "";
   const paymentAcceptedFormatted = paymentAcceptedQuery
     .split("\n")
@@ -148,7 +148,7 @@ export const PaddleSEO = ({
       <meta property="og:description" content={PaddleDescription} />
       <meta property="og:image" content={PaddleImage} />
       <meta property="og:image:alt" content={PaddleImageAlt} />
-      <meta name="theme-color" content={strapiLocale.themeColor} />
+      <meta name="theme-color" content={strapiBranch.themeColor} />
 
       <Script type="application/ld+json">
         {`
@@ -156,8 +156,8 @@ export const PaddleSEO = ({
             "@context": "https://schema.org/",
             "@type": "LocalBusiness",
             "name": "${businessName}",
-            "url": "${strapiLocale.url}",
-            "description": "${strapiLocale.name}",
+            "url": "${strapiBranch.url}",
+            "description": "${strapiBranch.name}",
             "image": "${PaddleImage}",
             "address": {
               "@type": "PostalAddress",
@@ -192,22 +192,22 @@ export const PaddleSEO = ({
               "@type": "GeoCircle",
               "geoMidpoint": {
                 "@type": "GeoCoordinates",
-                "latitude": "${strapiLocale.latitude}",
-                "longitude": "${strapiLocale.longitude}"
+                "latitude": "${strapiBranch.latitude}",
+                "longitude": "${strapiBranch.longitude}"
               },
-              "geoRadius": "${strapiLocale.geoRadius}"
+              "geoRadius": "${strapiBranch.geoRadius}"
             },
-            "telephone": "${strapiLocale.phone}",
-            "email": "${strapiLocale.email}",
-            "numberOfEmployees" : "${strapiLocale.numberOfEmployees}",
-            "priceRange": "${strapiLocale.priceRange}",
-            "slogan": "${strapiLocale.slogan}",
+            "telephone": "${strapiBranch.phone}",
+            "email": "${strapiBranch.email}",
+            "numberOfEmployees" : "${strapiBranch.numberOfEmployees}",
+            "priceRange": "${strapiBranch.priceRange}",
+            "slogan": "${strapiBranch.slogan}",
             "paymentAccepted": "${paymentAcceptedFormatted}"
           }
         `}
       </Script>
 
-      <Breadcrumbs url={strapiLocale.url} {...breadcrumbs} />
+      <Breadcrumbs url={strapiBranch.url} {...breadcrumbs} />
       {children}
     </>
   );

package/src/paddle-ticket.tsx

@@ -20,7 +20,7 @@ export const PaddleTicket = ({
   peek_tours_fall_back,
   tour_page,
   allStrapiSunsetTourTime,
-  strapiLocaleName,
+  strapiBranchName,
 }: PaddleTicketTypes) => {
   const time = PaddleTime({
     start: start,
@@ -51,7 +51,7 @@ export const PaddleTicket = ({
           <h5>${price}</h5>
           <PaddleBookNow
             peek_base={peek || peek_tours_fall_back}
-            strapiLocaleName={strapiLocaleName}
+            strapiBranchName={strapiBranchName}
           />
         </div>
       </div>

package/src/paddle-top-bar.tsx

@@ -2,27 +2,26 @@ import * as React from "react";
 import Markdown from "react-markdown";
 
 // TODO this would be nice to be able to close but I dont have it right yet
-
+// ! needs ranaming now I've removed the ...data or if it cant write why
+// TODO: move this to be exported from paddle to each branch site
 type PaddleTopBarTypes = {
-  strapiLocale: {
+  strapiBranch: {
     topbar: {
       data: {
         topbar: string;
       }
     }
-    RainCheck: string;
-    RainCheckDate: Date;
-    RainCheckReason: string;
   };
 }
-export const PaddleTopBar = ({ strapiLocale }: PaddleTopBarTypes) => {
+export const PaddleTopBar = ({ strapiBranch }: PaddleTopBarTypes) => {
 
-  const RainCheckDate = new Date(strapiLocale.RainCheck);
-  const currently = new Date();
+  /* // TODO: move to weather day
+  const RainCheckDate = new Date(strapiBranch.RainCheck);
+  const currently = new Date(); */
 
   return (
     <div className='top-bar'>
-      {RainCheckDate > currently ? (
+      {/* {RainCheckDate > currently ? (
         <p className="rain-check">
           <span className="rain-check-date">
             {RainCheckDate.toLocaleDateString('en-US', {
@@ -38,7 +37,7 @@ export const PaddleTopBar = ({ strapiLocale }: PaddleTopBarTypes) => {
               minute: '2-digit',
               hour12: true,
             })} due to an incoming</span>
-          &nbsp;{strapiLocale.RainCheckReason}
+          &nbsp;{strapiBranch.RainCheckReason}
         </p>
       ) : RainCheckDate.toDateString() === currently.toDateString() ? (
         <p className="rain-check">
@@ -47,14 +46,14 @@ export const PaddleTopBar = ({ strapiLocale }: PaddleTopBarTypes) => {
             day: '2-digit',
             year: '2-digit',
           })}</span>&nbsp;
-          <span className="rain-check-reason">We're closed today due to {strapiLocale.RainCheckReason}</span>
+          <span className="rain-check-reason">We're closed today due to {strapiBranch.RainCheckReason}</span>
         </p>
-      ) : (
+      ) : ( */}
         <Markdown>
-          {strapiLocale.topbar.data.topbar}
+          {strapiBranch.topbar.data.topbar}
         </Markdown>
-      )
-      }
+      {/* )
+      } */}
     </div>
   )
 }

package/src/types/paddle-book-now-types.ts

@@ -1,6 +1,6 @@
 export type PaddleBookNowTypes = {
   peek_base: string;
-  strapiLocaleName: string;
+  strapiBranchName: string;
   specificName?: string;
   specificLink?: string;
 };

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

@@ -28,5 +28,5 @@ export type PaddleTicketTypes = {
     }[];
   };
 
-  strapiLocaleName: string;
+  strapiBranchName: string;
 };