Compare commits

...

2 Commits

Author SHA1 Message Date
victorAnumudu f4ea8d9197 removed quick links on family login 2024-03-29 09:22:51 +01:00
ameye df136b3b30 Merge branch 'manage-media-taskpage' of WrenchBoard/Users-Wrench into master 2024-03-28 16:55:39 +00:00
2 changed files with 46 additions and 42 deletions
+40 -40
View File
@@ -397,7 +397,7 @@ function ActiveJobsMedia(props) {
</div>
</div>
<div className="w-full lg:w-2/5 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-1">
<div className="w-full lg:w-2/5 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-1 gap-4">
{/* TEXTAREA SECTION */}
<div className="w-full mb-3">
<div className="w-full">
@@ -495,51 +495,51 @@ function ActiveJobsMedia(props) {
{/* Buttons Sections */}
<div className="py-1 sm:flex sm:justify-end sm:items-center">
<div className="w-full flex justify-between items-center space-x-2">
<button
type="button"
onClick={handleClearAll}
className="custom-btn border-gradient"
>
<span className="text-gradient">Clear</span>
</button>
{tab == "files" ? (
<div className="w-full flex justify-center items-center gap-4">
<button
onClick={sendFile}
type="button"
className="custom-btn btn-gradient text-white"
type="button"
onClick={handleClearAll}
className="custom-btn border-gradient"
>
{requestStatus.loading ? (
<LoadingSpinner size="6" color="sky-blue" />
) : (
<>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
width="20"
height="20"
fill="white"
<span className="text-gradient">Clear</span>
</button>
{tab == "files" ? (
<button
onClick={sendFile}
type="button"
className="custom-btn btn-gradient text-white"
>
<path d="M12 2L2 12h3v8h14v-8h3L12 2zm0 16v-6h-2v6H7l5-5 5 5h-3z" />
</svg>
{requestStatus.loading ? (
<LoadingSpinner size="6" color="sky-blue" />
) : (
<>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
width="20"
height="20"
fill="white"
>
<path d="M12 2L2 12h3v8h14v-8h3L12 2zm0 16v-6h-2v6H7l5-5 5 5h-3z" />
</svg>
<span className="text-white">Upload Files</span>
</>
)}
</button>
) : (
<button
onClick={sendTaskMessage}
type="button"
className="custom-btn btn-gradient text-white"
>
{requestStatus.loading ? (
<LoadingSpinner size="6" color="sky-blue" />
<span className="text-white">Upload Files</span>
</>
)}
</button>
) : (
<span className="text-white">Send</span>
<button
onClick={sendTaskMessage}
type="button"
className="custom-btn btn-gradient text-white"
>
{requestStatus.loading ? (
<LoadingSpinner size="6" color="sky-blue" />
) : (
<span className="text-white">Send</span>
)}
</button>
)}
</button>
)}
</div>
</div>
{/* end of Buttons Sections */}
+6 -2
View File
@@ -10,6 +10,8 @@ import RightSideBar from "./RightSideBar";
import Sidebar from "./Sidebar";
export default function Layout({ children }) {
const { userDetails } = useSelector((state) => state?.userDetails); // CHECKS FOR USER Details
const { drawer } = useSelector((state) => state.drawer);
const { userJobList } = useSelector((state) => state.userJobList);
const dispatch = useDispatch();
@@ -52,7 +54,7 @@ export default function Layout({ children }) {
return (
<>
<div className="nft-main-wrapper-layout">
<div className="nft-main-wrapper-layout w-full mx-auto">
<div className={`nft-wrapper-layout-container 2xl:pr-20 md:pr-10 pr-2 pl-2 md:pl-0 w-full min-h-screen flex`}>
{/* sidebar */}
<div className={`nft-sidebar xl:block hidden section-shadow ${drawer ? "2xl:w-[335px] w-[280px] 2xl:pl-20 pl-10 pr-6 " : "w-[70px]"} bg-white dark:bg-dark-white h-full overflow-y-scroll overflow-style-none fixed left-0 top-0 pt-[30px]`}>
@@ -72,12 +74,14 @@ export default function Layout({ children }) {
</div>
{/* container */}
<div className="nft-container 2xl:flex 2xl:space-x-8 h-full mb-12 lg:mt-[140px] mt-24 xl:mt-10 flex flex-col xl:flex-row items-start justify-center gap-4">
<div className="nft-main-container flex-[80%] w-full">
<div className="flex-[80%] w-full">
{children && children}
</div>
{userDetails.account_type == 'FULL' &&
<div className="nft-right-side-content 2xl:w-[270px] w-full h-full 2xl:flex justify-center relative flex-[20%]">
<RightSideBar myJobList={userJobList} />
</div>
}
</div>
</div>
</div>