Compare commits

...

4 Commits

Author SHA1 Message Date
victorAnumudu d2db38ba21 profile bug fixed 2023-07-17 02:01:37 +01:00
ameye c2c7ad7bb4 Merge branch 'family-start-task-layout' of WrenchBoard/Users-Wrench into master 2023-07-16 23:09:30 +00:00
ameye 6484640e1a Merge branch 'assign-task-layout' of WrenchBoard/Users-Wrench into master 2023-07-16 22:28:28 +00:00
victorAnumudu ba3c4e1918 assign task layout btns fixed 2023-07-16 22:41:58 +01:00
2 changed files with 25 additions and 13 deletions
+6 -6
View File
@@ -404,7 +404,7 @@ function ActiveJobs(props) {
<div className="files"> <div className="files">
<label <label
htmlFor="file" htmlFor="file"
className="h-20 btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer" className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
> >
Select Files to Upload Select Files to Upload
</label> </label>
@@ -463,7 +463,7 @@ function ActiveJobs(props) {
<button <button
type="button" type="button"
onClick={handleClearAll} onClick={handleClearAll}
className="border-gradient text-base tracking-wide px-4 py-3 rounded-full" className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
> >
<span className="text-gradient">Clear</span> <span className="text-gradient">Clear</span>
</button> </button>
@@ -471,7 +471,7 @@ function ActiveJobs(props) {
<button <button
onClick={sendFile} onClick={sendFile}
type="button" type="button"
className="btn-gradient text-base tracking-wide px-4 py-3 rounded-full flex justify-center items-center" className='btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center'
> >
{requestStatus.loading ? ( {requestStatus.loading ? (
<LoadingSpinner size="6" color="sky-blue" /> <LoadingSpinner size="6" color="sky-blue" />
@@ -495,7 +495,7 @@ function ActiveJobs(props) {
<button <button
onClick={sendTaskMessage} onClick={sendTaskMessage}
type="button" type="button"
className="btn-gradient text-base text-white tracking-wide px-4 py-3 rounded-full" className='btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer'
> >
{requestStatus.loading ? ( {requestStatus.loading ? (
<LoadingSpinner size="6" color="sky-blue" /> <LoadingSpinner size="6" color="sky-blue" />
@@ -520,9 +520,9 @@ function ActiveJobs(props) {
<button <button
type="button" type="button"
onClick={popUpHandler} onClick={popUpHandler}
className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white" className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center"
> >
view all View all
</button> </button>
</div> </div>
{props.activeJobMesList.loading ? ( {props.activeJobMesList.loading ? (
+19 -7
View File
@@ -472,10 +472,10 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
</Link> </Link>
</div> </div>
{/* profile */} {/* profile */}
<div className="user-profile relative lg:block hidden"> <div className="user-profile relative">
<div <div
onClick={() => handlerProfile()} onClick={() => handlerProfile()}
className="flex items-center space-x-3.5" className="hidden lg:flex items-center space-x-3.5"
> >
{/* profile-image */} {/* profile-image */}
<div className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden"> <div className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden">
@@ -492,6 +492,17 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
{userDetails && userDetails?.account_type !== "FAMILY" && <p className="text-sm text-thin-light-gray">@{userEmail}</p>} {userDetails && userDetails?.account_type !== "FAMILY" && <p className="text-sm text-thin-light-gray">@{userEmail}</p>}
</div> </div>
</div> </div>
<div className="for-mobile-profile lg:hidden block">
<div
// to="/profile"
onClick={() => handlerProfile()}
className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block"
>
<img src={profileImg} alt="profile" className="w-full h-full" />
</div>
</div>
<div <div
className={`profile-dropdown w-[293px] z-30 bg-white dark:bg-dark-white absolute lg:right-16 -right-[16px] rounded-lg ${ className={`profile-dropdown w-[293px] z-30 bg-white dark:bg-dark-white absolute lg:right-16 -right-[16px] rounded-lg ${
userProfileDropdown ? "active" : "" userProfileDropdown ? "active" : ""
@@ -684,14 +695,15 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
</div> </div>
</div> </div>
</div> </div>
<div className="for-mobile-profile lg:hidden block"> {/* <div className="for-mobile-profile lg:hidden block">
<Link <div
to="/profile" // to="/profile"
onClick={() => handlerProfile()}
className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block" className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block"
> >
<img src={profileImg} alt="profile" className="w-full h-full" /> <img src={profileImg} alt="profile" className="w-full h-full" />
</Link> </div>
</div> </div> */}
</div> </div>
</div> </div>
</div> </div>