Merge pull request #513 from credebl/merge-develop-to-main

merge: develop to main
credebl · Dec 29, 2023 · 2675493 · 2675493
2 parents 5278ad1 + 3f0a366
commit 2675493
Show file tree

Hide file tree

Showing 64 changed files with 3,454 additions and 1,717 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,8 +44,8 @@
 		"crypto-js": "^4.1.1",
 		"dom-to-image": "^2.6.0",
 		"downloadjs": "^1.4.7",
-		"flowbite": "^1.7.0",
-		"flowbite-react": "^0.4.10",
+		"flowbite": "^1.8.1",
+		"flowbite-react": "^0.4.11",
 		"flowbite-typography": "^1.0.3",
 		"formik": "^2.4.5",
 		"html2canvas": "^1.4.1",

diff --git a/public/images/1.svg b/public/images/1.svg
diff --git a/public/images/2.svg b/public/images/2.svg
diff --git a/public/images/Black bg.svg b/public/images/Black bg.svg
diff --git a/public/images/DPG-alliance.png b/public/images/DPG-alliance.png
diff --git a/public/images/Frame.svg b/public/images/Frame.svg
diff --git a/public/images/bg_banner_image.png b/public/images/bg_banner_image.png
diff --git a/public/images/blue_line_bg.svg b/public/images/blue_line_bg.svg
diff --git a/public/images/credebl-screenshot.png b/public/images/credebl-screenshot.png
diff --git a/public/images/dark-dpg-alliance.svg b/public/images/dark-dpg-alliance.svg
diff --git a/public/images/half_banner.png b/public/images/half_banner.png
diff --git a/public/images/mobile_1.svg b/public/images/mobile_1.svg
diff --git a/public/images/mobile_2.svg b/public/images/mobile_2.svg
diff --git a/public/images/mobile_mockup.svg b/public/images/mobile_mockup.svg
diff --git a/public/images/org-dashboard-dark.png b/public/images/org-dashboard-dark.png
diff --git a/public/images/org-dashboard-light.png b/public/images/org-dashboard-light.png
diff --git a/public/images/sec3-1-dark.png b/public/images/sec3-1-dark.png
diff --git a/public/images/sec3-1-light.png b/public/images/sec3-1-light.png
diff --git a/public/images/sec3-2-dark.png b/public/images/sec3-2-dark.png
diff --git a/public/images/sec3-2-light.png b/public/images/sec3-2-light.png
diff --git a/src/api/issuance.ts b/src/api/issuance.ts
@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { apiRoutes } from '../config/apiRoutes';
 import { storageKeys } from '../config/CommonConstant';
 import {
@@ -14,8 +13,8 @@ export const getIssuedCredentials = async ({page,
 	sortBy,
 	sortingOrder}: IConnectionListAPIParameter) => {
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Issuance.getIssuedCredentials}?pageSize=${itemPerPage}&pageNumber=${page}&searchByText=${search}&sortByValue=${sortingOrder}&sorting=${sortBy}`;
-
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Issuance.getIssuedCredentials}?pageSize=${itemPerPage}&pageNumber=${page}&searchByText=${search}&sortBy=${sortingOrder}&sortField=${sortBy}`;
+	
 	const axiosPayload = {
 		url,
 		config: await getHeaderConfigs(),