From f274089c6a3a98453b47254de1f6257c2adaa87f Mon Sep 17 00:00:00 2001
From: Nadun Sanjeevana <108867149+NadunSanjeevana@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:19:16 +0530
Subject: [PATCH 01/39] manage user
---
src/api/ManageUser/users.js | 52 ++++++++
src/api/report/getReports.js | 46 +++++--
src/layouts/admin/manageuser/data/userData.js | 121 +++++++++---------
3 files changed, 147 insertions(+), 72 deletions(-)
create mode 100644 src/api/ManageUser/users.js
diff --git a/src/api/ManageUser/users.js b/src/api/ManageUser/users.js
new file mode 100644
index 0000000..7abc093
--- /dev/null
+++ b/src/api/ManageUser/users.js
@@ -0,0 +1,52 @@
+import axios from "axios";
+import baseURL from "config";
+
+// Function to delete a user
+export async function deleteUser(userId) {
+ try {
+ const response = await axios.post(`${baseURL}/delete-user`, { user_ID: userId });
+ if (response.status === 200) {
+ console.log(response.data.message); // Assuming the response has a message field
+ } else {
+ console.error("Failed to delete user:", response.statusText);
+ }
+ } catch (error) {
+ console.error("Error deleting user:", error);
+ throw error;
+ }
+}
+
+// Function to edit user details
+export async function editUser(userId, updatedData) {
+ try {
+ const response = await axios.post(`${baseURL}/updateUser`, {
+ userId: userId,
+ fullName: updatedData.fullName,
+ mobile: updatedData.contactNumber,
+ profession: updatedData.profession,
+ });
+ if (response.status === 200) {
+ console.log(response.data.message); // Assuming the response has a message field
+ } else {
+ console.error("Failed to edit user:", response.statusText);
+ }
+ } catch (error) {
+ console.error("Error editing user:", error);
+ throw error;
+ }
+}
+
+// Function to get the list of users
+export async function getUserList() {
+ try {
+ const response = await axios.get(`${baseURL}/getAllUsers`);
+ if (response.status === 200) {
+ return response.data;
+ } else {
+ console.error("Failed to fetch user list:", response.statusText);
+ }
+ } catch (error) {
+ console.error("Error fetching user list:", error);
+ throw error;
+ }
+}
diff --git a/src/api/report/getReports.js b/src/api/report/getReports.js
index 179dbc9..1bbb9b0 100644
--- a/src/api/report/getReports.js
+++ b/src/api/report/getReports.js
@@ -1,25 +1,47 @@
import axios from "axios";
import baseURL from "config";
-// Function to fetch a saved PDF report from the backend
-export async function getReportPdf(reportId) {
+// Function to delete a user
+export async function deleteUser(userId) {
try {
- const response = await axios.get(`${baseURL}/view-pdf?ReportID=${reportId}`, {
- responseType: "blob", // Specify the response type as a blob
- });
+ const response = await axios.delete(`${baseURL}/users/${userId}`);
+ if (response.status === 200) {
+ console.log(`User with ID ${userId} has been deleted`);
+ } else {
+ console.error("Failed to delete user:", response.statusText);
+ }
+ } catch (error) {
+ console.error("Error deleting user:", error);
+ throw error;
+ }
+}
+// Function to edit user details
+export async function editUser(userId, updatedData) {
+ try {
+ const response = await axios.put(`${baseURL}/users/${userId}`, updatedData);
if (response.status === 200) {
- // Create a blob URL for the PDF data
- const blob = new Blob([response.data], { type: "application/pdf" });
- const url = window.URL.createObjectURL(blob);
+ console.log(`User with ID ${userId} has been updated`);
+ } else {
+ console.error("Failed to edit user:", response.statusText);
+ }
+ } catch (error) {
+ console.error("Error editing user:", error);
+ throw error;
+ }
+}
- // Open the PDF in a new tab
- window.open(url, "_blank");
+// Function to get the list of users
+export async function getUserList() {
+ try {
+ const response = await axios.get(`${baseURL}/users`);
+ if (response.status === 200) {
+ return response.data;
} else {
- console.error("Failed to fetch PDF report:", response.statusText);
+ console.error("Failed to fetch user list:", response.statusText);
}
} catch (error) {
- console.error("Error fetching PDF report:", error);
+ console.error("Error fetching user list:", error);
throw error;
}
}
diff --git a/src/layouts/admin/manageuser/data/userData.js b/src/layouts/admin/manageuser/data/userData.js
index 9b144ad..7b4e64f 100644
--- a/src/layouts/admin/manageuser/data/userData.js
+++ b/src/layouts/admin/manageuser/data/userData.js
@@ -1,102 +1,103 @@
-/* eslint-disable react/prop-types */
-/* eslint-disable react/function-component-definition */
-/**
- * =========================================================
- * Material Dashboard 2 React - v2.2.0
- * =========================================================
- *
- * Product Page: https://www.creative-tim.com/product/material-dashboard-react
- * Copyright 2023 Creative Tim (https://www.creative-tim.com)
- *
- * Coded by www.creative-tim.com
- *
- * =========================================================
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- */
-
-// Material Dashboard 2 React components
import MDBox from "components/MDBox";
import MDTypography from "components/MDTypography";
import MDBadge from "components/MDBadge";
import { useEffect, useState } from "react";
-import { getReportList } from "api/report/reportsdata";
+import { deleteUser, editUser, getUserList } from "api/ManageUser/users";
+import PropTypes from "prop-types";
export default function Data() {
- const Job = ({ title, description }) => (
+ const UserDetails = ({ name, email }) => (
- {title}
+ {name}
- {description}
+ {email}
);
- const [reportDetails, setReportsDetails] = useState([]);
+ UserDetails.propTypes = {
+ name: PropTypes.string.isRequired,
+ email: PropTypes.string.isRequired,
+ };
+ const [userDetails, setUserDetails] = useState([]);
useEffect(() => {
- // Fetch average price data from the Flask API endpoint
- getReportList()
+ getUserList()
.then((data) => {
- setReportsDetails(data);
- console.log(data); // Use 'data' instead of 'reportDetails'
+ setUserDetails(data);
+ console.log(data);
})
.catch((error) => {
- console.error("Error fetching data:", error);
+ console.error("Error fetching user data:", error);
});
}, []);
- const handleDownload = (pdf_Url) => {
- if (pdf_Url) {
- // Create an anchor element to trigger the download
- const anchor = document.createElement("a");
- anchor.href = pdf_Url;
- anchor.target = "_blank"; // Open the link in a new tab
- anchor.download = "your_file_name.ext"; // Replace with the desired file name
+ const handleUserDelete = (userId) => {
+ if (userId) {
+ // Add code to delete the user using the user ID
+ deleteUser(userId);
+ } else {
+ console.error("User ID is not available.");
+ }
+ };
- // Trigger the download
- anchor.click();
+ const handleUserEdit = (userId) => {
+ if (userId) {
+ // Add code to edit the user using the user ID
+ editUser(userId);
} else {
- console.error("Download URL is not available.");
+ console.error("User ID is not available.");
}
};
return {
columns: [
- { Header: "User", accessor: "author", align: "left" },
- { Header: "Profession", accessor: "function", align: "left" },
- { Header: "Status", accessor: "status", align: "center" },
- { Header: "Last Seen", accessor: "employed", align: "center" },
+ { Header: "Name", accessor: "name", align: "left" },
+ { Header: "Email", accessor: "email", align: "left" },
+ { Header: "Role", accessor: "role", align: "center" },
+ { Header: "Last Seen", accessor: "lastSeen", align: "center" },
{ Header: "Manage", accessor: "action", align: "center" },
],
- rows: reportDetails.map((report) => ({
- author: (
+ rows: userDetails.map((user) => ({
+ name: (
- {report.Title}
+ {user.Full_Name}
),
- function: ,
- status: (
+ email: ,
+ role: (
-
+
),
- employed: (
+ lastSeen: (
- {report.timestamp}
+ {user.lastSeen}
),
action: (
- handleDownload(report.PDF_URL)} // Use an arrow function
- >
- Download
-
+
+ handleUserDelete(user._id)} // Use an arrow function
+ >
+ Delete
+
+ handleUserEdit(user._id)} // Use an arrow function
+ >
+ Edit
+
+
),
})),
};
From 08a087d042ecfc47b3054df53939f65f716ffd1a Mon Sep 17 00:00:00 2001
From: Chanuka Lakshan Chandra Yapa
<118423471+Chanuka-ChandraYapa@users.noreply.github.com>
Date: Tue, 17 Oct 2023 16:37:08 +0530
Subject: [PATCH 02/39] update admin submit advertisement section
---
.../admin/submitadvertisement/submitad.js | 73 ++++++++++++++--
.../profile/components/Header/index.js | 26 +++++-
.../components/Header/updateprofile.js | 86 +++++++++++++++++++
3 files changed, 176 insertions(+), 9 deletions(-)
create mode 100644 src/layouts/profile/components/Header/updateprofile.js
diff --git a/src/layouts/admin/submitadvertisement/submitad.js b/src/layouts/admin/submitadvertisement/submitad.js
index a1ad889..0fa9f17 100644
--- a/src/layouts/admin/submitadvertisement/submitad.js
+++ b/src/layouts/admin/submitadvertisement/submitad.js
@@ -160,8 +160,10 @@ import Box from "@mui/material/Box";
import CloudUploadIcon from "@mui/icons-material/CloudUpload";
import DashboardLayout from "examples/LayoutContainers/DashboardLayout";
import DashboardNavbar from "examples/Navbars/DashboardNavbar";
-import { Card } from "@mui/material";
+import { Card, Menu, MenuItem } from "@mui/material";
import MDButton from "components/MDButton";
+import MDBox from "components/MDBox";
+import MDInput from "components/MDInput";
function AdvertisementForm() {
const [formData, setFormData] = useState({
@@ -198,7 +200,7 @@ function AdvertisementForm() {
// Define form fields based on category
let categoryFields;
- if (formData.category === "landsale") {
+ if (formData.category === "Land Sale") {
categoryFields = (
<>
@@ -312,7 +314,7 @@ function AdvertisementForm() {
);
- } else if (formData.category === "housesale") {
+ } else if (formData.category === "House Sale") {
categoryFields = (
<>
@@ -415,7 +417,7 @@ function AdvertisementForm() {
{/* Add more fields for housesale */}
);
- } else if (formData.category === "marriageproposals") {
+ } else if (formData.category === "Marriage Proposals") {
categoryFields = (
<>
@@ -557,6 +559,42 @@ function AdvertisementForm() {
);
}
+ // const handleChangeMenu = (event) => {};
+
+ const [categoryMenu, setCategoryMenu] = useState(null);
+
+ const openCategoryMenu = ({ currentTarget }) => setCategoryMenu(currentTarget);
+ const closeCategoryMenu = () => setCategoryMenu(null);
+ const [category, setCategory] = useState("");
+
+ const handleCategoryMenuItemClick = (dataKey) => {
+ setCategory(dataKey);
+ formData.category = dataKey;
+ closeCategoryMenu();
+ };
+
+ const renderCategoryMenu = (
+
+ );
return (
@@ -566,18 +604,37 @@ function AdvertisementForm() {
Submit Advertisement