tcommit
This commit is contained in:
@@ -65,11 +65,7 @@ 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) {
|
||||
|
||||
@@ -57,11 +57,7 @@ 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) {
|
||||
|
||||
@@ -29,11 +29,7 @@
|
||||
// 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) {
|
||||
|
||||
@@ -420,11 +420,7 @@ 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) {
|
||||
|
||||
@@ -34,11 +34,7 @@ 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) {
|
||||
@@ -67,11 +63,7 @@ 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) {
|
||||
|
||||
@@ -12,11 +12,7 @@ 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'
|
||||
|
||||
@@ -139,11 +139,7 @@ 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,
|
||||
|
||||
@@ -116,11 +116,7 @@ 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 () => {
|
||||
|
||||
@@ -1225,11 +1225,7 @@ 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
|
||||
|
||||
@@ -103,11 +103,7 @@
|
||||
|
||||
// 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: {
|
||||
|
||||
@@ -35,11 +35,7 @@ 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 () => {
|
||||
|
||||
@@ -33,11 +33,7 @@
|
||||
// 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 () => {
|
||||
@@ -377,11 +373,7 @@ 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 () => {
|
||||
|
||||
Reference in New Issue
Block a user