From 39746d0785e99304cfe8cd501d90a68ab2408f8c Mon Sep 17 00:00:00 2001
From: MoulikaKulkarni <moulika.kulkarni@ayanworks.com>
Date: Thu, 31 Aug 2023 15:14:42 +0530
Subject: [PATCH 1/2] fix: pathRoutes of organizations/credentials

Signed-off-by: MoulikaKulkarni <moulika.kulkarni@ayanworks.com>
---
 src/app/SideBar.astro                         |  4 +-
 src/components/Issuance/IssuedCrdentials.tsx  | 38 ++++++++++++++++++-
 src/config/pathRoutes.ts                      | 37 +++++++++---------
 .../credentials-issued/index.astro            |  0
 .../schemas/cred-defs/connections/index.astro |  0
 .../cred-defs/connections/issuance.astro      |  0
 .../schemas/cred-defs/index.astro             |  0
 .../credentials-issued/schemas/index.astro    |  0
 .../verification/index.astro                  |  0
 .../schemas/cred-defs/connections/index.astro |  0
 .../cred-defs/connections/verification.astro  |  0
 .../schemas/cred-defs/index.astro             |  0
 .../verification/schemas/index.astro          |  0
 13 files changed, 56 insertions(+), 23 deletions(-)
 rename src/pages/{credentials => organizations}/credentials-issued/index.astro (100%)
 rename src/pages/{credentials => organizations}/credentials-issued/schemas/cred-defs/connections/index.astro (100%)
 rename src/pages/{credentials => organizations}/credentials-issued/schemas/cred-defs/connections/issuance.astro (100%)
 rename src/pages/{credentials => organizations}/credentials-issued/schemas/cred-defs/index.astro (100%)
 rename src/pages/{credentials => organizations}/credentials-issued/schemas/index.astro (100%)
 rename src/pages/{credentials => organizations}/verification/index.astro (100%)
 rename src/pages/{credentials => organizations}/verification/schemas/cred-defs/connections/index.astro (100%)
 rename src/pages/{credentials => organizations}/verification/schemas/cred-defs/connections/verification.astro (100%)
 rename src/pages/{credentials => organizations}/verification/schemas/cred-defs/index.astro (100%)
 rename src/pages/{credentials => organizations}/verification/schemas/index.astro (100%)

diff --git a/src/app/SideBar.astro b/src/app/SideBar.astro
index dc231f2a9..62aa0a11f 100644
--- a/src/app/SideBar.astro
+++ b/src/app/SideBar.astro
@@ -225,7 +225,7 @@ import { pathRoutes } from "../config/pathRoutes";
 							<li>
 
 								<a
-									href={pathRoutes.credentials.issuedCredentials}
+									href={pathRoutes.organizations.issuedCredentials}
 									class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
 									>
 									<svg 
@@ -252,7 +252,7 @@ import { pathRoutes } from "../config/pathRoutes";
 							</li>
 							<li>
 								<a
-									href={pathRoutes.credentials.credentials}
+									href={pathRoutes.organizations.credentials}
 									class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
 									>
 									<svg 
diff --git a/src/components/Issuance/IssuedCrdentials.tsx b/src/components/Issuance/IssuedCrdentials.tsx
index 5bb8b6f83..7a61b887d 100644
--- a/src/components/Issuance/IssuedCrdentials.tsx
+++ b/src/components/Issuance/IssuedCrdentials.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Button, Pagination } from 'flowbite-react';
+import { Button, Pagination, Spinner } from 'flowbite-react';
 import { ChangeEvent, useEffect, useState } from 'react';
 import { apiStatusCodes, storageKeys } from '../../config/CommonConstant';
 import type { AxiosResponse } from 'axios';
@@ -13,6 +13,8 @@ import { AlertComponent } from '../AlertComponent';
 import { pathRoutes } from '../../config/pathRoutes';
 import DataTable from '../../commonComponents/datatable';
 import type { TableData } from '../../commonComponents/datatable/interface';
+import React from 'react';
+import { EmptyListMessage } from '../EmptyListComponent';
 
 interface IssuedCredential {
 	metadata: { [x: string]: { schemaId: string; }; };
@@ -102,6 +104,7 @@ const CredentialList = () => {
 					Credential Issued
 				</h1>
 			</div>
+
 			<div>
 				<div
 					className="p-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
@@ -127,7 +130,38 @@ const CredentialList = () => {
 							setError(null)
 						}}
 					/>
-					<DataTable header={header} data={issuedCredList} loading={loading}></DataTable>
+					{/* <DataTable header={header} data={issuedCredList} loading={loading}></DataTable> */}
+
+					{loading ? (<div className="flex items-center justify-center mb-4">
+          <Spinner
+            color="info"
+          />
+        </div>)
+          : issuedCredList && issuedCredList.length > 0 ? (
+            <div className='Flex-wrap' style={{ display: 'flex', flexDirection: 'column' }}>
+              <div className="mt-1 grid w-full grid-cols-1 gap-4 mt-0 mb-4 xl:grid-cols-2 2xl:grid-cols-3">
+                {issuedCredList && issuedCredList.length > 0 &&
+                  	<DataTable header={header} data={issuedCredList} loading={loading}></DataTable>
+                }
+              </div>
+              <div className="flex items-center justify-end mb-4">
+                <Pagination
+                  currentPage={1}
+                  onPageChange={() => {
+                  }}
+                  totalPages={0}
+                />
+              </div>
+            </div>) : (<EmptyListMessage
+              message={'Currently, there are no credential definitions issued.'}
+              description={'Get started by creating a new credential definition'}
+              buttonContent={''}
+              svgComponent={<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none" viewBox="0 0 24 24">
+                <path fill="#fff" d="M21.89 9.89h-7.78V2.11a2.11 2.11 0 1 0-4.22 0v7.78H2.11a2.11 2.11 0 1 0 0 4.22h7.78v7.78a2.11 2.11 0 1 0 4.22 0v-7.78h7.78a2.11 2.11 0 1 0 0-4.22Z" />
+              </svg>}
+              onClick={() => { }}
+            />)
+        }
 				</div>
 			</div>
 		</div>
diff --git a/src/config/pathRoutes.ts b/src/config/pathRoutes.ts
index a9ae2547f..10bceb593 100644
--- a/src/config/pathRoutes.ts
+++ b/src/config/pathRoutes.ts
@@ -16,26 +16,25 @@ export const pathRoutes = {
         users: '/organizations/users',
         schemas: `/organizations/schemas`,
         dashboard: '/organizations/dashboard',
+        issuedCredentials: '/organizations/credentials-issued',
+        credentials: '/organizations/verification',
         createSchema: '/organizations/schemas/create',
         viewSchema: '/organizations/schemas/view-schema',
-    },
-    credentials: {
-        root: '/credentials',
-        issuedCredentials: '/credentials/credentials-issued',
-        credentials: '/credentials/verification',
+
         Issuance: {
-            schema: '/credentials/credentials-issued/schemas',
-            credDef:'/credentials/credentials-issued/schemas/cred-defs',
-            connections:'/credentials/credentials-issued/schemas/cred-defs/connections',
-            issuance:'/credentials/credentials-issued/schemas/cred-defs/connections/issuance'
+            schema: '/organizations/credentials-issued/schemas',
+            credDef:'/organizations/credentials-issued/schemas/cred-defs',
+            connections:'/organizations/credentials-issued/schemas/cred-defs/connections',
+            issuance:'/organizations/credentials-issued/schemas/cred-defs/connections/issuance'
         },
         verification: {
-            schema: '/credentials/verification/schemas',
-            credDef:'/credentials/verification/schemas/cred-defs',
-            connections:'/credentials/verification/schemas/cred-defs/connections',
-            verify:'/credentials/verification/schemas/cred-defs/connections/verification'
+            schema: '/organizations/verification/schemas',
+            credDef:'/organizations/verification/schemas/cred-defs',
+            connections:'/organizations/verification/schemas/cred-defs/connections',
+            verify:'/organizations/verification/schemas/cred-defs/connections/verification'
         },
     },
+   
     // ecosystems: {
     //     root: '/ecosystems',
     //     frameworks: '/ecosystems/frameworks',
@@ -60,14 +59,14 @@ export const pathRoutes = {
 				schemas:'/organizations/schemas'
 			},
 			verification:{
-				credDef:'/credentials/credentials-issued/schemas/cred-defs',
-				schemas:'/credentials/verification/schemas',
-				verification:'/credentials/verification/schemas/cred-defs/connections',
+				credDef:'/organizations/credentials-issued/schemas/cred-defs',
+				schemas:'/organizations/verification/schemas',
+				verification:'/organizations/verification/schemas/cred-defs/connections',
 			},
 			issuance:{
-				credDef:'/credentials/credentials-issued/schemas/cred-defs',
-				schemas:'/credentials/credentials-issued/schemas',
-				connections: '/credentials/credentials-issued/schemas/cred-defs/connections'
+				credDef:'/organizations/credentials-issued/schemas/cred-defs',
+				schemas:'/organizations/credentials-issued/schemas',
+				connections: '/organizations/credentials-issued/schemas/cred-defs/connections'
 			}
 		}
 }
diff --git a/src/pages/credentials/credentials-issued/index.astro b/src/pages/organizations/credentials-issued/index.astro
similarity index 100%
rename from src/pages/credentials/credentials-issued/index.astro
rename to src/pages/organizations/credentials-issued/index.astro
diff --git a/src/pages/credentials/credentials-issued/schemas/cred-defs/connections/index.astro b/src/pages/organizations/credentials-issued/schemas/cred-defs/connections/index.astro
similarity index 100%
rename from src/pages/credentials/credentials-issued/schemas/cred-defs/connections/index.astro
rename to src/pages/organizations/credentials-issued/schemas/cred-defs/connections/index.astro
diff --git a/src/pages/credentials/credentials-issued/schemas/cred-defs/connections/issuance.astro b/src/pages/organizations/credentials-issued/schemas/cred-defs/connections/issuance.astro
similarity index 100%
rename from src/pages/credentials/credentials-issued/schemas/cred-defs/connections/issuance.astro
rename to src/pages/organizations/credentials-issued/schemas/cred-defs/connections/issuance.astro
diff --git a/src/pages/credentials/credentials-issued/schemas/cred-defs/index.astro b/src/pages/organizations/credentials-issued/schemas/cred-defs/index.astro
similarity index 100%
rename from src/pages/credentials/credentials-issued/schemas/cred-defs/index.astro
rename to src/pages/organizations/credentials-issued/schemas/cred-defs/index.astro
diff --git a/src/pages/credentials/credentials-issued/schemas/index.astro b/src/pages/organizations/credentials-issued/schemas/index.astro
similarity index 100%
rename from src/pages/credentials/credentials-issued/schemas/index.astro
rename to src/pages/organizations/credentials-issued/schemas/index.astro
diff --git a/src/pages/credentials/verification/index.astro b/src/pages/organizations/verification/index.astro
similarity index 100%
rename from src/pages/credentials/verification/index.astro
rename to src/pages/organizations/verification/index.astro
diff --git a/src/pages/credentials/verification/schemas/cred-defs/connections/index.astro b/src/pages/organizations/verification/schemas/cred-defs/connections/index.astro
similarity index 100%
rename from src/pages/credentials/verification/schemas/cred-defs/connections/index.astro
rename to src/pages/organizations/verification/schemas/cred-defs/connections/index.astro
diff --git a/src/pages/credentials/verification/schemas/cred-defs/connections/verification.astro b/src/pages/organizations/verification/schemas/cred-defs/connections/verification.astro
similarity index 100%
rename from src/pages/credentials/verification/schemas/cred-defs/connections/verification.astro
rename to src/pages/organizations/verification/schemas/cred-defs/connections/verification.astro
diff --git a/src/pages/credentials/verification/schemas/cred-defs/index.astro b/src/pages/organizations/verification/schemas/cred-defs/index.astro
similarity index 100%
rename from src/pages/credentials/verification/schemas/cred-defs/index.astro
rename to src/pages/organizations/verification/schemas/cred-defs/index.astro
diff --git a/src/pages/credentials/verification/schemas/index.astro b/src/pages/organizations/verification/schemas/index.astro
similarity index 100%
rename from src/pages/credentials/verification/schemas/index.astro
rename to src/pages/organizations/verification/schemas/index.astro

From 1de52fb0566a4ff3a0f8dd803659796ca33a5cb2 Mon Sep 17 00:00:00 2001
From: MoulikaKulkarni <moulika.kulkarni@ayanworks.com>
Date: Thu, 31 Aug 2023 15:20:29 +0530
Subject: [PATCH 2/2] fix: pathRoutes of organizations/credentials

Signed-off-by: MoulikaKulkarni <moulika.kulkarni@ayanworks.com>
---
 src/components/Issuance/IssuedCrdentials.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Issuance/IssuedCrdentials.tsx b/src/components/Issuance/IssuedCrdentials.tsx
index 7a61b887d..a3d6ce1e5 100644
--- a/src/components/Issuance/IssuedCrdentials.tsx
+++ b/src/components/Issuance/IssuedCrdentials.tsx
@@ -153,7 +153,7 @@ const CredentialList = () => {
                 />
               </div>
             </div>) : (<EmptyListMessage
-              message={'Currently, there are no credential definitions issued.'}
+              message={'Currently, there are no credentials issued.'}
               description={'Get started by creating a new credential definition'}
               buttonContent={''}
               svgComponent={<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none" viewBox="0 0 24 24">