Skip to content

Commit

Permalink
feat(Redesign) : Redesigning seach bar, filter and sorting
Browse files Browse the repository at this point in the history 
-Ensure that the serch bar ,filter and sort are re-disigend well
-ensire that  the invite button remove from trainee page
  • Loading branch information
@niyobertin
niyobertin committed Oct 15, 2024
1 parent 7f5ee42 commit 6a08cfa
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 91 deletions.
14 changes: 0 additions & 14 deletions src/pages/AdminTraineeDashboard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1602,20 +1602,6 @@ function AdminTraineeDashboard() {
>
{t('add')} +{' '}
</Button>

{user?.role === 'coordinator' || undefined ? (
''
) : (
<Button
variant="primary"
size="lg"
data-testid="inviteModel"
style="m-0"
onClick={inviteModel}
>
{t('Invite')}
</Button>
)}
</div>
</div>
<div className="">
Expand Down
150 changes: 73 additions & 77 deletions src/pages/invitation.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ function Invitation() {
const [buttonLoading, setButtonLoading] = useState(false);
const [selectedRole, setSelectedRole] = useState('');
const [selectedStatus, setSelectedStatus] = useState('');
const [selectedSort,setSelectedSort] = useState<string>('');
const [email, setEmail] = useState('');
const [role, setRole] = useState('');
const [selectedInvitationId, setSelectedInvitationId] = useState('');
Expand All @@ -86,7 +87,6 @@ function Invitation() {
const[filterDisabled,setFilterDisabled]=useState<boolean>(true)
const modalRef = useRef<any>(null);
const organizationToken = localStorage.getItem('orgToken');

const parseRange = (range: string) => {
switch (range) {
case 'Last 7 days':
Expand Down Expand Up @@ -205,7 +205,6 @@ function Invitation() {
},
fetchPolicy: 'network-only',
});

const [
filterInvitations,
{ data: filterData, loading: filterLoad, error: filterError },
Expand Down Expand Up @@ -612,7 +611,6 @@ const handleStatusChange=(e:React.ChangeEvent<HTMLSelectElement>)=>{
}, 500);
},
});

const [CancelInvitation] = useMutation(CANCEL_INVITATION, {
variables: {
id: cancelInvitation,
Expand Down Expand Up @@ -809,80 +807,78 @@ const handleStatusChange=(e:React.ChangeEvent<HTMLSelectElement>)=>{
</p>

{/* Search form */}
<div className="flex flex-row md:flex-row gap-12 md:gap-8 md:w-[80%] ">
<div className="relative flex-1 text-black ">
<input
type="text"
id="search"
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
placeholder="Search by email, role or status of the invitation."
className="border border-gray-300 rounded-md pl-10 pr-4 py-2 w-full dark:text:text-black hover:border-[#7258ce] h-10 "
/>
<IoIosSearch
className="absolute text-gray-500 transform -translate-y-1/2 left-3 top-1/2"
size={20}
/>
</div>
<button
type="button"
disabled={disabledSearch}
onClick={handleSearch}
className={`bg-[#9e85f5] text-white text-lg md:text-xl rounded-md h-10 flex items-center justify-center md:w-[10%] p-0 sm:p-5 xm:p-5 ${disabledSearch?'cursor-not-allowed opacity-50':'cursor-pointer'}`}
>
Search
</button>
</div>
</div>
<div className="mt-6">
<div className="flex flex-wrap items-center space-x-4 space-y-2 md:space-y-0">
<p className="w-full md:w-auto">
Or filter by{' '}
<span>
<b>ROLE: </b>
</span>
</p>
<span className="w-full md:w-auto">
<select
className="w-full max-w-xs px-2 py-1 text-gray-700 bg-transparent border border-gray-300 rounded outline-none md:w-auto dark:text-white dark:text:text-white dark:bg-[#04122F]"
value={selectedRole}
onChange={handleRoleChange}
>
<option value="">-</option>
<option value="trainee">trainee</option>
<option value="ttl">ttl</option>
<option value="coordinator">coordinator</option>
<option value="manager">manager</option>
<option value="admin">admin</option>
</select>
</span>
<span className="w-full md:w-auto">
{' '}
or <b>STATUS: </b>
</span>
<span className="w-full md:w-auto">
<select
className="w-full max-w-xs px-2 py-1 text-gray-700 bg-transparent border border-gray-300 rounded outline-none md:w-auto dark:text-white dark:bg-[#04122F]"
value={selectedStatus}
onChange={ handleStatusChange}
>
<option value="">-</option>
<option value="pending">pending</option>
<option value="accepted">accepted</option>
<option value="denied">denied</option>
<option value="cancelled">cancelled</option>
</select>
</span>
<button
type="button"
disabled={filterDisabled}
onClick={handleFilter}
className={`w-full max-w-xs md:w-auto bg-[#9e85f5] text-white text-lg md:text-xl rounded-md h-10 flex items-center justify-center px-4 py-2
${filterDisabled ? 'cursor-not-allowed opacity-50' : 'cursor-pointer'}`}
>
Filter
</button>

<div className='block lg:flex justify-between items-center'>
<div className="flex flex-row md:flex-row gap-2 md:gap-2 mt-6 md:w-[50%] w-full">
<div className="relative flex-1 text-black ">
<input
type="text"
id="search"
value={searchQuery}
onChange={(e) => {
setSearchQuery(e.target.value)
handleSearch();
}}
placeholder="Search by email, role or status of the invitation."
className="border border-gray-300 outline-none bg-transparent rounded-md pl-10 pr-4 py-1 w-full dark:text-white hover:border-[#7258ce] dark:text:text-white dark:bg-[#04122F]"
/>
<IoIosSearch
className="absolute text-gray-500 transform -translate-y-1/2 left-3 top-1/2"
size={20}
/>
</div>
<div>
<select
className="w-full max-w-xs sm:px-2 px-0 py-1 text-gray-700 bg-transparent border border-gray-300 rounded outline-none md:w-auto dark:text-white dark:text:text-white dark:bg-[#04122F]"
value={selectedRole}
onChange={handleRoleChange}
>
<option value="">Sort by</option>
<option value="newest">Newest</option>
<option value="oldest">Olest</option>
</select>
</div>
</div>

<div className="">
<span className="font-bold">Filter by role or status</span>
<div className="flex items-center sm:space-x-4 space-x-2 space-y-2 md:space-y-0">
<span className="w-full md:w-auto">
<select
className="w-full max-w-xs px-2 py-1 text-gray-700 bg-transparent border border-gray-300 rounded outline-none md:w-auto dark:text-white dark:text:text-white dark:bg-[#04122F]"
value={selectedRole}
onChange={handleRoleChange}
>
<option value="">Role</option>
<option value="trainee">trainee</option>
<option value="ttl">ttl</option>
<option value="coordinator">coordinator</option>
<option value="manager">manager</option>
<option value="admin">admin</option>
</select>
</span>
<span className="w-full md:w-auto">
<select
className="w-full max-w-xs px-2 py-1 text-gray-700 bg-transparent border border-gray-300 rounded outline-none md:w-auto dark:text-white dark:bg-[#04122F]"
value={selectedStatus}
onChange={ handleStatusChange}
>
<option value="">Status</option>
<option value="pending">pending</option>
<option value="accepted">accepted</option>
<option value="cancelled">cancelled</option>
</select>
</span>
<button
type="button"
disabled={filterDisabled}
onClick={handleFilter}
className={`w-full max-w-xs md:w-auto bg-[#9e85f5] text-white text-lg md:text-xl rounded-md flex items-center justify-center sm:px-4 px-1 py-1
${filterDisabled ? 'cursor-not-allowed opacity-50' : 'cursor-pointer'}`}
>
Filter
</button>
</div>
</div>
</div>
{/* Table view */}
{content}
Expand Down

0 comments on commit 6a08cfa

Please sign in to comment.