@rileybathurst/paddle 1.9.33 → 1.9.35

package/package.json

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

package/src/App.tsx

@@ -105,7 +105,7 @@ function App() {
             name: "Tour 1",
             slug: "tour-1",
             sport: "Paddleboarding",
-            duration: "2 hours",
+            duration: 120,
             timeframe: "Morning",
             start: "9:00 AM",
             finish: "11:00 AM",
@@ -121,7 +121,7 @@ function App() {
             name: "Tour 2",
             slug: "tour-2",
             sport: "Paddleboarding",
-            duration: "3 hours",
+            duration: 180,
             timeframe: "Afternoon",
             start: "1:00 PM",
             finish: "4:00 PM",
@@ -137,7 +137,7 @@ function App() {
             name: "Tour 3",
             slug: "tour-3",
             sport: "Paddleboarding",
-            duration: "4 hours",
+            duration: 240,
             timeframe: "Evening",
             start: "5:00 PM",
             finish: "9:00 PM",

package/src/paddle-compare.tsx

@@ -1,56 +1,41 @@
-// ! this is the next fix
-
 import React, { useState } from "react";
 
-// import { PaddleTime } from './paddle-time';
+import { PaddleTime } from './paddle-time';
 import { PaddleBookNow } from './paddle-book-now';
 import type { PaddleCompareTypes } from './types/paddle-compare-types';
 
-type CompareDetailsTypes = {
-  title: string;
-  onTourChange: (value: string) => void;
-  link: string;
-  sport: string;
-  duration?: string;
-  timeframe?: string;
-  start?: string;
-  finish?: string;
-  fitness?: string;
-  location: string;
-  excerpt: string;
-  minimum: number;
-  price: number;
-  peeks?: string;
-  peek_base: string;
-  strapiBranchName: string;
+type TourType = PaddleCompareTypes["tours"][number];
 
-  // ? this can maybe loop from itself?
-  tours: {
-    id: React.Key;
-    name: string;
-    slug: string;
-    sport: string;
-    duration?: string;
-    timeframe?: string;
-    start?: string;
-    finish?: string;
-    excerpt?: string;
-    minimum?: number;
-    price?: number;
-    peek?: string;
-    fitness?: string;
-  }[];
+type CompareDetailsTypes = {
+  id: React.Key;
+  name: TourType["name"];
+  onTourChange: (value: TourType["name"]) => void;
+  link: TourType["slug"];
+  sport: TourType["sport"];
+  duration?: TourType["duration"];
+  timeframe?: TourType["timeframe"];
+  start?: TourType["start"];
+  finish?: TourType["finish"];
+  fitness?: TourType["fitness"];
+  location: TourType["location"];
+  excerpt: TourType["excerpt"];
+  minimum: TourType["minimum"];
+  price: TourType["price"];
+  peeks?: TourType["peek"];
+  peek_base: PaddleCompareTypes["peek_base"];
+  strapiBranchName: PaddleCompareTypes["strapiBranchName"];
+  tours: PaddleCompareTypes["tours"];
 };
 
 const CompareDetails = ({
-  title,
+  name,
   onTourChange,
   link,
   sport,
-  // duration,
-  // timeframe,
-  // start,
-  // finish,
+  duration,
+  timeframe,
+  start,
+  finish,
   fitness,
   location,
   excerpt,
@@ -61,14 +46,33 @@ const CompareDetails = ({
   strapiBranchName,
   tours
 }: CompareDetailsTypes) => {
+
+  // TODO: testing
+  console.log(start);
+  console.log(finish);
+  console.log(duration);
+  console.log(timeframe);
+
+  const time = PaddleTime({
+    start: start,
+    finish: finish,
+    duration: duration,
+    timeframe: timeframe,
+  });
+
+  // TODO: testing
+  console.log("time", time);
+  console.log(time.entry);
+  console.log(time.value);
+
   return (
     <section>
       <select
         name="tour1"
-        id={title}
+        id={name}
         className="comparesheet_select"
         aria-label="Select first tour or lesson"
-        value={title}
+        value={name}
         onChange={(e) => onTourChange(e.target.value)}
       >
         {tours.map((tour) => (
@@ -80,22 +84,16 @@ const CompareDetails = ({
           </option>
         ))}
       </select>
-      
+
       <h2 className="kilimanjaro">
-        <a href={link}>{title}</a>
+        <a href={link}>{name}</a>
       </h2>
 
       <h4 className="capitalize">{sport}</h4>
 
-      {/* // TODO: time is more complex so just get it running first */}
-      {/* <p>
-        <PaddleTime
-          start={start}
-          finish={finish}
-          duration={duration}
-          timeframe={timeframe}
-        />
-      </p> */}
+      <p>
+        {time.value}
+      </p>
 
       <p className="capitalize">
         {fitness} <span className="show-below__vulture">&nbsp;fitness</span>
@@ -125,11 +123,6 @@ const CompareDetails = ({
 
 export const PaddleCompare = ({ tours, strapiBranchName, peek_base }: PaddleCompareTypes) => {
 
-  // TODO: testing
-  console.log(tours);
-  console.log(strapiBranchName);
-  console.log(peek_base);
-
   let id1 = tours[0].id;
   let id2 = tours[1].id;
 
@@ -139,8 +132,8 @@ export const PaddleCompare = ({ tours, strapiBranchName, peek_base }: PaddleComp
   let [link2, setLink2] = useState(tours[1].slug || "not set");
   let [sport1, setSport1] = useState(tours[0].sport || "not set");
   let [sport2, setSport2] = useState(tours[1].sport || "not set");
-  let [duration1, setDuration1] = useState(tours[0].duration || "not set");
-  let [duration2, setDuration2] = useState(tours[1].duration || "not set");
+  let [duration1, setDuration1] = useState(tours[0].duration || 0);
+  let [duration2, setDuration2] = useState(tours[1].duration || 0);
   let [timeframe1, setTimeframe1] = useState(tours[0].timeframe || "not set");
   let [timeframe2, setTimeframe2] = useState(tours[1].timeframe || "not set");
   let [start1, setStart1] = useState(tours[0].start || "not set");
@@ -167,7 +160,7 @@ export const PaddleCompare = ({ tours, strapiBranchName, peek_base }: PaddleComp
     setTour1(selectedTour.name);
     setLink1(selectedTour.slug || "not set");
     setSport1(selectedTour.sport || "not set");
-    setDuration1(selectedTour.duration || "not set");
+    setDuration1(selectedTour.duration || 0);
     setTimeframe1(selectedTour.timeframe || "not set");
     setStart1(selectedTour.start || "not set");
     setFinish1(selectedTour.finish || "not set");
@@ -186,7 +179,7 @@ export const PaddleCompare = ({ tours, strapiBranchName, peek_base }: PaddleComp
     setTour2(selectedTour.name);
     setLink2(selectedTour.slug || "not set");
     setSport2(selectedTour.sport || "not set");
-    setDuration2(selectedTour.duration || "not set");
+    setDuration2(selectedTour.duration || 0);
     setTimeframe2(selectedTour.timeframe || "not set");
     setStart2(selectedTour.start || "not set");
     setFinish2(selectedTour.finish || "not set");
@@ -201,7 +194,7 @@ export const PaddleCompare = ({ tours, strapiBranchName, peek_base }: PaddleComp
   return (
     <>
       <div className='comparesheet'>
-        <div className='comparesheet_titles'>
+        <div className='comparesheet_names'>
           <div className="comparesheet__transparent">Compare</div>
           <h3 className='kilimanjaro comparesheet_freeze'>
             Tour or<br />
@@ -218,8 +211,8 @@ export const PaddleCompare = ({ tours, strapiBranchName, peek_base }: PaddleComp
         </div>
 
         <CompareDetails
-          key={id1}
-          title={tour1}
+          id={id1}
+          name={tour1}
           onTourChange={updateTour1}
           link={link1}
           sport={sport1}
@@ -240,8 +233,8 @@ export const PaddleCompare = ({ tours, strapiBranchName, peek_base }: PaddleComp
           tours={tours}
         />
         <CompareDetails
-          key={id2}
-          title={tour2}
+          id={id2}
+          name={tour2}
           onTourChange={updateTour2}
           link={link2}
           sport={sport2}

package/src/paddle-ticket.tsx

@@ -22,6 +22,7 @@ export const PaddleTicket = ({
   allStrapiSunsetTourTime,
   strapiBranchName,
 }: PaddleTicketTypes) => {
+  
   const time = PaddleTime({
     start: start,
     finish: finish,

package/src/types/paddle-compare-types.tsx

@@ -1,10 +1,12 @@
+import React from "react";
+
 export type PaddleCompareTypes = {
   tours: {
-    id: number;
+    id: React.Key;
     name: string;
     slug: string;
     sport: string;
-    duration?: string;
+    duration?: number;
     timeframe?: string;
     start?: string;
     finish?: string;