8000 Organization dashboard fixes by bhavanakarwade · Pull Request #512 · credebl/studio · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Organization dashboard fixes #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 29, 2023
Merged

Organization dashboard fixes #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c72ac68
resolved ui fixes
bhavanakarwade Dec 29, 2023
0b817c2
Merge branch 'develop' of https://github.com/credebl/studio into empt…
bhavanakarwade Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/components/organization/OrganizationDetails.tsx
View file 8000
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ const OrganizationDetails = ({ orgData }: { orgData: Organisation | null }) => {
>
Network
</p>
<p className="text-base font-normal text-gray-500 truncate dark:text-gray-400">:</p>
<p className="pr-4 text-base font-normal text-gray-500 dark:text-gray-400">:</p>
<p
className="ml-4 text-base font-semibold text-gray-900 truncate dark:text-white w-full"
className="text-base font-semibold text-gray-900 truncate dark:text-white w-full"
>
{agentData?.ledgers ? agentData?.ledgers?.name : `-`}
</p>
Expand All @@ -116,9 +116,9 @@ const OrganizationDetails = ({ orgData }: { orgData: Organisation | null }) => {
>
Agent Type
</p>
<p className="text-base font-normal text-gray-500 truncate dark:text-gray-400">:</p>
<p className="pr-4 text-base font-normal text-gray-500 dark:text-gray-400">:</p>
<p
className="ml-4 text-base font-semibold text-gray-900 truncate dark:text-white w-full"
className="text-base font-semibold text-gray-900 truncate dark:text-white w-full"
>
{agentData?.org_agent_type?.agent
? agentData?.org_agent_type?.agent?.charAt(0).toUpperCase() +
Expand All @@ -140,9 +140,9 @@ const OrganizationDetails = ({ orgData }: { orgData: Organisation | null }) => {
>
Created On
</p>
<p className="text-base font-normal text-gray-500 truncate dark:text-gray-400">:</p>
<p className="pr-4 text-base font-normal text-gray-500 dark:text-gray-400">:</p>
<p
className="ml-4 text-base font-semibold text-gray-900 truncate dark:text-white w-full"
className="text-base font-semibold text-gray-900 truncate dark:text-white w-full"
>
{
agentData?.createDateTime ?
Expand Down
10 changes: 3 additions & 7 deletions src/components/organization/invitations/Invitations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,8 @@ const Invitations = () => {
setError(null)
}}
/>

{loading
? <div className="flex items-center justify-center mb-4">
<CustomSpinner />
</div>
: invitationsList && invitationsList?.length > 0 ? (<div
{
invitationsList && invitationsList?.length > 0 ? (<div
className="p-2 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-3 dark:bg-gray-800"
>
<div className="flow-root">
Expand Down Expand Up @@ -290,7 +286,7 @@ const Invitations = () => {
<path fill="#fff" d="M37.846 0H9.231a3.703 3.703 0 0 0-3.693 3.692v1.385c0 .508.416.923.924.923a.926.926 0 0 0 .923-.923V3.692c0-.184.046-.369.092-.554L17.815 12 7.477 20.861a2.317 2.317 0 0 1-.092-.553v-1.385A.926.926 0 0 0 6.462 18a.926.926 0 0 0-.924.923v1.385A3.703 3.703 0 0 0 9.231 24h28.615a3.703 3.703 0 0 0 3.693-3.692V3.692A3.703 3.703 0 0 0 37.846 0ZM8.862 1.892c.092-.046.23-.046.369-.046h28.615c.139 0 .277 0 .37.046L24.137 13.938a.97.97 0 0 1-1.2 0L8.863 1.893Zm28.984 20.262H9.231c-.139 0-.277 0-.37-.046L19.247 13.2l2.492 2.17a2.67 2.67 0 0 0 1.8.691 2.67 2.67 0 0 0 1.8-.692l2.493-2.169 10.384 8.908c-.092.046-.23.046-.369.046Zm1.846-1.846c0 .184-.046.369-.092.553L29.262 12 39.6 3.138c.046.185.092.37.092.554v16.616ZM2.77 9.692c0-.507.416-.923.923-.923h5.539c.507 0 .923.416.923.923a.926.926 0 0 1-.923.923h-5.54a.926.926 0 0 1-.923-.923Zm6.462 5.539H.923A.926.926 0 0 1 0 14.308c0-.508.415-.923.923-.923h8.308c.507 0 .923.415.923.923a.926.926 0 0 1-.923.923Z" />
</svg>}
/>)
}
}
{
currentPage.total > 1 &&
<div className="flex items-center justify-end mb-4">
Expand Down
0