diff --git a/package-lock.json b/package-lock.json
index 392fc0c..a821bd2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
"@uppy/webcam": "^3.3.2",
"@uppy/xhr-upload": "^3.4.0",
"apexcharts": "^3.37.3",
- "axios": "^1.4.0",
+ "axios": "^1.10.0",
"buffer": "^6.0.3",
"date-fns": "^2.30.0",
"dayjs": "^1.11.10",
@@ -53,6 +53,7 @@
"mui-file-input": "^3.0.2",
"mui-image": "^1.0.7",
"prop-types": "^15.8.1",
+ "pspdfkit": "^2024.8.2",
"react": "^18.2.0",
"react-apexcharts": "^1.4.0",
"react-copy-to-clipboard": "^5.1.0",
@@ -7928,11 +7929,11 @@
}
},
"node_modules/axios": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
- "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.10.0.tgz",
+ "integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
"dependencies": {
- "follow-redirects": "^1.15.0",
+ "follow-redirects": "^1.15.6",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
@@ -11220,9 +11221,9 @@
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"node_modules/follow-redirects": {
- "version": "1.15.2",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
- "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+ "version": "1.15.9",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+ "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
"funding": [
{
"type": "individual",
@@ -19522,6 +19523,25 @@
"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
"integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
},
+ "node_modules/pspdfkit": {
+ "version": "2024.8.2",
+ "resolved": "https://registry.npmjs.org/pspdfkit/-/pspdfkit-2024.8.2.tgz",
+ "integrity": "sha512-0GG/eXF91UFzfh8vPElpmVEHqcS6EXCZ6KNaKBXd2gLgTqcilKcyqe3phQa8LEj/0+zMT2OnuKxVNwcMR7DevQ==",
+ "deprecated": "pspdfkit has been rebranded to @nutrient-sdk/viewer. Upgrade to @nutrient-sdk/viewer@^1.0.0.",
+ "dependencies": {
+ "@types/react": "^17.0.39"
+ }
+ },
+ "node_modules/pspdfkit/node_modules/@types/react": {
+ "version": "17.0.87",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.87.tgz",
+ "integrity": "sha512-wpg9AbtJ6agjA+BKYmhG6dRWEU/2DHYwMzCaBzsz137ft6IyuqZ5fI4ic1DWL4DrI03Zy78IyVE6ucrXl0mu4g==",
+ "dependencies": {
+ "@types/prop-types": "*",
+ "@types/scheduler": "^0.16",
+ "csstype": "^3.0.2"
+ }
+ },
"node_modules/punycode": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
diff --git a/package.json b/package.json
index a065f4b..c50c909 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"@uppy/webcam": "^3.3.2",
"@uppy/xhr-upload": "^3.4.0",
"apexcharts": "^3.37.3",
- "axios": "^1.4.0",
+ "axios": "^1.10.0",
"buffer": "^6.0.3",
"date-fns": "^2.30.0",
"dayjs": "^1.11.10",
@@ -49,6 +49,7 @@
"mui-file-input": "^3.0.2",
"mui-image": "^1.0.7",
"prop-types": "^15.8.1",
+ "pspdfkit": "^2024.8.2",
"react": "^18.2.0",
"react-apexcharts": "^1.4.0",
"react-copy-to-clipboard": "^5.1.0",
diff --git a/src/pages/pdf/index.js b/src/pages/pdf/index.js
index f23d412..6848039 100644
--- a/src/pages/pdf/index.js
+++ b/src/pages/pdf/index.js
@@ -1,12 +1,12 @@
// src/App.js (Your 'pdfForm' page equivalent)
import React, { useEffect, useRef, useState } from 'react';
-import './App.css'; // For basic styling
+// import './App.css'; // For basic styling
import axios from 'axios';
// Import your chosen commercial PDF SDK (e.g., PSPDFKit)
import PSPDFKit from 'pspdfkit';
-function App() {
+function PDF() {
const viewerRef = useRef(null); // Ref for the DOM element where PDF will render
const instanceRef = useRef(null); // Ref for the PSPDFKit instance
const [pdfLoaded, setPdfLoaded] = useState(false);
@@ -16,7 +16,7 @@ function App() {
if (viewerRef.current) {
try {
// 1. Fetch the blank PDF template from your Spring Boot backend
- const response = await axios.get('http://localhost:8080/api/pdf/template', {
+ const response = await axios.get('http://localhost:8090/api/pdf/template', {
responseType: 'arraybuffer' // Essential for binary data
});
const pdfBlob = new Blob([response.data], { type: 'application/pdf' });
@@ -65,7 +65,7 @@ function App() {
formData.append('file', filledPdfBlob, 'filled_form.pdf');
// Send the filled PDF to your Spring Boot backend's save endpoint
- const response = await axios.post('http://localhost:8080/api/pdf/saveFilled', formData, {
+ const response = await axios.post('http://localhost:8090/api/pdf/saveFilled', formData, {
headers: {
'Content-Type': 'multipart/form-data' // Important for file uploads
}
@@ -118,4 +118,4 @@ function App() {
);
}
-export default App;
\ No newline at end of file
+export default PDF;
\ No newline at end of file
diff --git a/src/routes/ClientRoutes.js b/src/routes/ClientRoutes.js
index b7eb8d1..7f94ba8 100644
--- a/src/routes/ClientRoutes.js
+++ b/src/routes/ClientRoutes.js
@@ -10,6 +10,7 @@ import AbilityContext from "../components/AbilityProvider";
// render - login
const ClientSearchPage = Loadable(lazy( () => import('pages/client/ClientSearchPage')));
const ClientMaintainPage = Loadable(lazy( () => import('pages/client/ClientMaintainPage')));
+const PDF = Loadable(lazy( () => import('pages/pdf')));
// ==============================|| AUTH ROUTING ||============================== //
@@ -40,6 +41,16 @@ const ClientRoutes =() => {
)
),
},
+ {
+ path: 'pdf',
+ element: (
+ handleRouteAbility(
+ ability.can('VIEW', 'DASHBOARD'),
+ ,
+
+ )
+ ),
+ },
]
};
};
diff --git a/src/routes/MainRoutes.js b/src/routes/MainRoutes.js
index 7820b56..760cbe8 100644
--- a/src/routes/MainRoutes.js
+++ b/src/routes/MainRoutes.js
@@ -10,6 +10,7 @@ import {Navigate} from "react-router";
// render - dashboard
//const DashboardDefault = Loadable(lazy(() => import('pages/dashboard')));
const LIONERDashboard = Loadable(lazy(() => import('pages/lionerdashboard')));
+const PDF = Loadable(lazy(() => import('pages/pdf')));
const ReminderPage = Loadable(lazy(() => import('pages/lionerReminderPage')));
const TemplateSearchPage = Loadable(lazy(() => import('pages/lionerSearchPanel')));
const TemplateMaintainPage = Loadable(lazy(() => import('pages/lionerMaintainSearchTemplatePage')));
@@ -52,6 +53,16 @@ const MainRoutes = () => {
)
),
},
+ {
+ path: '/pdf',
+ element: (
+ handleRouteAbility(
+ ability.can('VIEW', 'DASHBOARD'),
+ ,
+
+ )
+ ),
+ },
// {
// path: '/reminder',
// element: (