Add expiry calendar for ROSC

docker-compose.yml

@@ -8,4 +8,4 @@ services:
     ports:
       - "3000:80"
     environment:
-      - codex_url=${codex_url:-http://kubernetes.docker.internal:30003}
+      - codex_url=${codex_url:-http://kubernetes.docker.internal:30001}

frontend/package.json

@@ -19,8 +19,10 @@
     "@types/react-dom": "^18.2.11",
     "axios": "^1.5.1",
     "form-data": "^4.0.0",
-    "react": "^18.2.0",
+    "moment": "^2.30.1",
-    "react-dom": "^18.2.0",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-datepicker": "^5.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
     "react-dropzone": "^14.2.3",
     "react-icons": "^4.11.0",
     "react-router-dom": "^6.16.0",
@@ -60,5 +62,8 @@
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
+  },
+  "devDependencies": {
+    "@types/react-datepicker": "^4.19.5"
   }
 }

frontend/src/pages/marketplace/tabs/Availability/OfferStorage.tsx

@@ -83,15 +83,13 @@ function OfferStorage() {
           onChange={(e) => setSize(e.target.value)}
         />
         <div id="divider"></div>
-        <div>
+        <input
-          <input
+          type="text"
-            type="text"
+          placeholder="Duration"
-            placeholder="Duration"
+          value={duration}
-            value={duration}
+          onClick={toggleBox}
-            onClick={toggleBox}
+        >
-            >
+        </input>
-          </input>
-        </div>
         <DurationInputWithFloatingBox isOpen={isBoxOpen} onClose={toggleBox} onDurationChange={handleDurationChange} />
         <div id="divider"></div>
         <input

frontend/src/pages/marketplace/tabs/Rosc/CreateTab.tsx

@@ -3,6 +3,10 @@ import constants from "../../../../util/Constants";
 import styled from "styled-components";
 import { useDexyStore } from "../../../../store";
 import DurationInputWithFloatingBox from "../../../../components/layout/durationInput/DurationInputWithFloatingBox"
+import DatePicker from 'react-datepicker';
+import 'react-datepicker/dist/react-datepicker.css';
+import moment from 'moment';
+import exp from "constants";
 
 function CreateTab() {
   const { ftdCid, setFtdCid, nodeInfo } = useDexyStore();
@@ -10,7 +14,9 @@ function CreateTab() {
   const [reward, setReward,] = useState("");
   const [duration, setDuration,] = useState("");
   const [proofProbability, setProofProbability,] = useState("");
-  const [manualProbability, setManualProbability] = useState("");
+  const [expiry, setExpiry] = useState("")
+  const [nodes, setNodes] = useState("")
+  const [tolerance, setTolerance] = useState("")
   const [collateral, setCollateral,] = useState("");
   const [error, setError] = useState("");
 
@@ -20,6 +26,12 @@ function CreateTab() {
     setBoxOpen(!isBoxOpen);
   };
 
+  const handleDateChange = (selectedDate: any) => {
+    const timestamp = moment(selectedDate).unix();
+    setExpiry(timestamp.toString()); // Format the date as needed
+    
+  };
+
   const handleDurationChange = (newDuration: { days: number; hours: number; minutes: number; seconds: number }) => {
     const { days, hours, minutes, seconds } = newDuration;
     const totalSeconds = days * 24 * 60 * 60 + hours * 60 * 60 + minutes * 60 + seconds;
@@ -38,9 +50,12 @@ function CreateTab() {
           }) ||
           {},
         body: JSON.stringify({
-          reward: reward,
           duration: duration,
           proofProbability: proofProbability,
+          reward: reward,
+          expiry: expiry,
+          nodes: nodes,
+          tolerance: tolerance,
           collateral: collateral
         })
       }
@@ -79,27 +94,71 @@ function CreateTab() {
         <div id="divider"></div>
         <input
           type="text"
-          placeholder="Reward"
+          placeholder="Duration"
-          onChange={(e) => setReward(e.target.value)}
+          value={duration}
+          onClick={toggleBox}
+        >
+        </input>
+        <DurationInputWithFloatingBox isOpen={isBoxOpen} onClose={toggleBox} onDurationChange={handleDurationChange} />
+        <div id="divider"></div>
+        <input
+          type="text"
+          placeholder="Proof Probability"
+          onChange={(e) => {
+            setProofProbability(e.target.value);
+          }}
+          value={proofProbability}
         />
         <div id="divider"></div>
-        <div>
+        <input
-          <input
+          type="text"
-            type="text"
+          placeholder="Reward"
-            placeholder="Duration"
+          onChange={(e) => setReward(e.target.value)}
-            value={duration}
+          value={reward}
-            onClick={toggleBox}
+        />
-            >
+        <div id="divider"></div>
-          </input>
+        {/* <input
-        </div>
+          type="text"
-        <DurationInputWithFloatingBox isOpen={isBoxOpen} onClose={toggleBox} onDurationChange={handleDurationChange} />
+          placeholder="Expiry"
+          onClick={toggleCalendar}
+          value={expiry}
+        /> */}
+        <DatePicker
+          selected={expiry ? moment.unix(parseInt(expiry)).toDate() : null}
+          onChange={handleDateChange}
+          minDate={new Date()} // Allow only future dates
+          showTimeSelect
+          timeFormat="HH:mm"
+          timeIntervals={15}
+          timeCaption="Time"
+          dateFormat="MMMM Do YYYY, h:mm:ss a"
+          placeholderText="Select Expiry Date"
+        />
+        <div id="divider"></div>
+        <input
+          type="text"
+          placeholder="Nodes"
+          onChange={(e) => {
+            setNodes(e.target.value);
+          }}
+          value={nodes}
+        />
+        <div id="divider"></div>
+        <input
+          type="text"
+          placeholder="Tolerance"
+          onChange={(e) => {
+            setTolerance(e.target.value);
+          }}
+          value={tolerance}
+        />
         <div id="divider"></div>
         <input
           type="text"
           placeholder="collateral"
           onChange={(e) => setCollateral(e.target.value)}
         />
-        <button onClick={() => upload(ftdCid)}>Download</button>
+        <button onClick={() => upload(ftdCid)}>Create</button>
       </CreateTabWrapper>
       {error && (
         <p style={{ color: "red", marginTop: "10px", textAlign: "center" }}>