Skip to content
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.

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

fix:Alignment fixes on Edit Organization modal page and verification page #267

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/components/Resources/Schema/Create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ const CreateSchema = () => {

return (
<>
<div className="d-flex justify-content-center align-items-center mb-1">
Attributes <span className="text-red-600">*</span>
<div className="d-flex justify-content-center dark:text-white align-items-center mb-1">
Attributes <span className="dark:text-red text-red-600">*</span>
</div>
<div className="flex flex-col">
{attribute.map((element: any, index: number) => (
Expand Down
9 changes: 8 additions & 1 deletion src/components/Verification/Verification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import DataTable from "../../commonComponents/datatable";
import type { TableData } from "../../commonComponents/datatable/interface";
import { verifyCredential } from "../../api/verification";
import { pathRoutes } from "../../config/pathRoutes";
import CustomSpinner from "../CustomSpinner";

interface SchemaDetails {
schemaName: string,
Expand Down Expand Up @@ -41,7 +42,7 @@ const VerificationCred = () => {
const [schemaDetails, setSchemaDetails] = useState<SchemaDetails>({
schemaName: '', version: '', schemaId: '', credDefId: ''
})
const [loading, setLoading] = useState<boolean>(false)
const [loading, setLoading] = useState<boolean>(true)
const [schemaAttributes, setSchemaAttributes] = useState<string[]>([]);
const [selectedUsersData, setSelectedUsersData] = useState<Array<{ name: string, selected: boolean }>>([]);
const [requestLoader, setRequestLoader] = useState<boolean>(false)
Expand Down Expand Up @@ -220,6 +221,11 @@ const VerificationCred = () => {
Verification
</h1>
</div>
{loading ?
<div className="flex items-center justify-center mb-4">
<CustomSpinner/>
</div>
:
<Card className='transform transition duration-500 hover:scale-105 hover:bg-gray-50' style={{ width: '470px', height: '140px', maxWidth: '100%', maxHeight: '100%', overflow: 'auto' }}>
<div className="flex justify-between items-start">
<div>
Expand All @@ -242,6 +248,7 @@ const VerificationCred = () => {
</p>
</div>
</Card>
}
{
(proofReqSuccess || errMsg) &&
<div className="p-2">
Expand Down
2 changes: 1 addition & 1 deletion src/components/organization/EditOrgdetailsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ const EditOrgdetailsModal = (props: EditOrgdetailsModalProps)=> {
props?.onEditSucess()
}
props.setOpenModal(false)

window.location.reload();
} else {
setErrMsg(resUpdateOrg as string)
}
Expand Down
2 changes: 1 addition & 1 deletion src/config/pathRoutes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const pathRoutes = {
schemas:'/organizations/schemas'
},
verification:{
credDef:'/organizations/credentials-issued/schemas/cred-defs',
credDef:'/organizations/verification/schemas/cred-defs',
schemas:'/organizations/verification/schemas',
verification:'/organizations/verification/schemas/cred-defs/connections',
},
Expand Down