diff --git a/.gitignore b/.gitignore index ad32a69..3a2ebef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,12 @@ +<<<<<<< HEAD /build /node_modules package-lock.json /build +======= +node_modules/ +node_modules/ +/build +package-lock.json +>>>>>>> 1c0592d (commit new code) .eslintcache diff --git a/package.json b/package.json index cb1112f..4e1553b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,9 @@ { "name": "authsec-dashboard-react", +<<<<<<< HEAD +======= + "proxy": "http://157.66.191.31:33266", +>>>>>>> 1c0592d (commit new code) "version": "1.2.4", "description": "React version of Argon Dashboard by Creative Tim", "main": "index.js", @@ -64,6 +68,10 @@ "bootstrap-switch-button-react": "^1.2.0", "chart.js": "^4.4.8", "classnames": "2.3.2", +<<<<<<< HEAD +======= + "cors-anywhere": "^0.4.4", +>>>>>>> 1c0592d (commit new code) "file-saver": "^2.0.5", "moment": "2.29.4", "multiselect-react-dropdown": "^2.0.25", diff --git a/public/index.html b/public/index.html index d5002c4..996c1c2 100644 --- a/public/index.html +++ b/public/index.html @@ -47,7 +47,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> 1c0592d (commit new code) CloudNSure diff --git a/src/APIServices/AddReportSQLBuilderAPI.js b/src/APIServices/AddReportSQLBuilderAPI.js index 188ca6e..07ccf82 100644 --- a/src/APIServices/AddReportSQLBuilderAPI.js +++ b/src/APIServices/AddReportSQLBuilderAPI.js @@ -2,7 +2,11 @@ import apiService from '../APIRequestService/APIService'; +<<<<<<< HEAD const BASE_URL = `${process.env.REACT_APP_API_URL}/Rpt_builder2/Rpt_builder2`; +======= +const BASE_URL = `${process.env.REACT_APP_API_URL}Rpt_builder2/Rpt_builder2`; +>>>>>>> 1c0592d (commit new code) export const addSQLReport = async (formData) => { diff --git a/src/APIServices/DeleteReportSQLAPI.js b/src/APIServices/DeleteReportSQLAPI.js index d1d3fbb..f199201 100644 --- a/src/APIServices/DeleteReportSQLAPI.js +++ b/src/APIServices/DeleteReportSQLAPI.js @@ -5,7 +5,11 @@ export const deleteReportSQL = async (id) => { if (!id) { throw new Error("ID is required for deletion."); } +<<<<<<< HEAD const BASE_URL = `${process.env.REACT_APP_API_URL}/Rpt_builder2/Rpt_builder2/${id}`; +======= + const BASE_URL = `${process.env.REACT_APP_API_URL}Rpt_builder2/Rpt_builder2/${id}`; +>>>>>>> 1c0592d (commit new code) try { const response = await apiService.delete(BASE_URL); console.log("Delete response:", response.data); diff --git a/src/APIServices/ReportSQLBuilderAPI.js b/src/APIServices/ReportSQLBuilderAPI.js index f0a6ceb..fccf133 100644 --- a/src/APIServices/ReportSQLBuilderAPI.js +++ b/src/APIServices/ReportSQLBuilderAPI.js @@ -4,7 +4,11 @@ import apiService from '../APIRequestService/APIService';// Assuming apiService +<<<<<<< HEAD const BASE_URL = `${process.env.REACT_APP_API_URL}/Rpt_builder2/Rpt_builder2`; +======= +const BASE_URL = `${process.env.REACT_APP_API_URL}Rpt_builder2/Rpt_builder2`; +>>>>>>> 1c0592d (commit new code) const ReportSqlBuilderApi = { fetchUserDetails: async () => { diff --git a/src/APIServices/UpdateReportSQLBuilderAPI.js b/src/APIServices/UpdateReportSQLBuilderAPI.js index ff05e87..94f24a9 100644 --- a/src/APIServices/UpdateReportSQLBuilderAPI.js +++ b/src/APIServices/UpdateReportSQLBuilderAPI.js @@ -4,7 +4,11 @@ import apiService from '../APIRequestService/APIService'; export const UpdateReportSQLBuilder = async (id,formData) => { +<<<<<<< HEAD const BASE_URL = `${process.env.REACT_APP_API_URL}/Rpt_builder2/Rpt_builder2/${id}`; +======= + const BASE_URL = `${process.env.REACT_APP_API_URL}Rpt_builder2/Rpt_builder2/${id}`; +>>>>>>> 1c0592d (commit new code) try { const response = await apiService.put(BASE_URL, formData); console.log("update response: ",response.data); diff --git a/src/assets/css/argon-dashboard-react.css b/src/assets/css/argon-dashboard-react.css index 85df22e..68c03ec 100644 --- a/src/assets/css/argon-dashboard-react.css +++ b/src/assets/css/argon-dashboard-react.css @@ -4064,7 +4064,11 @@ input[type="button"].btn-block { ~ .custom-control-label::before { border-color: #5e72e4; background-color: #5e72e4; +<<<<<<< HEAD box-shadow: ; +======= + box-shadow: 29; +>>>>>>> 1c0592d (commit new code) } .custom-checkbox diff --git a/src/components/Dashboard/APIRegistry.js b/src/components/Dashboard/APIRegistry.js index b968a6a..3a5b331 100644 --- a/src/components/Dashboard/APIRegistry.js +++ b/src/components/Dashboard/APIRegistry.js @@ -65,7 +65,11 @@ function APIRegistry() { }, []); const fetchApiEntries = async () => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/Api_registery_header/Api_registery_header`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}Api_registery_header/Api_registery_header`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); if (!token) { diff --git a/src/components/Dashboard/AccessType.js b/src/components/Dashboard/AccessType.js index 803aad4..c318d71 100644 --- a/src/components/Dashboard/AccessType.js +++ b/src/components/Dashboard/AccessType.js @@ -57,7 +57,11 @@ function AccessTypeManagement() { useEffect(() => { const fetchAccessTypes = async () => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/api/getAllAccessTypes`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}api/getAllAccessTypes`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); if (!token) { diff --git a/src/components/Dashboard/Codeextension.js b/src/components/Dashboard/Codeextension.js index 870ab5b..2411084 100644 --- a/src/components/Dashboard/Codeextension.js +++ b/src/components/Dashboard/Codeextension.js @@ -29,7 +29,11 @@ // useEffect(() => { // const fetchData = async () => { // try { +<<<<<<< HEAD // const response = await fetch('http://localhost:9292/api/extension'); +======= +// const response = await fetch('http://157.66.191.31:33266/api/extension'); +>>>>>>> 1c0592d (commit new code) // const data = await response.json(); // setMenuItems(data); // } catch (error) { diff --git a/src/components/Dashboard/Dashboard.js b/src/components/Dashboard/Dashboard.js index 982a663..b017dfa 100644 --- a/src/components/Dashboard/Dashboard.js +++ b/src/components/Dashboard/Dashboard.js @@ -420,7 +420,11 @@ function Dashboard() { useEffect(() => { const fetchMenuItems = async () => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/fndMenu/menuloadbyuser`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}fndMenu/menuloadbyuser`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); if (!token) { diff --git a/src/components/Dashboard/DashboardView.js b/src/components/Dashboard/DashboardView.js index 3faa9f3..29c1fc4 100644 --- a/src/components/Dashboard/DashboardView.js +++ b/src/components/Dashboard/DashboardView.js @@ -34,7 +34,11 @@ function DashboardView({onDashboardCharts}) { }, [showTable]); const fetchData = async () => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/getNotificationByUser`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}getNotificationByUser`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); if (!token) { @@ -63,7 +67,11 @@ function DashboardView({onDashboardCharts}) { }; const fetchDashboardCardData = async () => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/get_Dashboard_header`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}get_Dashboard_header`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); if (!token) { diff --git a/src/components/Dashboard/DataType3.js b/src/components/Dashboard/DataType3.js index 6640d66..a016e8b 100644 --- a/src/components/Dashboard/DataType3.js +++ b/src/components/Dashboard/DataType3.js @@ -12,7 +12,11 @@ function DataType3() { useEffect(() => { const fetchData = async () => { try { +<<<<<<< HEAD const response = await fetch('http://localhost:9292/fndMenu/menuloadbyuser', { +======= + const response = await fetch(`${process.env.REACT_APP_API_URL}fndMenu/menuloadbyuser`, { +>>>>>>> 1c0592d (commit new code) method: 'GET', headers: { 'Authorization': 'Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJzeXNhZG1pbiIsInNjb3BlcyI6IlJPTEVfRGV2ZWxvcGVyLFJPTEVfQURNSU4iLCJpYXQiOjE3MTYzNDkyNTEsImV4cCI6MTcxODk0MTI1MX0.fLW0-Uvb6X1fLQNzdiNiYeHO3lMYa1bsFAmOJkGCdRY' diff --git a/src/components/Dashboard/DynamicForm/DynamicForm2.js b/src/components/Dashboard/DynamicForm/DynamicForm2.js index 2b4c25a..eab3a63 100644 --- a/src/components/Dashboard/DynamicForm/DynamicForm2.js +++ b/src/components/Dashboard/DynamicForm/DynamicForm2.js @@ -139,7 +139,11 @@ const DynamicForm2 = () => { const handleBuild = async (id) => { try { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/api/dynamic_form_build`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}api/dynamic_form_build`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); await axios.post( apiUrl, diff --git a/src/components/Dashboard/MenuAccessControl.js b/src/components/Dashboard/MenuAccessControl.js index 8e187de..d0cf199 100644 --- a/src/components/Dashboard/MenuAccessControl.js +++ b/src/components/Dashboard/MenuAccessControl.js @@ -116,7 +116,11 @@ function MenuAccessControl({ selected, Sync }) { useEffect(() => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/api/getAllUsrGrp`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}api/getAllUsrGrp`; +>>>>>>> 1c0592d (commit new code) // const token = localStorage.getItem("CurrentUser"); const token = getToken() const fetchMenuItems = async () => { diff --git a/src/components/Dashboard/MenuAccessControl2.js b/src/components/Dashboard/MenuAccessControl2.js index 2009c11..c3c9554 100644 --- a/src/components/Dashboard/MenuAccessControl2.js +++ b/src/components/Dashboard/MenuAccessControl2.js @@ -1225,7 +1225,11 @@ const MenuAccessControl = () => { const fetchData = async () => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/api1/getusracces1/${usrgrp}`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}api1/getusracces1/${usrgrp}`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); try { setLoading(true); // Start loading diff --git a/src/components/Dashboard/MenuMaintenance.js b/src/components/Dashboard/MenuMaintenance.js index 702d046..7d221a5 100644 --- a/src/components/Dashboard/MenuMaintenance.js +++ b/src/components/Dashboard/MenuMaintenance.js @@ -103,7 +103,11 @@ // const handleSubMenuClick = async (menuItemId) => { // try { +<<<<<<< HEAD // const apiUrl = `http://localhost:9292/api1/submenu1/${menuItemId}`; +======= +// const apiUrl = `http://157.66.191.31:33266/api1/submenu1/${menuItemId}`; +>>>>>>> 1c0592d (commit new code) // const response = await fetch(apiUrl, { // method: 'GET', // headers: { diff --git a/src/components/Dashboard/TOKENRegistry.js b/src/components/Dashboard/TOKENRegistry.js index 29fef9e..e8f3180 100644 --- a/src/components/Dashboard/TOKENRegistry.js +++ b/src/components/Dashboard/TOKENRegistry.js @@ -35,7 +35,11 @@ function TOKENRegistry() { const [loading, setLoading] = useState(true); useEffect(() => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/apiregistery/getall`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}apiregistery/getall`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); const fetchTokens = async () => { diff --git a/src/components/Dashboard/UserMaintenanceView.js b/src/components/Dashboard/UserMaintenanceView.js index ba674a9..c199c8b 100644 --- a/src/components/Dashboard/UserMaintenanceView.js +++ b/src/components/Dashboard/UserMaintenanceView.js @@ -33,7 +33,11 @@ // const [isEditing, setIsEditing] = useState(false); // useEffect(() => { +<<<<<<< HEAD // const apiUrl = `${process.env.REACT_APP_API_URL}/api/getAllAppUser`; +======= +// const apiUrl = `${process.env.REACT_APP_API_URL}api/getAllAppUser`; +>>>>>>> 1c0592d (commit new code) // const token = localStorage.getItem("authToken"); // const fetchAppUsers = async () => { @@ -373,7 +377,11 @@ function UserMaintenanceView() { const [isEditing, setIsEditing] = useState(false); const [loading, setLoading] = useState(true); useEffect(() => { +<<<<<<< HEAD const apiUrl = `${process.env.REACT_APP_API_URL}/api/getAllAppUser`; +======= + const apiUrl = `${process.env.REACT_APP_API_URL}api/getAllAppUser`; +>>>>>>> 1c0592d (commit new code) const token = localStorage.getItem("authToken"); const fetchAppUsers = async () => { diff --git a/src/views/examples/Login.js b/src/views/examples/Login.js index 15195c5..6fdcf44 100644 --- a/src/views/examples/Login.js +++ b/src/views/examples/Login.js @@ -68,10 +68,17 @@ const Login = () => { } try { +<<<<<<< HEAD console.log("Attempting login API request to:", 'http://localhost:9292/token/session'); // API request to authentication endpoint const response = await fetch('http://localhost:9292/token/session', { +======= + console.log("Attempting login API request to:", `${process.env.REACT_APP_API_URL}token/session`); + + // API request to authentication endpoint + const response = await fetch(`${process.env.REACT_APP_API_URL}token/session`, { +>>>>>>> 1c0592d (commit new code) method: "POST", headers: { "Content-Type": "application/json", diff --git a/src/views/examples/Register.js b/src/views/examples/Register.js index 828c189..cfbbdff 100644 --- a/src/views/examples/Register.js +++ b/src/views/examples/Register.js @@ -72,8 +72,13 @@ const Register = () => { */ const checkApiStatus = async () => { try { +<<<<<<< HEAD console.log("Making API status request to http://localhost:9292/auth/status"); const response = await fetch("http://localhost:9292/auth/status", { +======= + console.log("Making API status request to ${process.env.REACT_APP_API_URL}auth/status"); + const response = await fetch(`${process.env.REACT_APP_API_URL}auth/status`, { +>>>>>>> 1c0592d (commit new code) method: "GET", }).catch(() => { console.log("API status request failed"); @@ -164,7 +169,11 @@ const Register = () => { try { console.log("Making API request to send OTP email"); // API call to verify email and send OTP +<<<<<<< HEAD const response = await fetch(`http://localhost:9292/token/user/send_email`, { +======= + const response = await fetch(`${process.env.REACT_APP_API_URL}token/user/send_email `, { +>>>>>>> 1c0592d (commit new code) method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ email }), @@ -222,7 +231,11 @@ const Register = () => { try { console.log("Making API request to verify OTP:", otp); // API call to verify OTP +<<<<<<< HEAD const response = await fetch(`http://localhost:9292/token/user/otp_verification?email=${email}&otp=${otp}`, { +======= + const response = await fetch(`${process.env.REACT_APP_API_URL}token/user/otp_verification?email=${email}&otp=${otp}`, { +>>>>>>> 1c0592d (commit new code) method: "POST", headers: { "Content-Type": "application/json" }, }); @@ -313,7 +326,11 @@ const Register = () => { console.log("Submitting registration data:", JSON.stringify(registrationData, null, 2)); // Make the registration request +<<<<<<< HEAD const response = await fetch("http://localhost:9292/token/addOneAppUser", { +======= + const response = await fetch(`${process.env.REACT_APP_API_URL}token/addOneAppUser`, { +>>>>>>> 1c0592d (commit new code) method: "POST", headers: { "Content-Type": "application/json", @@ -532,7 +549,11 @@ const Register = () => { setError(""); try { +<<<<<<< HEAD const response = await fetch(`http://localhost:9292/token/user/resend_otp?email=${email}`, { +======= + const response = await fetch(`${process.env.REACT_APP_API_URL}token/user/resend_otp?email=${email}`, { +>>>>>>> 1c0592d (commit new code) method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ email }), diff --git a/src/views/examples/resetPassword.js b/src/views/examples/resetPassword.js index 256d24d..8632fbc 100644 --- a/src/views/examples/resetPassword.js +++ b/src/views/examples/resetPassword.js @@ -23,7 +23,11 @@ function ResetPassword() { } try { +<<<<<<< HEAD const response = await fetch(`${process.env.REACT_APP_API_URL}/api/resources/forgotpassword`, { +======= + const response = await fetch(`${process.env.REACT_APP_API_URL}api/resources/forgotpassword`, { +>>>>>>> 1c0592d (commit new code) method: "POST", headers: { "Content-Type": "application/json",