From 2b5c66fbdf254a607cf557ff6ead9a0fa62b15ae Mon Sep 17 00:00:00 2001
From: swsrkty <swsrkty@gmail.com>
Date: Tue, 19 Sep 2023 20:07:33 +0530
Subject: [PATCH 1/6] feat: Limit participation in a poll

---
 pages/index.tsx                           | 18 +++++++-
 pages/poll/[id]/[secret].tsx              |  1 +
 src/components/copyText/CopyTextMain.tsx  |  3 +-
 src/components/copyText/index.tsx         |  4 +-
 src/components/poll/AdminPollInfo.tsx     |  9 ++++
 src/components/poll/MarkTimes.tsx         |  5 +-
 src/components/poll/MarkTimesOneOnOne.tsx | 56 +++++++++++++++++++++++
 src/components/poll/PollTableAdmin.tsx    |  2 +-
 src/components/poll/PollTableVoter.tsx    | 34 ++++++++++++--
 src/components/poll/SubmitFinalTime.tsx   | 14 ++++--
 src/models/poll.ts                        |  4 ++
 src/styles/poll.scss                      | 52 +++++++++++++++------
 12 files changed, 174 insertions(+), 28 deletions(-)
 create mode 100644 src/components/poll/MarkTimesOneOnOne.tsx

diff --git a/pages/index.tsx b/pages/index.tsx
index 0cc809b..1750ec7 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -24,13 +24,15 @@ const Home = (): JSX.Element => {
     pollTitle: string;
     pollLocation: string;
     pollDescription: string;
+    pollType: string;
   }>({
     pollTitle: "",
     pollLocation: "",
     pollDescription: "",
+    pollType: "Group-poll",
   });
 
-  const { pollTitle, pollLocation, pollDescription } = pollDetails;
+  const { pollTitle, pollLocation, pollDescription, pollType } = pollDetails;
 
   const [pollTimes, setTimes] = useState<Time[]>([]);
   const [disabled, setDisabled] = useState<boolean>(false);
@@ -63,6 +65,7 @@ const Home = (): JSX.Element => {
       title: pollTitle,
       description: pollDescription,
       location: pollLocation,
+      type: pollType,
       secret: encryptedSecret,
       times: pollTimes,
     };
@@ -194,6 +197,19 @@ const Home = (): JSX.Element => {
                     onChange={handlePollDetailsChange}
                   />
                 </Col>
+                <Col sm>
+                <Form.Group>
+                <Form.Control as="select"
+                className="form-text"
+                name="pollType"
+                defaultValue="Group-poll"
+                onChange={handlePollDetailsChange}
+                >
+                  <option value="Group-poll" selected>Group-poll</option>
+                  <option>One-on-one</option>
+                  </Form.Control>
+                </Form.Group>
+                </Col>
                 <Col sm="auto">
                   <Button
                     className="global-primary-button"
diff --git a/pages/poll/[id]/[secret].tsx b/pages/poll/[id]/[secret].tsx
index 0b87000..ec75fa1 100644
--- a/pages/poll/[id]/[secret].tsx
+++ b/pages/poll/[id]/[secret].tsx
@@ -54,6 +54,7 @@ const Poll = (props: {
                     finalTime={finalTime}
                     pollID={pollID}
                     secret={secret}
+                    poll={pollFromDB}
                   />
                 )}
               </>
diff --git a/src/components/copyText/CopyTextMain.tsx b/src/components/copyText/CopyTextMain.tsx
index 5e4a2be..647c0a7 100644
--- a/src/components/copyText/CopyTextMain.tsx
+++ b/src/components/copyText/CopyTextMain.tsx
@@ -18,9 +18,10 @@ const CopyTextMain = (props: {
   pollURL: string;
   pollTitle: string;
   pollLocation: string;
+  pollType: string;
   finalTime: Time | undefined;
 }): JSX.Element => {
-  const { pollURL, pollTitle, pollLocation, finalTime } = props;
+  const { pollURL, pollTitle, pollLocation, pollType, finalTime } = props;
 
   const finalPollTitle = pollTitle || "Untitled";
   const finalPollLocation = pollLocation ? `at ${pollLocation}` : "";
diff --git a/src/components/copyText/index.tsx b/src/components/copyText/index.tsx
index fb18e58..ce5f6c7 100644
--- a/src/components/copyText/index.tsx
+++ b/src/components/copyText/index.tsx
@@ -9,9 +9,10 @@ const CopyText = (props: {
   pollID: string;
   pollTitle: string;
   pollLocation: string;
+  pollType: string;
   finalTime: Time | undefined;
 }): JSX.Element => {
-  const { pollID, pollTitle, pollLocation, finalTime } = props;
+  const { pollID, pollTitle, pollLocation, pollType, finalTime } = props;
   const pollURL = `${NEXT_PUBLIC_BASE_URL}/poll/${pollID}`;
 
   return (
@@ -25,6 +26,7 @@ const CopyText = (props: {
           pollURL={pollURL}
           pollTitle={pollTitle}
           pollLocation={pollLocation}
+          pollType={pollType}
           finalTime={finalTime}
         />
       </Form>
diff --git a/src/components/poll/AdminPollInfo.tsx b/src/components/poll/AdminPollInfo.tsx
index 51179b3..a1956cf 100644
--- a/src/components/poll/AdminPollInfo.tsx
+++ b/src/components/poll/AdminPollInfo.tsx
@@ -22,6 +22,13 @@ const AdminPollInfo = (props: {
   const { poll, showFinalTime, showCopyBox } = props;
   return (
     <div>
+      <Badge
+        pill
+        variant="secondary"
+        className="poll-badge-polltype"
+      >
+        {poll.type ==="Group-poll" ? "Group-poll" : "One-on-one"}
+      </Badge>
       <Badge
         pill
         variant={poll.open ? "success" : "secondary"}
@@ -78,6 +85,7 @@ const AdminPollInfo = (props: {
               pollTitle={poll.title}
               pollID={poll._id}
               pollLocation={poll.location}
+              pollType={poll.type}
               finalTime={poll.finalTime}
             />
           </span>
@@ -92,6 +100,7 @@ const AdminPollInfo = (props: {
               pollTitle={poll.title}
               pollID={poll._id}
               pollLocation={poll.location}
+              pollType={poll.type}
               finalTime={poll.finalTime}
             />{" "}
             with the participants
diff --git a/src/components/poll/MarkTimes.tsx b/src/components/poll/MarkTimes.tsx
index 1eb16e7..35f3af1 100644
--- a/src/components/poll/MarkTimes.tsx
+++ b/src/components/poll/MarkTimes.tsx
@@ -1,13 +1,14 @@
 import { Dispatch, useState } from "react";
 import { CheckCircleFill, CircleFill } from "react-bootstrap-icons";
-import { Time, Vote } from "../../models/poll";
+import { Time, Vote, PollFromDB } from "../../models/poll";
 
 const MarkTimes = (props: {
   times: Time[];
   newVote: Vote;
+  poll: PollFromDB;
   setNewVote: Dispatch<Vote>;
 }): JSX.Element => {
-  const { times, newVote, setNewVote } = props;
+  const { times, newVote, poll, setNewVote } = props;
 
   const [timeBoxStatus, setTimeBoxStatus] = useState<Record<number, number>>(
     times.reduce((obj, cur) => ({ ...obj, [cur.start]: 0 }), {})
diff --git a/src/components/poll/MarkTimesOneOnOne.tsx b/src/components/poll/MarkTimesOneOnOne.tsx
new file mode 100644
index 0000000..8e5c3d6
--- /dev/null
+++ b/src/components/poll/MarkTimesOneOnOne.tsx
@@ -0,0 +1,56 @@
+import { Form } from "react-bootstrap";
+import { Dispatch, useState } from "react";
+import { Time, Vote, PollFromDB } from "../../models/poll";
+import { isTimePresentInPollTimes } from "../../helpers";
+
+const MarkTimesOneOnOne = (props: {
+  times: Time[];
+  newVote: Vote;
+  poll: PollFromDB;
+  setNewVote: Dispatch<Vote>;
+}): JSX.Element => {
+  const { times, newVote, poll, setNewVote } = props;
+  
+  let availableTimes = [];
+  let VotedTimes = poll.votes.map((vote)=> vote.times[0]);
+
+  poll.times.map((time) => {
+    if (!isTimePresentInPollTimes(time, VotedTimes)) {
+        availableTimes.push(time)
+    }
+  }
+  );
+
+  const handleMarkTimeRadioButton= (e: React.ChangeEvent<HTMLInputElement>): void => {
+    if (e.target !== e.currentTarget) return;
+    const { dataset, checked } = e.target;
+    const time: Time = dataset.value ? JSON.parse(dataset.value) : {};
+    let newTimes = newVote.times;
+
+    // const time: Time = dataset.value ? JSON.parse(dataset.value) : {};
+    if (checked) {
+      newTimes = newTimes.filter((item) => item.start !== time.start);
+      newTimes.push(time);
+      setNewVote({ name: newVote.name, times: newTimes });
+    }
+  };
+
+  return (
+    <tr>
+      {availableTimes.map((time) => (
+        <td key={time.start} className="poll-slot-checkbox-final-cell">
+          <Form.Check
+            data-value={JSON.stringify(time)}
+            type="radio"
+            className="poll-slot-checkbox"
+            name="oneononevote"
+            onChange={handleMarkTimeRadioButton}
+          />
+        </td>
+      ))}
+    </tr>
+  );
+};
+
+
+export default MarkTimesOneOnOne;
diff --git a/src/components/poll/PollTableAdmin.tsx b/src/components/poll/PollTableAdmin.tsx
index eaf3391..be6cb1e 100644
--- a/src/components/poll/PollTableAdmin.tsx
+++ b/src/components/poll/PollTableAdmin.tsx
@@ -43,7 +43,7 @@ const PollTableAdmin = (props: {
           </tr>
         </thead>
         <tbody>
-          {pollFromDB.open && (
+          {pollFromDB.open && pollFromDB.type === "Group-poll" && (
             <MarkFinalTime times={sortedTimes} setFinalTime={setFinalTime} />
           )}
           <tr>
diff --git a/src/components/poll/PollTableVoter.tsx b/src/components/poll/PollTableVoter.tsx
index d3aa43e..2d41c3f 100644
--- a/src/components/poll/PollTableVoter.tsx
+++ b/src/components/poll/PollTableVoter.tsx
@@ -3,8 +3,10 @@ import { Table } from "react-bootstrap";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import MarkTimes from "./MarkTimes";
+import MarkTimesOneOnOne from "./MarkTimesOneOnOne";
 import PollDateTime from "./PollDateTime";
 import { Time, PollFromDB, Vote } from "../../models/poll";
+import { isTimePresentInPollTimes } from "../../helpers";
 
 dayjs.extend(localizedFormat);
 
@@ -12,27 +14,51 @@ const PollTableVoter = (props: {
   pollFromDB: PollFromDB;
   sortedTimes: Time[];
   newVote: Vote;
-  setNewVote: Dispatch<Vote>;
+  setNewVote: Dispatch<Vote>;yy
 }): JSX.Element => {
   const { pollFromDB, sortedTimes, newVote, setNewVote } = props;
 
+  let availableTimes = [];
+  let VotedTimes = pollFromDB.votes.map((vote)=> vote.times[0]);
+
+  pollFromDB.times.map((time) => {
+    if (!isTimePresentInPollTimes(time, VotedTimes)) {
+        availableTimes.push(time)
+    }
+  }
+  );
+
   return (
     <div>
       <Table responsive>
         <thead>
           <tr>
-            {sortedTimes.map((time) => (
+            {pollFromDB.type === "Group-poll" && (sortedTimes.map((time) => (
               <th key={time.start} className="poll-slot-time">
                 <PollDateTime time={time} type="voter" />
               </th>
-            ))}
+            )))}
+            {pollFromDB.type === "One-on-one" && (availableTimes.map((time) => (
+              <th key={time.start} className="poll-slot-time">
+                <PollDateTime time={time} />
+              </th>
+            )))}
           </tr>
         </thead>
         <tbody>
-          {pollFromDB.open && (
+          {pollFromDB.open && pollFromDB.type === "Group-poll" && (
             <MarkTimes
               times={sortedTimes}
               newVote={newVote}
+              poll={pollFromDB}
+              setNewVote={setNewVote}
+            />
+          )}
+          {pollFromDB.open && pollFromDB.type === "One-on-one" && (
+            <MarkTimesOneOnOne
+              times={sortedTimes}
+              newVote={newVote}
+              poll={pollFromDB}
               setNewVote={setNewVote}
             />
           )}
diff --git a/src/components/poll/SubmitFinalTime.tsx b/src/components/poll/SubmitFinalTime.tsx
index e382a0f..3df0cf4 100644
--- a/src/components/poll/SubmitFinalTime.tsx
+++ b/src/components/poll/SubmitFinalTime.tsx
@@ -4,15 +4,16 @@ import Router from "next/router";
 import { ToastContainer, toast } from "react-toastify";
 import toastOptions from "../../helpers/toastOptions";
 import { markFinalTime } from "../../utils/api/server";
-import { Time } from "../../models/poll";
+import { Time, PollFromDB } from "../../models/poll";
 import { encrypt } from "../../helpers";
 
 const SubmitFinalTime = (props: {
   finalTime: Time | undefined;
   pollID: string;
   secret: string;
+  poll: PollFromDB;
 }): JSX.Element => {
-  const { finalTime, pollID, secret } = props;
+  const { finalTime, pollID, secret, poll} = props;
 
   const [disabled, setDisabled] = useState<boolean>(false);
 
@@ -20,7 +21,7 @@ const SubmitFinalTime = (props: {
     e: React.MouseEvent<HTMLInputElement>
   ): Promise<void> => {
     e.preventDefault();
-    if (finalTime) {
+    if (finalTime && poll.type === "Group-poll") {
       setDisabled(true);
       try {
         const voterArgs = {
@@ -44,9 +45,14 @@ const SubmitFinalTime = (props: {
         toast.info("Please try again later", toastOptions);
         Router.reload();
       }
-    } else {
+    }else if (poll.type === "Group-poll") {
       toast.error("Please choose the final time", toastOptions);
     }
+    else{
+      setDisabled(true);
+      
+
+    }
   };
 
   return (
diff --git a/src/models/poll.ts b/src/models/poll.ts
index 2ef710b..f15ab67 100644
--- a/src/models/poll.ts
+++ b/src/models/poll.ts
@@ -30,6 +30,7 @@ export interface Poll {
   open?: boolean;
   secret: string;
   location?: string;
+  type? : string;
   times: Time[];
   finalTime?: Time;
   votes?: Vote[];
@@ -42,6 +43,7 @@ export interface PollFromDB {
   open?: boolean;
   secret: string;
   location?: string;
+  type?: string;
   times: TimeFromDB[];
   finalTime?: TimeFromDB;
   votes?: VoteFromDB[];
@@ -56,6 +58,7 @@ export interface PollDoc extends Document {
   open?: boolean;
   secret: string;
   location?: string;
+  type?: string;
   times: Time[];
   finalTime?: Time;
   votes?: Vote[];
@@ -68,6 +71,7 @@ const PollSchema: Schema = new Schema(
     open: { type: Boolean, default: true },
     secret: { type: String, required: true },
     location: { type: String },
+    type: {type: String, default: "Group-poll"},
     times: {
       type: [{ start: Number, end: Number }],
       required: true,
diff --git a/src/styles/poll.scss b/src/styles/poll.scss
index 0f17511..53c0551 100644
--- a/src/styles/poll.scss
+++ b/src/styles/poll.scss
@@ -56,36 +56,60 @@
 }
 
 .poll-badge-open {
-  font-size: 0.6rem;
-  padding-top: 0.6em;
-  padding-left: 0.6em;
-  padding-right: 0.6em;
-  padding-bottom: 0.6em;
+  display: inline;
+  font-size: 0.8rem;
+  padding-top: 0.2em;
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+  padding-bottom: 0.2em;
   background-color: #f0fdf4;
   color: #49de80;
   transition: none;
-  font-size: 0.5rem;
   letter-spacing: 0.02rem;
 
   @include media-breakpoint-up(sm) {
-    font-size: 0.6rem;
+    font-size: 0.8rem;
+    padding: 0.5rem;
   }
 }
 
 .poll-badge-closed {
-  font-size: 0.6rem;
-  padding-top: 0.6em;
-  padding-left: 0.6em;
-  padding-right: 0.6em;
-  padding-bottom: 0.6em;
+  display: inline;
+  font-size: 0.8rem;
+  padding-top: 0.2em;
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+  padding-bottom: 0.2em;
   background-color: #1018272e;
   color: #101827;
   transition: none;
-  font-size: 0.5rem;
   letter-spacing: 0.02rem;
 
   @include media-breakpoint-up(sm) {
-    font-size: 0.6rem;
+    font-size: 0.8rem;
+    padding: 0.5rem;  
+  }
+}
+
+.poll-badge-polltype {
+  display: inline;
+  font-size: 0.8rem;
+  padding-top: 0.6em;
+  padding-right: 0.6em;
+  padding-bottom: 0.6em;
+  transition: none;
+  letter-spacing: 0.06rem;
+
+  background-color: #fefffe;
+  color: #565656;;
+  margin-top: 1rem;
+  margin-right: 1rem;
+  margin-bottom: 1rem;
+  border-radius: 0.9rem;
+  border: 0.09rem solid #e5e7eb;
+
+  @include media-breakpoint-up(sm) {
+    width: 12%;
   }
 }
 

From 575e18563bd0d665d776722e084a075f16c13361 Mon Sep 17 00:00:00 2001
From: swsrkty <swsrkty@gmail.com>
Date: Wed, 18 Oct 2023 12:14:58 +0530
Subject: [PATCH 2/6] chore: show time after voting

---
 pages/poll/[id].tsx                     | 18 +++++--
 src/components/poll/PollTableVoter.tsx  |  2 +-
 src/components/poll/SubmitFinalTime.tsx | 65 ++++++++++++-------------
 src/components/poll/SubmitTimes.tsx     | 47 ++++++++++++++----
 src/components/poll/VoterPollInfo.tsx   | 28 +++++++++--
 5 files changed, 109 insertions(+), 51 deletions(-)

diff --git a/pages/poll/[id].tsx b/pages/poll/[id].tsx
index 8890b1f..ad12151 100644
--- a/pages/poll/[id].tsx
+++ b/pages/poll/[id].tsx
@@ -32,7 +32,9 @@ const Poll = (props: {
     times: [],
   });
 
-  let showVoteRecorded = false;
+  let showVoteRecordedGroup = false;
+  let showVoteRecordedOneOnOne = false;
+  let votedTimeOneOnOne = null;
 
   const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
     const { value } = e.target;
@@ -70,7 +72,15 @@ const Poll = (props: {
 
         if (Object.keys(poll)[0] === pollID && pollFromDB.open) {
           pageSection = <></>;
-          showVoteRecorded = true;
+
+          if (poll.type === "group") {
+            showVoteRecordedGroup = true;
+          } else {
+            votedTimeOneOnOne = JSON.parse(
+              Object.values(votedPollsFromLS.polls[i])[0].split("#")[1]
+            );
+            showVoteRecordedOneOnOne = true;
+          }
           break;
         } else if (pollFromDB.open) {
           pageSection = (
@@ -148,7 +158,9 @@ const Poll = (props: {
               <VoterPollInfo
                 poll={pollFromDB}
                 showFinalTime={!pollFromDB.open}
-                showVoteRecorded={showVoteRecorded}
+                showVoteRecordedGroup={showVoteRecordedGroup}
+                showVoteRecordedOneOnOne={showVoteRecordedOneOnOne}
+                votedTimeOneOnOne={votedTimeOneOnOne}
               />
             </Jumbotron>
             {pageSection}
diff --git a/src/components/poll/PollTableVoter.tsx b/src/components/poll/PollTableVoter.tsx
index 2d41c3f..743d715 100644
--- a/src/components/poll/PollTableVoter.tsx
+++ b/src/components/poll/PollTableVoter.tsx
@@ -14,7 +14,7 @@ const PollTableVoter = (props: {
   pollFromDB: PollFromDB;
   sortedTimes: Time[];
   newVote: Vote;
-  setNewVote: Dispatch<Vote>;yy
+  setNewVote: Dispatch<Vote>;
 }): JSX.Element => {
   const { pollFromDB, sortedTimes, newVote, setNewVote } = props;
 
diff --git a/src/components/poll/SubmitFinalTime.tsx b/src/components/poll/SubmitFinalTime.tsx
index 3df0cf4..3511c5b 100644
--- a/src/components/poll/SubmitFinalTime.tsx
+++ b/src/components/poll/SubmitFinalTime.tsx
@@ -13,7 +13,7 @@ const SubmitFinalTime = (props: {
   secret: string;
   poll: PollFromDB;
 }): JSX.Element => {
-  const { finalTime, pollID, secret, poll} = props;
+  const { finalTime, pollID, secret, poll } = props;
 
   const [disabled, setDisabled] = useState<boolean>(false);
 
@@ -45,42 +45,41 @@ const SubmitFinalTime = (props: {
         toast.info("Please try again later", toastOptions);
         Router.reload();
       }
-    }else if (poll.type === "Group-poll") {
+    } else if (poll.type === "Group-poll") {
       toast.error("Please choose the final time", toastOptions);
-    }
-    else{
+    } else {
       setDisabled(true);
-      
-
     }
   };
-
-  return (
-    <>
-      <Button
-        className="global-primary-button submit-final-time-button"
-        type="submit"
-        disabled={disabled}
-        onClick={handleSubmit}
-      >
-        {!disabled ? (
-          `Finalise time`
-        ) : (
-          <>
-            <Spinner
-              as="span"
-              animation="border"
-              size="sm"
-              role="status"
-              aria-hidden="true"
-              className="samay-button-spinner"
-            />
-          </>
-        )}
-      </Button>
-      <ToastContainer />
-    </>
-  );
+  if (poll.type === "Group-poll") {
+    return (
+      <>
+        <Button
+          className="global-primary-button submit-final-time-button"
+          type="submit"
+          disabled={disabled}
+          onClick={handleSubmit}
+        >
+          {!disabled ? (
+            `Finalise time`
+          ) : (
+            <>
+              <Spinner
+                as="span"
+                animation="border"
+                size="sm"
+                role="status"
+                aria-hidden="true"
+                className="samay-button-spinner"
+              />
+            </>
+          )}
+        </Button>
+        <ToastContainer />
+      </>
+    );
+  }
+  return <ToastContainer />;
 };
 
 export default SubmitFinalTime;
diff --git a/src/components/poll/SubmitTimes.tsx b/src/components/poll/SubmitTimes.tsx
index f10d15c..572a444 100644
--- a/src/components/poll/SubmitTimes.tsx
+++ b/src/components/poll/SubmitTimes.tsx
@@ -52,22 +52,49 @@ const SubmitTimes = (props: {
         pollID,
       };
       submitTimeResponse = await markTimes(voterArgs);
+      let time = JSON.stringify(newVote.times[0]);
+
       if (submitTimeResponse && submitTimeResponse.statusCode === 201) {
         if (typeof window !== "undefined") {
           const votedPolls = localStorage.getItem("samayVotedPolls");
 
           if (!votedPolls) {
-            const initSamayPolls = {
-              polls: [
-                {
-                  [`${pollID}`]: `${pollFromDB.title}`,
-                },
-              ],
-            };
+            if (pollFromDB.type === "One-on-one") {
+              const initKukkeePolls = {
+                polls: [
+                  {
+                    [`${pollID}`]: `${pollFromDB.title}#${time}`,
+                  },
+                ],
+              };
+
+              localStorage.setItem(
+                "kukkeeVotedPolls",
+                JSON.stringify(initKukkeePolls)
+              );
+            } else {
+              const initKukkeePolls = {
+                polls: [
+                  {
+                    [`${pollID}`]: `${pollFromDB.title}`,
+                  },
+                ],
+              };
+              localStorage.setItem(
+                "kukkeeVotedPolls",
+                JSON.stringify(initKukkeePolls)
+              );
+            }
+          } else if (pollFromDB.type === "One-on-one") {
+            const votedPollsJSON = JSON.parse(votedPolls);
+
+            votedPollsJSON.polls.push({
+              [`${pollID}`]: `${pollFromDB.title}#${time}`,
+            });
 
             localStorage.setItem(
-              "samayVotedPolls",
-              JSON.stringify(initSamayPolls)
+              "kukkeeVotedPolls",
+              JSON.stringify(votedPollsJSON)
             );
           } else {
             const votedPollsJSON = JSON.parse(votedPolls);
@@ -77,7 +104,7 @@ const SubmitTimes = (props: {
             });
 
             localStorage.setItem(
-              "samayVotedPolls",
+              "kukkeeVotedPolls",
               JSON.stringify(votedPollsJSON)
             );
           }
diff --git a/src/components/poll/VoterPollInfo.tsx b/src/components/poll/VoterPollInfo.tsx
index c58892e..72b99f1 100644
--- a/src/components/poll/VoterPollInfo.tsx
+++ b/src/components/poll/VoterPollInfo.tsx
@@ -8,7 +8,7 @@ import {
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import timezone from "dayjs/plugin/timezone";
-import { PollFromDB } from "../../models/poll";
+import { PollFromDB, Time } from "../../models/poll";
 
 dayjs.extend(localizedFormat);
 dayjs.extend(timezone);
@@ -16,9 +16,17 @@ dayjs.extend(timezone);
 const PollInfo = (props: {
   poll: PollFromDB;
   showFinalTime: boolean;
-  showVoteRecorded: boolean;
+  showVoteRecordedGroup: boolean;
+  showVoteRecordedOneOnOne: boolean;
+  votedTimeOneOnOne: Time;
 }): JSX.Element => {
-  const { poll, showFinalTime, showVoteRecorded } = props;
+  const {
+    poll,
+    showFinalTime,
+    showVoteRecordedGroup,
+    showVoteRecordedOneOnOne,
+    votedTimeOneOnOne,
+  } = props;
 
   return (
     <div>
@@ -70,12 +78,24 @@ const PollInfo = (props: {
           {dayjs(poll.finalTime?.end).format("LT")}
         </span>
       )}
-      {showVoteRecorded && !showFinalTime && (
+      {showVoteRecordedGroup && !showFinalTime && (
         <span className="voter-page-vote-recorded">
           <CheckCircleFill className="poll-vote-recorded-icon" />
           Your vote has been successfully recorded.
         </span>
       )}
+      {showVoteRecordedOneOnOne && votedTimeOneOnOne && !showFinalTime && (
+        <span className="voter-page-vote-recorded">
+          <CheckCircleFill className="poll-vote-recorded-icon" />
+          Your vote for the time [{dayjs(votedTimeOneOnOne.start).format(
+            "LT"
+          )}{" "}
+          - {dayjs(votedTimeOneOnOne.end).format("LT")}] on{" "}
+          {dayjs(votedTimeOneOnOne.start).format("DD")}{" "}
+          {dayjs(votedTimeOneOnOne.start).format("MMM")} has been successfully
+          recorded.
+        </span>
+      )}
     </div>
   );
 };

From 84e2efd12631283e536e790f734dabaaba3912e5 Mon Sep 17 00:00:00 2001
From: swsrkty <swsrkty@gmail.com>
Date: Tue, 23 Jan 2024 15:55:41 +0530
Subject: [PATCH 3/6] Changing color of radio buttons for one-on-one polls

---
 src/components/poll/MarkTimesOneOnOne.tsx |  2 +-
 src/styles/poll.scss                      | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/components/poll/MarkTimesOneOnOne.tsx b/src/components/poll/MarkTimesOneOnOne.tsx
index 8e5c3d6..8ad4c43 100644
--- a/src/components/poll/MarkTimesOneOnOne.tsx
+++ b/src/components/poll/MarkTimesOneOnOne.tsx
@@ -42,7 +42,7 @@ const MarkTimesOneOnOne = (props: {
           <Form.Check
             data-value={JSON.stringify(time)}
             type="radio"
-            className="poll-slot-checkbox"
+            className="poll-slot-checkbox-one-on-one"
             name="oneononevote"
             onChange={handleMarkTimeRadioButton}
           />
diff --git a/src/styles/poll.scss b/src/styles/poll.scss
index 53c0551..3905c16 100644
--- a/src/styles/poll.scss
+++ b/src/styles/poll.scss
@@ -367,6 +367,27 @@
   accent-color: #101827;
 }
 
+.poll-slot-checkbox-one-on-one {
+  width: 1.5rem;
+  margin: 0 auto;
+}
+
+.poll-slot-checkbox-one-on-one input[type="radio"] {
+  width: 1.5rem;
+  height: 1.5rem;
+  appearance: none;
+  border-radius: 50%;
+  background-clip: content-box;
+  border: 0.15rem solid #b6b6b6;
+  background-color: white;
+}
+
+.poll-slot-checkbox-one-on-one input[type="radio"]:checked {
+  background-color:#49de80;
+  padding: 4px;
+  border: 0.15rem solid #49de80;
+}
+
 .copy-text-desktop {
   display: none;
 

From 8725ebd0643d2458010e506963ebcec366229048 Mon Sep 17 00:00:00 2001
From: anandbaburajan <anandbaburajan@gmail.com>
Date: Tue, 2 Apr 2024 11:07:44 +0530
Subject: [PATCH 4/6] chore: UI improvements on create poll page and wording
 changes

---
 pages/index.tsx                           | 33 ++++++++--------
 src/components/poll/AdminPollInfo.tsx     |  8 +---
 src/components/poll/MarkTimesOneOnOne.tsx | 14 +++----
 src/components/poll/PollTableAdmin.tsx    |  2 +-
 src/components/poll/PollTableVoter.tsx    | 33 ++++++++--------
 src/components/poll/SubmitFinalTime.tsx   |  6 +--
 src/components/poll/SubmitTimes.tsx       |  4 +-
 src/models/poll.ts                        |  4 +-
 src/styles/form.scss                      | 47 +++++++++++++++++++----
 src/styles/new-poll.scss                  | 10 ++---
 src/styles/poll.scss                      |  6 +--
 11 files changed, 97 insertions(+), 70 deletions(-)

diff --git a/pages/index.tsx b/pages/index.tsx
index 1750ec7..89829ed 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -29,7 +29,7 @@ const Home = (): JSX.Element => {
     pollTitle: "",
     pollLocation: "",
     pollDescription: "",
-    pollType: "Group-poll",
+    pollType: "group",
   });
 
   const { pollTitle, pollLocation, pollDescription, pollType } = pollDetails;
@@ -167,7 +167,7 @@ const Home = (): JSX.Element => {
             </Jumbotron>
             <Jumbotron className="new-poll-jumbo">
               <Row>
-                <Col sm>
+                <Col sm className="samay-form-col">
                   <Form.Control
                     className="form-text"
                     type="text"
@@ -177,7 +177,7 @@ const Home = (): JSX.Element => {
                     onChange={handlePollDetailsChange}
                   />
                 </Col>
-                <Col sm>
+                <Col sm className="samay-form-col">
                   <Form.Control
                     className="form-text"
                     type="text"
@@ -187,7 +187,7 @@ const Home = (): JSX.Element => {
                     onChange={handlePollDetailsChange}
                   />
                 </Col>
-                <Col sm>
+                <Col sm className="samay-form-col">
                   <Form.Control
                     className="form-text"
                     type="text"
@@ -197,18 +197,19 @@ const Home = (): JSX.Element => {
                     onChange={handlePollDetailsChange}
                   />
                 </Col>
-                <Col sm>
-                <Form.Group>
-                <Form.Control as="select"
-                className="form-text"
-                name="pollType"
-                defaultValue="Group-poll"
-                onChange={handlePollDetailsChange}
-                >
-                  <option value="Group-poll" selected>Group-poll</option>
-                  <option>One-on-one</option>
-                  </Form.Control>
-                </Form.Group>
+                <Col sm className="samay-form-col">
+                  <Form.Group className="form-group">
+                    <Form.Control
+                      as="select"
+                      className="form-select"
+                      name="pollType"
+                      defaultValue="group"
+                      onChange={handlePollDetailsChange}
+                    >
+                      <option value="group">Group poll</option>
+                      <option value="oneonone">One-on-one poll</option>
+                    </Form.Control>
+                  </Form.Group>
                 </Col>
                 <Col sm="auto">
                   <Button
diff --git a/src/components/poll/AdminPollInfo.tsx b/src/components/poll/AdminPollInfo.tsx
index a1956cf..7bcceff 100644
--- a/src/components/poll/AdminPollInfo.tsx
+++ b/src/components/poll/AdminPollInfo.tsx
@@ -22,12 +22,8 @@ const AdminPollInfo = (props: {
   const { poll, showFinalTime, showCopyBox } = props;
   return (
     <div>
-      <Badge
-        pill
-        variant="secondary"
-        className="poll-badge-polltype"
-      >
-        {poll.type ==="Group-poll" ? "Group-poll" : "One-on-one"}
+      <Badge pill variant="secondary" className="poll-badge-polltype">
+        {poll.type === "group" ? "group" : "oneonone"}
       </Badge>
       <Badge
         pill
diff --git a/src/components/poll/MarkTimesOneOnOne.tsx b/src/components/poll/MarkTimesOneOnOne.tsx
index 8ad4c43..bfdb01e 100644
--- a/src/components/poll/MarkTimesOneOnOne.tsx
+++ b/src/components/poll/MarkTimesOneOnOne.tsx
@@ -10,18 +10,19 @@ const MarkTimesOneOnOne = (props: {
   setNewVote: Dispatch<Vote>;
 }): JSX.Element => {
   const { times, newVote, poll, setNewVote } = props;
-  
+
   let availableTimes = [];
-  let VotedTimes = poll.votes.map((vote)=> vote.times[0]);
+  let VotedTimes = poll.votes.map((vote) => vote.times[0]);
 
   poll.times.map((time) => {
     if (!isTimePresentInPollTimes(time, VotedTimes)) {
-        availableTimes.push(time)
+      availableTimes.push(time);
     }
-  }
-  );
+  });
 
-  const handleMarkTimeRadioButton= (e: React.ChangeEvent<HTMLInputElement>): void => {
+  const handleMarkTimeRadioButton = (
+    e: React.ChangeEvent<HTMLInputElement>
+  ): void => {
     if (e.target !== e.currentTarget) return;
     const { dataset, checked } = e.target;
     const time: Time = dataset.value ? JSON.parse(dataset.value) : {};
@@ -52,5 +53,4 @@ const MarkTimesOneOnOne = (props: {
   );
 };
 
-
 export default MarkTimesOneOnOne;
diff --git a/src/components/poll/PollTableAdmin.tsx b/src/components/poll/PollTableAdmin.tsx
index be6cb1e..8b35bed 100644
--- a/src/components/poll/PollTableAdmin.tsx
+++ b/src/components/poll/PollTableAdmin.tsx
@@ -43,7 +43,7 @@ const PollTableAdmin = (props: {
           </tr>
         </thead>
         <tbody>
-          {pollFromDB.open && pollFromDB.type === "Group-poll" && (
+          {pollFromDB.open && pollFromDB.type === "group" && (
             <MarkFinalTime times={sortedTimes} setFinalTime={setFinalTime} />
           )}
           <tr>
diff --git a/src/components/poll/PollTableVoter.tsx b/src/components/poll/PollTableVoter.tsx
index 743d715..ffa2672 100644
--- a/src/components/poll/PollTableVoter.tsx
+++ b/src/components/poll/PollTableVoter.tsx
@@ -19,34 +19,35 @@ const PollTableVoter = (props: {
   const { pollFromDB, sortedTimes, newVote, setNewVote } = props;
 
   let availableTimes = [];
-  let VotedTimes = pollFromDB.votes.map((vote)=> vote.times[0]);
+  let VotedTimes = pollFromDB.votes.map((vote) => vote.times[0]);
 
   pollFromDB.times.map((time) => {
     if (!isTimePresentInPollTimes(time, VotedTimes)) {
-        availableTimes.push(time)
+      availableTimes.push(time);
     }
-  }
-  );
+  });
 
   return (
     <div>
       <Table responsive>
         <thead>
           <tr>
-            {pollFromDB.type === "Group-poll" && (sortedTimes.map((time) => (
-              <th key={time.start} className="poll-slot-time">
-                <PollDateTime time={time} type="voter" />
-              </th>
-            )))}
-            {pollFromDB.type === "One-on-one" && (availableTimes.map((time) => (
-              <th key={time.start} className="poll-slot-time">
-                <PollDateTime time={time} />
-              </th>
-            )))}
+            {pollFromDB.type === "group" &&
+              sortedTimes.map((time) => (
+                <th key={time.start} className="poll-slot-time">
+                  <PollDateTime time={time} type="voter" />
+                </th>
+              ))}
+            {pollFromDB.type === "oneonone" &&
+              availableTimes.map((time) => (
+                <th key={time.start} className="poll-slot-time">
+                  <PollDateTime time={time} />
+                </th>
+              ))}
           </tr>
         </thead>
         <tbody>
-          {pollFromDB.open && pollFromDB.type === "Group-poll" && (
+          {pollFromDB.open && pollFromDB.type === "group" && (
             <MarkTimes
               times={sortedTimes}
               newVote={newVote}
@@ -54,7 +55,7 @@ const PollTableVoter = (props: {
               setNewVote={setNewVote}
             />
           )}
-          {pollFromDB.open && pollFromDB.type === "One-on-one" && (
+          {pollFromDB.open && pollFromDB.type === "oneonone" && (
             <MarkTimesOneOnOne
               times={sortedTimes}
               newVote={newVote}
diff --git a/src/components/poll/SubmitFinalTime.tsx b/src/components/poll/SubmitFinalTime.tsx
index 3511c5b..bd81b4f 100644
--- a/src/components/poll/SubmitFinalTime.tsx
+++ b/src/components/poll/SubmitFinalTime.tsx
@@ -21,7 +21,7 @@ const SubmitFinalTime = (props: {
     e: React.MouseEvent<HTMLInputElement>
   ): Promise<void> => {
     e.preventDefault();
-    if (finalTime && poll.type === "Group-poll") {
+    if (finalTime && poll.type === "group") {
       setDisabled(true);
       try {
         const voterArgs = {
@@ -45,13 +45,13 @@ const SubmitFinalTime = (props: {
         toast.info("Please try again later", toastOptions);
         Router.reload();
       }
-    } else if (poll.type === "Group-poll") {
+    } else if (poll.type === "group") {
       toast.error("Please choose the final time", toastOptions);
     } else {
       setDisabled(true);
     }
   };
-  if (poll.type === "Group-poll") {
+  if (poll.type === "group") {
     return (
       <>
         <Button
diff --git a/src/components/poll/SubmitTimes.tsx b/src/components/poll/SubmitTimes.tsx
index 572a444..3f70aa3 100644
--- a/src/components/poll/SubmitTimes.tsx
+++ b/src/components/poll/SubmitTimes.tsx
@@ -59,7 +59,7 @@ const SubmitTimes = (props: {
           const votedPolls = localStorage.getItem("samayVotedPolls");
 
           if (!votedPolls) {
-            if (pollFromDB.type === "One-on-one") {
+            if (pollFromDB.type === "oneonone") {
               const initKukkeePolls = {
                 polls: [
                   {
@@ -85,7 +85,7 @@ const SubmitTimes = (props: {
                 JSON.stringify(initKukkeePolls)
               );
             }
-          } else if (pollFromDB.type === "One-on-one") {
+          } else if (pollFromDB.type === "oneonone") {
             const votedPollsJSON = JSON.parse(votedPolls);
 
             votedPollsJSON.polls.push({
diff --git a/src/models/poll.ts b/src/models/poll.ts
index f15ab67..d858c8b 100644
--- a/src/models/poll.ts
+++ b/src/models/poll.ts
@@ -30,7 +30,7 @@ export interface Poll {
   open?: boolean;
   secret: string;
   location?: string;
-  type? : string;
+  type?: string;
   times: Time[];
   finalTime?: Time;
   votes?: Vote[];
@@ -71,7 +71,7 @@ const PollSchema: Schema = new Schema(
     open: { type: Boolean, default: true },
     secret: { type: String, required: true },
     location: { type: String },
-    type: {type: String, default: "Group-poll"},
+    type: { type: String },
     times: {
       type: [{ start: Number, end: Number }],
       required: true,
diff --git a/src/styles/form.scss b/src/styles/form.scss
index 9eb5378..7db9ea2 100644
--- a/src/styles/form.scss
+++ b/src/styles/form.scss
@@ -51,17 +51,48 @@
 }
 
 .form-select {
-  background-color: #101827;
+  background-color: #ffffff;
   color: #101827;
-  border: none;
-  outline: 0.05rem solid #e0e1e0;
-  border-radius: 0.3rem;
+  border: 0.09rem solid #e5e7eb;
+  border-radius: 0.5rem;
   font-family: "Inter";
   font-size: 0.9rem;
-  width: 8rem;
+  font-weight: 400;
+  margin-bottom: 1rem;
+  margin-top: 0;
+  transition: 0.2s;
+  padding-left: 0.5rem !important;
 
-  &:focus {
-    outline: 0.14rem solid #101827;
-    background-color: #101827;
+  @include media-breakpoint-up(sm) {
+    margin-bottom: 0;
+    margin-top: 0;
+  }
+}
+
+.form-select:hover {
+  color: #101827;
+  background-color: #ffffff;
+  border: 0.09rem solid #b7b9bd;
+}
+
+.form-select:focus {
+  color: #101827;
+  background-color: #ffffff;
+  border: 0.1rem solid #101827;
+}
+
+.form-group {
+  margin-bottom: 0 !important;
+}
+
+.samay-form-col {
+  padding-right: 1rem;
+  padding-left: 1rem;
+
+  @include media-breakpoint-up(sm) {
+    padding-right: 0rem;
+    &.first-of-type {
+      padding-left: 2rem;
+    }
   }
 }
diff --git a/src/styles/new-poll.scss b/src/styles/new-poll.scss
index 2f119d5..5a70df4 100644
--- a/src/styles/new-poll.scss
+++ b/src/styles/new-poll.scss
@@ -1,16 +1,14 @@
 .new-poll-jumbo {
   background-color: #fefffe;
   color: #ffffff;
-  padding-top: 1.5rem;
-  padding-left: 1.5rem;
-  padding-right: 1.5rem;
-  padding-bottom: 1.5rem;
+  padding: 1rem;
   margin-bottom: 5rem;
   border-radius: 0.5rem;
   border: 0.09rem solid #e5e7eb;
+
   @include media-breakpoint-up(lg) {
     margin-bottom: 2rem;
-}
+  }
 }
 
 .new-poll-timeslot-jumbo {
@@ -26,4 +24,4 @@
   margin-bottom: 1.7rem;
   border: 0.09rem solid #e5e7eb;
   height: 37rem;
-}
\ No newline at end of file
+}
diff --git a/src/styles/poll.scss b/src/styles/poll.scss
index 3905c16..87daa3c 100644
--- a/src/styles/poll.scss
+++ b/src/styles/poll.scss
@@ -87,7 +87,7 @@
 
   @include media-breakpoint-up(sm) {
     font-size: 0.8rem;
-    padding: 0.5rem;  
+    padding: 0.5rem;
   }
 }
 
@@ -101,7 +101,7 @@
   letter-spacing: 0.06rem;
 
   background-color: #fefffe;
-  color: #565656;;
+  color: #565656;
   margin-top: 1rem;
   margin-right: 1rem;
   margin-bottom: 1rem;
@@ -383,7 +383,7 @@
 }
 
 .poll-slot-checkbox-one-on-one input[type="radio"]:checked {
-  background-color:#49de80;
+  background-color: #49de80;
   padding: 4px;
   border: 0.15rem solid #49de80;
 }

From b5df4ef04f76b30194f8ac994b72c67465c1a71e Mon Sep 17 00:00:00 2001
From: anandbaburajan <anandbaburajan@gmail.com>
Date: Tue, 2 Apr 2024 12:40:20 +0530
Subject: [PATCH 5/6] fix: minor things in one-on-one

---
 pages/index.tsx                           | 14 ++++--
 pages/poll/[id].tsx                       |  7 ++-
 pages/poll/[id]/[secret].tsx              |  3 +-
 pages/recent-polls.tsx                    |  7 ++-
 src/components/poll/AdminPollInfo.tsx     | 18 ++++----
 src/components/poll/MarkTimesOneOnOne.tsx |  6 +--
 src/components/poll/PollTableAdmin.tsx    |  7 +--
 src/components/poll/PollTableVoter.tsx    | 25 ++++++-----
 src/components/poll/SubmitFinalTime.tsx   |  7 +--
 src/components/poll/SubmitTimes.tsx       | 16 +++----
 src/components/poll/VoterPollInfo.tsx     | 17 ++++---
 src/styles/navbar.scss                    |  6 +--
 src/styles/poll.scss                      | 54 +++++++++++------------
 13 files changed, 100 insertions(+), 87 deletions(-)

diff --git a/pages/index.tsx b/pages/index.tsx
index 89829ed..5c7b3a0 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -24,15 +24,15 @@ const Home = (): JSX.Element => {
     pollTitle: string;
     pollLocation: string;
     pollDescription: string;
-    pollType: string;
   }>({
     pollTitle: "",
     pollLocation: "",
     pollDescription: "",
-    pollType: "group",
   });
 
-  const { pollTitle, pollLocation, pollDescription, pollType } = pollDetails;
+  const [pollType, setPollType] = useState("group");
+
+  const { pollTitle, pollLocation, pollDescription } = pollDetails;
 
   const [pollTimes, setTimes] = useState<Time[]>([]);
   const [disabled, setDisabled] = useState<boolean>(false);
@@ -48,6 +48,12 @@ const Home = (): JSX.Element => {
     });
   };
 
+  const handlePollTypeChange = (
+    e: React.ChangeEvent<HTMLSelectElement>
+  ): void => {
+    setPollType(e.target.value);
+  };
+
   const handleSubmit = async (
     e: React.MouseEvent<HTMLInputElement>
   ): Promise<void> => {
@@ -204,7 +210,7 @@ const Home = (): JSX.Element => {
                       className="form-select"
                       name="pollType"
                       defaultValue="group"
-                      onChange={handlePollDetailsChange}
+                      onChange={handlePollTypeChange}
                     >
                       <option value="group">Group poll</option>
                       <option value="oneonone">One-on-one poll</option>
diff --git a/pages/poll/[id].tsx b/pages/poll/[id].tsx
index ad12151..39d130d 100644
--- a/pages/poll/[id].tsx
+++ b/pages/poll/[id].tsx
@@ -72,12 +72,11 @@ const Poll = (props: {
 
         if (Object.keys(poll)[0] === pollID && pollFromDB.open) {
           pageSection = <></>;
-
-          if (poll.type === "group") {
+          if (!pollFromDB.type || pollFromDB.type === "group") {
             showVoteRecordedGroup = true;
           } else {
             votedTimeOneOnOne = JSON.parse(
-              Object.values(votedPollsFromLS.polls[i])[0].split("#")[1]
+              Object.values(poll)[0].split("#")[1]
             );
             showVoteRecordedOneOnOne = true;
           }
@@ -146,7 +145,7 @@ const Poll = (props: {
   return (
     <>
       <Head>
-        <title>Samay — Mark your availability</title>
+        <title>Samay — mark your availability</title>
         <link rel="shortcut icon" href="/favicon.svg" />
         <meta charSet="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
diff --git a/pages/poll/[id]/[secret].tsx b/pages/poll/[id]/[secret].tsx
index ec75fa1..f5fe9e4 100644
--- a/pages/poll/[id]/[secret].tsx
+++ b/pages/poll/[id]/[secret].tsx
@@ -9,7 +9,6 @@ import Layout from "../../../src/components/Layout";
 import AdminPollInfo from "../../../src/components/poll/AdminPollInfo";
 import PollTableAdmin from "../../../src/components/poll/PollTableAdmin";
 import SubmitFinalTime from "../../../src/components/poll/SubmitFinalTime";
-import DeletePoll from "../../../src/components/poll/DeletePoll";
 import { Time, TimeFromDB, PollFromDB } from "../../../src/models/poll";
 import { decrypt } from "../../../src/helpers";
 
@@ -29,7 +28,7 @@ const Poll = (props: {
   return (
     <>
       <Head>
-        <title>Samay — Finalise time</title>
+        <title>Samay — finalise time</title>
         <link rel="shortcut icon" href="/favicon.svg" />
         <meta charSet="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
diff --git a/pages/recent-polls.tsx b/pages/recent-polls.tsx
index b2a8be7..be06c18 100644
--- a/pages/recent-polls.tsx
+++ b/pages/recent-polls.tsx
@@ -1,6 +1,6 @@
 import { Card, Container, Button } from "react-bootstrap";
 import Modal from "react-bootstrap/Modal";
-import { Grid, BoxArrowUpRight, Trash } from "react-bootstrap-icons";
+import { Grid, Trash } from "react-bootstrap-icons";
 import Router from "next/router";
 import { useState } from "react";
 import Head from "next/head";
@@ -145,7 +145,10 @@ const RecentPolls = (): JSX.Element => {
                   <Card className="your-polls-poll-card">
                     <Card.Body>
                       <Card.Title>
-                        {Object.values(poll)[0] || "Untitled"}
+                        {Object.values(poll)[0].includes("#{") &&
+                          (Object.values(poll)[0].split("#{")[0] || "Untitled")}
+                        {!Object.values(poll)[0].includes("#{") &&
+                          (Object.values(poll)[0] || "Untitled")}
                         <div className="card-options">
                           <Button
                             className="trash-button"
diff --git a/src/components/poll/AdminPollInfo.tsx b/src/components/poll/AdminPollInfo.tsx
index 7bcceff..4036d3d 100644
--- a/src/components/poll/AdminPollInfo.tsx
+++ b/src/components/poll/AdminPollInfo.tsx
@@ -22,15 +22,17 @@ const AdminPollInfo = (props: {
   const { poll, showFinalTime, showCopyBox } = props;
   return (
     <div>
+      {(!poll.type || poll.type === "group") && (
+        <Badge
+          pill
+          variant={poll.open ? "success" : "secondary"}
+          className={poll.open ? "poll-badge-open" : "poll-badge-closed"}
+        >
+          {poll.open ? "Open" : "Closed"}
+        </Badge>
+      )}
       <Badge pill variant="secondary" className="poll-badge-polltype">
-        {poll.type === "group" ? "group" : "oneonone"}
-      </Badge>
-      <Badge
-        pill
-        variant={poll.open ? "success" : "secondary"}
-        className={poll.open ? "poll-badge-open" : "poll-badge-closed"}
-      >
-        {poll.open ? "Open" : "Closed"}
+        {!poll.type || poll.type === "group" ? "Group" : "One-on-one"}
       </Badge>
       {poll.title && (
         <span
diff --git a/src/components/poll/MarkTimesOneOnOne.tsx b/src/components/poll/MarkTimesOneOnOne.tsx
index bfdb01e..8643146f 100644
--- a/src/components/poll/MarkTimesOneOnOne.tsx
+++ b/src/components/poll/MarkTimesOneOnOne.tsx
@@ -1,5 +1,5 @@
 import { Form } from "react-bootstrap";
-import { Dispatch, useState } from "react";
+import { Dispatch } from "react";
 import { Time, Vote, PollFromDB } from "../../models/poll";
 import { isTimePresentInPollTimes } from "../../helpers";
 
@@ -26,11 +26,9 @@ const MarkTimesOneOnOne = (props: {
     if (e.target !== e.currentTarget) return;
     const { dataset, checked } = e.target;
     const time: Time = dataset.value ? JSON.parse(dataset.value) : {};
-    let newTimes = newVote.times;
+    let newTimes = [];
 
-    // const time: Time = dataset.value ? JSON.parse(dataset.value) : {};
     if (checked) {
-      newTimes = newTimes.filter((item) => item.start !== time.start);
       newTimes.push(time);
       setNewVote({ name: newVote.name, times: newTimes });
     }
diff --git a/src/components/poll/PollTableAdmin.tsx b/src/components/poll/PollTableAdmin.tsx
index 8b35bed..171a4f2 100644
--- a/src/components/poll/PollTableAdmin.tsx
+++ b/src/components/poll/PollTableAdmin.tsx
@@ -43,9 +43,10 @@ const PollTableAdmin = (props: {
           </tr>
         </thead>
         <tbody>
-          {pollFromDB.open && pollFromDB.type === "group" && (
-            <MarkFinalTime times={sortedTimes} setFinalTime={setFinalTime} />
-          )}
+          {pollFromDB.open &&
+            (!pollFromDB.type || pollFromDB.type === "group") && (
+              <MarkFinalTime times={sortedTimes} setFinalTime={setFinalTime} />
+            )}
           <tr>
             <td className="poll-table-total-participants">
               {pollFromDB.votes?.length}
diff --git a/src/components/poll/PollTableVoter.tsx b/src/components/poll/PollTableVoter.tsx
index ffa2672..1bd0f7e 100644
--- a/src/components/poll/PollTableVoter.tsx
+++ b/src/components/poll/PollTableVoter.tsx
@@ -19,10 +19,10 @@ const PollTableVoter = (props: {
   const { pollFromDB, sortedTimes, newVote, setNewVote } = props;
 
   let availableTimes = [];
-  let VotedTimes = pollFromDB.votes.map((vote) => vote.times[0]);
+  let votedTimes = pollFromDB.votes.map((vote) => vote.times[0]);
 
   pollFromDB.times.map((time) => {
-    if (!isTimePresentInPollTimes(time, VotedTimes)) {
+    if (!isTimePresentInPollTimes(time, votedTimes)) {
       availableTimes.push(time);
     }
   });
@@ -32,7 +32,7 @@ const PollTableVoter = (props: {
       <Table responsive>
         <thead>
           <tr>
-            {pollFromDB.type === "group" &&
+            {(!pollFromDB.type || pollFromDB.type === "group") &&
               sortedTimes.map((time) => (
                 <th key={time.start} className="poll-slot-time">
                   <PollDateTime time={time} type="voter" />
@@ -41,20 +41,21 @@ const PollTableVoter = (props: {
             {pollFromDB.type === "oneonone" &&
               availableTimes.map((time) => (
                 <th key={time.start} className="poll-slot-time">
-                  <PollDateTime time={time} />
+                  <PollDateTime time={time} type="voter" />
                 </th>
               ))}
           </tr>
         </thead>
         <tbody>
-          {pollFromDB.open && pollFromDB.type === "group" && (
-            <MarkTimes
-              times={sortedTimes}
-              newVote={newVote}
-              poll={pollFromDB}
-              setNewVote={setNewVote}
-            />
-          )}
+          {pollFromDB.open &&
+            (!pollFromDB.type || pollFromDB.type === "group") && (
+              <MarkTimes
+                times={sortedTimes}
+                newVote={newVote}
+                poll={pollFromDB}
+                setNewVote={setNewVote}
+              />
+            )}
           {pollFromDB.open && pollFromDB.type === "oneonone" && (
             <MarkTimesOneOnOne
               times={sortedTimes}
diff --git a/src/components/poll/SubmitFinalTime.tsx b/src/components/poll/SubmitFinalTime.tsx
index bd81b4f..75c4ad2 100644
--- a/src/components/poll/SubmitFinalTime.tsx
+++ b/src/components/poll/SubmitFinalTime.tsx
@@ -21,7 +21,7 @@ const SubmitFinalTime = (props: {
     e: React.MouseEvent<HTMLInputElement>
   ): Promise<void> => {
     e.preventDefault();
-    if (finalTime && poll.type === "group") {
+    if (finalTime && (!poll.type || poll.type === "group")) {
       setDisabled(true);
       try {
         const voterArgs = {
@@ -45,13 +45,14 @@ const SubmitFinalTime = (props: {
         toast.info("Please try again later", toastOptions);
         Router.reload();
       }
-    } else if (poll.type === "group") {
+    } else if (!poll.type || poll.type === "group") {
       toast.error("Please choose the final time", toastOptions);
     } else {
       setDisabled(true);
     }
   };
-  if (poll.type === "group") {
+
+  if (!poll.type || poll.type === "group") {
     return (
       <>
         <Button
diff --git a/src/components/poll/SubmitTimes.tsx b/src/components/poll/SubmitTimes.tsx
index 3f70aa3..cd56986 100644
--- a/src/components/poll/SubmitTimes.tsx
+++ b/src/components/poll/SubmitTimes.tsx
@@ -60,7 +60,7 @@ const SubmitTimes = (props: {
 
           if (!votedPolls) {
             if (pollFromDB.type === "oneonone") {
-              const initKukkeePolls = {
+              const initSamayPolls = {
                 polls: [
                   {
                     [`${pollID}`]: `${pollFromDB.title}#${time}`,
@@ -69,11 +69,11 @@ const SubmitTimes = (props: {
               };
 
               localStorage.setItem(
-                "kukkeeVotedPolls",
-                JSON.stringify(initKukkeePolls)
+                "samayVotedPolls",
+                JSON.stringify(initSamayPolls)
               );
             } else {
-              const initKukkeePolls = {
+              const initSamayPolls = {
                 polls: [
                   {
                     [`${pollID}`]: `${pollFromDB.title}`,
@@ -81,8 +81,8 @@ const SubmitTimes = (props: {
                 ],
               };
               localStorage.setItem(
-                "kukkeeVotedPolls",
-                JSON.stringify(initKukkeePolls)
+                "samayVotedPolls",
+                JSON.stringify(initSamayPolls)
               );
             }
           } else if (pollFromDB.type === "oneonone") {
@@ -93,7 +93,7 @@ const SubmitTimes = (props: {
             });
 
             localStorage.setItem(
-              "kukkeeVotedPolls",
+              "samayVotedPolls",
               JSON.stringify(votedPollsJSON)
             );
           } else {
@@ -104,7 +104,7 @@ const SubmitTimes = (props: {
             });
 
             localStorage.setItem(
-              "kukkeeVotedPolls",
+              "samayVotedPolls",
               JSON.stringify(votedPollsJSON)
             );
           }
diff --git a/src/components/poll/VoterPollInfo.tsx b/src/components/poll/VoterPollInfo.tsx
index 72b99f1..b8ed989 100644
--- a/src/components/poll/VoterPollInfo.tsx
+++ b/src/components/poll/VoterPollInfo.tsx
@@ -30,12 +30,17 @@ const PollInfo = (props: {
 
   return (
     <div>
-      <Badge
-        pill
-        variant={poll.open ? "success" : "secondary"}
-        className={poll.open ? "poll-badge-open" : "poll-badge-closed"}
-      >
-        {poll.open ? "Open" : "Closed"}
+      {(!poll.type || poll.type === "group") && (
+        <Badge
+          pill
+          variant={poll.open ? "success" : "secondary"}
+          className={poll.open ? "poll-badge-open" : "poll-badge-closed"}
+        >
+          {poll.open ? "Open" : "Closed"}
+        </Badge>
+      )}
+      <Badge pill variant="secondary" className="poll-badge-polltype">
+        {!poll.type || poll.type === "group" ? "Group" : "One-on-one"}
       </Badge>
       {poll.title && (
         <span
diff --git a/src/styles/navbar.scss b/src/styles/navbar.scss
index 91023c0..731851f 100644
--- a/src/styles/navbar.scss
+++ b/src/styles/navbar.scss
@@ -99,7 +99,7 @@
 }
 
 .beacon {
-  background-color: #16a2b8;
+  background-color: #ff5f1f;
   border-radius: 50%;
   width: 0.35rem;
   height: 0.35rem;
@@ -111,7 +111,7 @@
 }
 
 .beacon::before {
-  background-color: #16a2b8;
+  background-color: #ff5f1f;
   content: "";
   top: calc(50% - 0.25rem);
   left: calc(50% - 0.25rem);
@@ -141,5 +141,5 @@
 }
 
 .how-to-link-new-visitor {
-  color: #16a2b8;
+  color: #ff5f1f;
 }
diff --git a/src/styles/poll.scss b/src/styles/poll.scss
index 87daa3c..2ca6215 100644
--- a/src/styles/poll.scss
+++ b/src/styles/poll.scss
@@ -56,60 +56,58 @@
 }
 
 .poll-badge-open {
-  display: inline;
-  font-size: 0.8rem;
-  padding-top: 0.2em;
-  padding-left: 0.2em;
-  padding-right: 0.2em;
-  padding-bottom: 0.2em;
+  font-size: 0.6rem;
+  padding-top: 0.6em;
+  padding-left: 0.6em;
+  padding-right: 0.6em;
+  padding-bottom: 0.6em;
   background-color: #f0fdf4;
   color: #49de80;
+  border: 0.01rem solid #49de80;
   transition: none;
+  font-size: 0.5rem;
   letter-spacing: 0.02rem;
+  margin-right: 0.5rem;
 
   @include media-breakpoint-up(sm) {
-    font-size: 0.8rem;
-    padding: 0.5rem;
+    font-size: 0.6rem;
   }
 }
 
 .poll-badge-closed {
-  display: inline;
-  font-size: 0.8rem;
-  padding-top: 0.2em;
-  padding-left: 0.2em;
-  padding-right: 0.2em;
-  padding-bottom: 0.2em;
+  font-size: 0.6rem;
+  padding-top: 0.6em;
+  padding-left: 0.6em;
+  padding-right: 0.6em;
+  padding-bottom: 0.6em;
   background-color: #1018272e;
+  border: 0.01rem solid #1018272e;
   color: #101827;
   transition: none;
+  font-size: 0.5rem;
   letter-spacing: 0.02rem;
+  margin-right: 0.5rem;
 
   @include media-breakpoint-up(sm) {
-    font-size: 0.8rem;
-    padding: 0.5rem;
+    font-size: 0.6rem;
   }
 }
 
 .poll-badge-polltype {
-  display: inline;
-  font-size: 0.8rem;
+  font-size: 0.6rem;
   padding-top: 0.6em;
+  padding-left: 0.6em;
   padding-right: 0.6em;
   padding-bottom: 0.6em;
+  background-color: transparent;
+  border: 0.01rem solid #101827;
+  color: #101827;
   transition: none;
-  letter-spacing: 0.06rem;
-
-  background-color: #fefffe;
-  color: #565656;
-  margin-top: 1rem;
-  margin-right: 1rem;
-  margin-bottom: 1rem;
-  border-radius: 0.9rem;
-  border: 0.09rem solid #e5e7eb;
+  font-size: 0.5rem;
+  letter-spacing: 0.02rem;
 
   @include media-breakpoint-up(sm) {
-    width: 12%;
+    font-size: 0.6rem;
   }
 }
 

From e3bcf25017e2906712aa919f0c500b9953d93a08 Mon Sep 17 00:00:00 2001
From: anandbaburajan <anandbaburajan@gmail.com>
Date: Tue, 2 Apr 2024 13:06:28 +0530
Subject: [PATCH 6/6] chore: add one-on-one in how to and readme

---
 README.md         | 14 +++++++++++---
 pages/how-to.tsx  | 43 +++++++++++++++++++++++++++++++------------
 pages/privacy.tsx | 12 +++++-------
 3 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 3778e5f..59dac2d 100644
--- a/README.md
+++ b/README.md
@@ -27,9 +27,17 @@
 
 Samay is a free and open source meeting poll tool. Quickly find a time which works for everyone without the back-and-forth texts/emails!
 
-- Create a meeting poll by choosing the time slots based on your availability.
-- Copy and share the poll link with the participants to let them mark their availability.
-- Find the most popular times and see who's free with "yes" votes - or who can be - with "if need be" votes, and book the meeting!
+> #### Create a poll
+>
+> Select the time slots (click and drag) based on your availability, and optionally enter the title, description and location. The default poll type is "group" — to find a common time which works for everyone. If you want to have one-on-one meetings (parent-teacher meetings for example), select the "one-on-one" poll type.
+>
+> #### Share the poll
+>
+> Copy and share the poll link with the participants to let them mark their availability. In group polls, participants can either vote [yes] or [if need be] . In one-on-one polls, participants can select their one preferred time. No login required. No time zone confusion since Samay automatically shows participants times in their local time zone.
+>
+> #### Book the meeting
+>
+> In group polls, find the most popular times and see who's free with [yes] votes - or who can be - with [if need be] votes, book the meeting and share the final time with the participants! In one-on-one polls, find who has chosen which time slot for a one-on-one with you!
 
 Create a poll now at [Samay.app](https://samay.app/)!
 
diff --git a/pages/how-to.tsx b/pages/how-to.tsx
index 0fb5af4..19eca48 100644
--- a/pages/how-to.tsx
+++ b/pages/how-to.tsx
@@ -65,9 +65,15 @@ const HowTo = (): JSX.Element => {
                   1. Create a poll
                 </Card.Title>
                 <Card.Text className="how-to-card desc">
-                  Quickly create a meeting poll by choosing the time slots based
-                  on your availability, and optionally enter the title,
-                  description and location.
+                  Select the time slots (click and drag) based on your
+                  availability, and optionally enter the title, description and
+                  location.
+                  <br />
+                  <br />
+                  The default poll type is "group" — to find a common time which
+                  works for everyone. If you want to have one-on-one meetings
+                  (parent-teacher meetings for example), select the "one-on-one"
+                  poll type.
                 </Card.Text>
               </Card.Body>
             </Card>
@@ -80,12 +86,20 @@ const HowTo = (): JSX.Element => {
                 </Card.Title>
                 <Card.Text className="how-to-card desc">
                   Copy and share the poll link with the participants to let them
-                  mark their availability using &nbsp;
-                  <CheckCircleFill className="how-to-card icon-yes" /> (yes) or{" "}
-                  <CircleFill className="how-to-card icon-if-need-be" /> (if
-                  need be) votes. No login required. No time zone confusion
-                  since Samay automatically shows participants times in their
-                  local time zone.
+                  mark their availability.
+                  <br />
+                  <br />
+                  In group polls, participants can either vote [yes]{" "}
+                  <CheckCircleFill className="how-to-card icon-yes" /> or [if
+                  need be]{" "}
+                  <CircleFill className="how-to-card icon-if-need-be" />. In
+                  one-on-one polls, participants can select their one preferred
+                  time.
+                  <br />
+                  <br />
+                  No login required. No time zone confusion since Samay
+                  automatically shows participants times in their local time
+                  zone.
                 </Card.Text>
               </Card.Body>
             </Card>
@@ -97,9 +111,14 @@ const HowTo = (): JSX.Element => {
                   3. Book the meeting
                 </Card.Title>
                 <Card.Text className="how-to-card desc">
-                  Find the most popular times and see who's free with "yes"
-                  votes - or who can be - with "if need be" votes, and book the
-                  meeting!
+                  In group polls, find the most popular times and see who's free
+                  with [yes] votes - or who can be - with [if need be] votes,
+                  book the meeting and share the final time with the
+                  participants!
+                  <br />
+                  <br />
+                  In one-on-one polls, find who has chosen which time slot for a
+                  one-on-one with you!
                 </Card.Text>
               </Card.Body>
             </Card>
diff --git a/pages/privacy.tsx b/pages/privacy.tsx
index 3660986..00db76a 100644
--- a/pages/privacy.tsx
+++ b/pages/privacy.tsx
@@ -47,7 +47,7 @@ const Privacy = (): JSX.Element => {
           <Container className="global-container">
             <Jumbotron className="privacy-jumbo">
               <h1>Privacy Policy</h1>
-              <p>Last updated: Feb 18, 2023</p>
+              <p>Last updated: Apr 2, 2024</p>
               <hr />
               <br />
               <p>
@@ -127,15 +127,13 @@ const Privacy = (): JSX.Element => {
               </p>
               <h3>Where do we store the data?</h3>
               <p>
-                We use MongoDB's{" "}
-                <a href="https://www.mongodb.com/legal/privacy-policy">Atlas</a>{" "}
-                cloud database service to store all the events and your
-                availability information.
+                We use MongoDB's Atlas cloud database service to store all the
+                events and your availability information.
               </p>
               <h3>How long do we store your data?</h3>
               <p>
-                We will delete every poll 1 month after the event associated
-                with the poll is over.
+                We will keep your polls indefinitely. You have the option to
+                delete your polls from the recent polls page.
               </p>
               <h3>Cookies</h3>
               <p>