WrenchBoard/Users-Wrench
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master

Browse Source
This commit is contained in:
Olusesan Ameye
2023-07-07 03:12:17 +00:00
committed by Gogs
parent f4bd4e4c7d f635372e31
commit d32e8e2c8c
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/FamilyAcc/Tabs/FamilyWaitlist.jsx
+7 -4
View File
@@ -66,12 +66,12 @@ const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
</p> </p>
</div> </div>
</div> </div>
<div className="px-2"> <div className="px-2 flex flex-col items-center justify-center">
<p className="text-sm font-bold text-dark-gray dark:text-white"> <p className="text-sm font-bold text-dark-gray dark:text-white">
{addedDate} {addedDate}
</p> </p>
<p className="text-sm text-dark-gray dark:text-white"> <p className="text-xs py-1.5 w-[70px] cursor-default tracking-wide rounded-full bg-gold text-white flex justify-center items-center">
Status: {value.status_text} {value.status_text}
</p> </p>
</div> </div>
</div> </div>
@@ -79,7 +79,10 @@ const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
<td className="text-right py-4 px-2"> <td className="text-right py-4 px-2">
<button <button
onClick={() => onClick={() =>
setPopUp({ show: true, data: {...value, selectedImage} }) setPopUp({
show: true,
data: { ...value, selectedImage },
})
} }
className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white" className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
> >
src/components/FamilyPopup/SuggestTask.jsx
+7 -2
View File
@@ -1,7 +1,7 @@
import { useState } from "react"; import { useState } from "react";
import { useLocation } from "react-router-dom"; import { useLocation } from "react-router-dom";
import ModalCom from "../Helpers/ModalCom"; import ModalCom from "../Helpers/ModalCom";
import {Form, Formik } from "formik"; import { Form, Formik } from "formik";
import InputCom from "../Helpers/Inputs/InputCom"; import InputCom from "../Helpers/Inputs/InputCom";
import usersService from "../../services/UsersService"; import usersService from "../../services/UsersService";
import Icons from "../Helpers/Icons"; import Icons from "../Helpers/Icons";
@@ -179,7 +179,11 @@ const SuggestTask = ({ details, onClose, situation }) => {
{ title: "Duplicate" }, { title: "Duplicate" },
{ title: "Not Now" }, { title: "Not Now" },
].map(({ title }, idx) => ( ].map(({ title }, idx) => (
<label key={idx} htmlFor="parent-suggested"> <label
role="group"
key={idx}
htmlFor="parent-suggested"
>
<input <input
type="radio" type="radio"
name="parent-suggested" name="parent-suggested"
@@ -189,6 +193,7 @@ const SuggestTask = ({ details, onClose, situation }) => {
className={`transition duration-150 ease-in-out parent-suggest`} className={`transition duration-150 ease-in-out parent-suggest`}
/> />
<span <span
onClick={switchNextStep}
className={`ml-1 ${ className={`ml-1 ${
title == "Not Now" title == "Not Now"
? "text-red-500" ? "text-red-500"