gitadmin/admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://128.199.30.231/possibillion/smellika-admin

Browse Source
This commit is contained in:
Sibunnayak 2024-04-02 17:21:19 +05:30
commit b6aeca07dc
9 changed files with 311 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/_nav.js
View File

@ -35,9 +35,9 @@ const _nav = [
}, },
{ {
component: CNavItem, component: CNavItem,
name: "Users", name: "Customers",
icon: <CIcon icon={cilTennisBall} customClassName="nav-icon" />, icon: <CIcon icon={cilTennisBall} customClassName="nav-icon" />,
to: "/users-address", to: "/customers-details",
}, },
// { // {
// component: CNavItem, // component: CNavItem,

35
src/routes.js
View File

@ -91,10 +91,10 @@ import EditTermsConditions from "./views/Content/editTermsConditions";
import EditShippingPolicy from "./views/Content/editShippingPolicy"; import EditShippingPolicy from "./views/Content/editShippingPolicy";
import EditRefundpolicy from "./views/Content/editRefundPolicy"; import EditRefundpolicy from "./views/Content/editRefundPolicy";
import UserTable from "./views/UserAddress/userTable"; import UserTable from "./views/customerDetails/userTable";
import EditUserAddress from "./views/UserAddress/editUserAddress"; // import EditUserAddress from "./views/customerDetails/editUserAddress";
import AddUserAddress from "./views/UserAddress/addUserAddress"; // import AddUserAddress from "./views/customerDetails/addUserAddress";
import ViewAddress from "./views/UserAddress/viewAddress"; import viewDetails from "./views/customerDetails/viewDetails";
import Design from "./views/Design/design"; import Design from "./views/Design/design";
import Banners from "./views/Banner/banner"; import Banners from "./views/Banner/banner";
import RegisterImage from "./views/Images/RegisterImage"; import RegisterImage from "./views/Images/RegisterImage";
@ -118,6 +118,7 @@ import EditTestimonial from "./views/Testimonials/EditTestimonial";
//Blogs //Blogs
import Blogs from "./views/Blog/Blogs"; import Blogs from "./views/Blog/Blogs";
import CreateBlog from "./views/Blog/CreateBlog"; import CreateBlog from "./views/Blog/CreateBlog";
import users from "./views/Users/users";
import UpdateBlog from "./views/Blog/EditBlog"; import UpdateBlog from "./views/Blog/EditBlog";
import ViewBlog from "./views/Blog/ViewBlog"; import ViewBlog from "./views/Blog/ViewBlog";
const routes = [ const routes = [
@ -160,24 +161,24 @@ const routes = [
}, },
{ {
path: "/users-address", path: "/customers-details",
name: "User Table", name: "User Table",
element: UserTable, element: UserTable,
}, },
// {
// path: "/users-address/add",
// name: "User Address",
// element: AddUserAddress,
// },
// {
// path: "/users-address/edit/:id",
// name: "Edit user address",
// element: EditUserAddress,
// },
{ {
path: "/users-address/add", path: "/users-address/view",
name: "User Address",
element: AddUserAddress,
},
{
path: "/users-address/edit/:id",
name: "Edit user address",
element: EditUserAddress,
},
{
path: "/users-address/view/:id",
name: "view address", name: "view address",
element: ViewAddress, element: viewDetails,
}, },
// health care providers // health care providers

253
src/views/Users/users.js
View File

@ -1,153 +1,142 @@
import axios from "axios"; import axios from "axios";
import React, { useEffect, useState, useCallback, useMemo } from "react"; import React, { useEffect, useState, useCallback, useMemo } from "react";
import Pagination from "./Pagination"; import Pagination from "./Pagination";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import swal from 'sweetalert'; import swal from "sweetalert";
// import { API } from "../../data"; // import { API } from "../../data";
import { isAutheticated } from "../../auth"; import { isAutheticated } from "../../auth";
function users() { function users() {
const [users, setUsers] = useState([]) const [users, setUsers] = useState([]);
const [currentPage, setCurrentPage] = useState(1);
const [userPerPage] = useState(10);
const token = isAutheticated();
const [currentPage, setCurrentPage] = useState(1); const getAllUsers = useCallback(async () => {
const [userPerPage] = useState(10); let res = await axios.get(`/api/v1/admin/users`, {
const token = isAutheticated(); headers: {
Authorization: `Bearer ${token}`,
},
});
// console.log(res.data)
setUsers(res.data.users);
}, [token]);
const getAllUsers = useCallback(async () => { useEffect(() => {
let res = await axios.get( getAllUsers();
`/api/v1/admin/users`, }, [getAllUsers]);
{
headers: {
Authorization: `Bearer ${token}`,
},
}
);
// console.log(res.data)
setUsers(res.data.users)
// console.log(cmsRes)
}, [token]); // Get current posts
//pagination
const indexOfLastUser = currentPage * userPerPage;
const indexOfFirstUser = indexOfLastUser - userPerPage;
const currentUser = users.slice(indexOfFirstUser, indexOfLastUser);
useEffect(() => { // Change page
getAllUsers(); const paginate = (pageNumber) => setCurrentPage(pageNumber);
}, [getAllUsers]);
//change time formate
function formatAMPM(date) {
var hours = new Date(date).getHours();
var minutes = new Date(date).getMinutes();
var ampm = hours >= 12 ? "PM" : "AM";
hours = hours % 12;
hours = hours ? hours : 12; // the hour '0' should be '12'
minutes = minutes < 10 ? "0" + minutes : minutes;
var strTime = hours + ":" + minutes + " " + ampm;
return strTime;
}
// console.log(cmsRes) return (
<>
// Get current posts <div className=" main-content">
//pagination <div className=" my-3 page-content">
const indexOfLastUser = currentPage * userPerPage; <div className="container-fluid">
const indexOfFirstUser = indexOfLastUser - userPerPage; {/* <!-- start page title --> */}
const currentUser = users.slice(indexOfFirstUser, indexOfLastUser); <div className="row">
<div className="col-12">
// Change page <div className="page-title-box d-flex align-items-center justify-content-between">
const paginate = pageNumber => setCurrentPage(pageNumber); <h4 className="mb-3"> All Customers</h4>
//change time formate
function formatAMPM(date) {
var hours = new Date(date).getHours();
var minutes = new Date(date).getMinutes();
var ampm = hours >= 12 ? 'PM' : 'AM';
hours = hours % 12;
hours = hours ? hours : 12; // the hour '0' should be '12'
minutes = minutes < 10 ? '0' + minutes : minutes;
var strTime = hours + ':' + minutes + ' ' + ampm;
return strTime;
}
return (
<>
<div className=" main-content">
<div className=" my-3 page-content">
<div className="container-fluid">
{/* <!-- start page title --> */}
<div className="row">
<div className="col-12">
<div className="page-title-box d-flex align-items-center justify-content-between">
<h4 className="mb-3">CMP - All Users</h4>
</div>
</div>
</div>
{/* <!-- end page title --> */}
<div className="row">
<div className="col-lg-12">
<div className="card">
<div className="card-body">
<div className="row ml-0 mr-0 mb-10">
</div>
<div className="table-responsive table-shoot">
<table className="table table-centered table-nowrap mb-0">
<thead className="thead-light">
<tr>
<th>Name</th>
<th>email</th>
<th>Profile Image</th>
<th>Phone No.</th>
<th>Register At</th>
<th>Action</th>
</tr>
</thead>
<tbody>
{currentUser && currentUser.map((item, index) =>
<tr>
<td>{item?.name}</td>
<td>{item?.email}</td>
<td>
<img src={`${item.avatar?.url}`} width="50" alt="" />
</td>
<td>{item?.phone}</td>
<td>
{new Date(`${item?.createdAt}`).toDateString()}<span> , {`${formatAMPM(item?.createdAt)}`}</span>
</td>
<td>
<Link to={`/users/view/${item._id}`}>
<button
type="button"
className="mt-1 btn btn-info btn-sm waves-effect waves-light btn-table ml-2"
>
View
</button>
</Link>
</td>
</tr>
)}
</tbody>
</table>
</div>
{/* <!-- end table-responsive --> */}
</div>
</div>
</div>
</div>
</div>
{/* <!-- container-fluid --> */}
</div> </div>
</div>
</div> </div>
<Pagination userPerPage={userPerPage} {/* <!-- end page title --> */}
totalUsers={users.length}
paginate={paginate} /> <div className="row">
</> <div className="col-lg-12">
); <div className="card">
<div className="card-body">
<div className="row ml-0 mr-0 mb-10"></div>
<div className="table-responsive table-shoot">
<table className="table table-centered table-nowrap mb-0">
<thead className="thead-light">
<tr>
<th>Customer Name</th>
<th>Unique Id </th>
{/* <th>Profile Image</th> */}
<th>Date Registered</th>
<th>Last Purchase</th>
<th>Orders</th>
<th>Action</th>
</tr>
</thead>
<tbody>
{currentUser &&
currentUser.map((item, index) => (
<tr>
<td>{item?.name}</td>
<td>{item?._id}</td>
{/* <td>
<img src={`${item.avatar?.url}`} width="50" alt="" />
</td> */}
<td>
{new Date(
`${item?.createdAt}`
).toDateString()}
<span>
{" "}
, {`${formatAMPM(item?.createdAt)}`}
</span>
</td>
<td>last Purchase</td>
<td>order count </td>
<td>
<Link to={`/users/view/${item._id}`}>
<button
type="button"
className="mt-1 btn btn-info btn-sm waves-effect waves-light btn-table ml-2"
>
View
</button>
</Link>
</td>
</tr>
))}
</tbody>
</table>
</div>
{/* <!-- end table-responsive --> */}
</div>
</div>
</div>
</div>
</div>
{/* <!-- container-fluid --> */}
</div>
</div>
<Pagination
userPerPage={userPerPage}
totalUsers={users.length}
paginate={paginate}
/>
</>
);
} }
export default users; export default users;

0
src/views/UserAddress/addUserAddress.js → src/views/customerDetails/addUserAddress.js
View File

0
src/views/UserAddress/editUserAddress.js → src/views/customerDetails/editUserAddress.js
View File

0
src/views/UserAddress/mainAddress.js → src/views/customerDetails/mainAddress.js
View File

70
src/views/customerDetails/orderDetails.js Normal file
View File

@ -0,0 +1,70 @@
import axios from "axios";
import React, { useState, useEffect } from "react";
import { isAutheticated } from "src/auth";
import swal from "sweetalert";
const OrderDetails = ({ _id, setLoading1 }) => {
const token = isAutheticated();
const [userOrder, setUserOrder] = useState();
// const [loading, setLoading] = useState(true);
const getOrders = async () => {
try {
const response = await axios.get(`/api/v1/admin/users/orders/${_id}`, {
headers: {
Authorization: `Bearer ${token}`,
},
});
setUserOrder(response.data.order);
setLoading1(false);
} catch (error) {
console.error("Error fetching orders:", error);
swal({
title: "Warning",
text: error.message,
icon: "error",
button: "Close",
dangerMode: true,
});
setLoading1(false);
}
};
useEffect(() => {
getOrders();
}, [_id]);
console.log(userOrder, "userOrder");
// if (loading) {
// return <div>Loading...</div>;
// }
return (
<>
<td className="text-start">
{userOrder?.length > 0
? new Date(userOrder[0]?.createdAt).toLocaleString("en-IN", {
weekday: "short",
month: "short",
day: "numeric",
year: "numeric",
hour: "numeric",
minute: "numeric",
hour12: true,
})
: userOrder
? "No Purchase"
: "Error"}
</td>
<td className="text-start">
{userOrder?.length > 0
? userOrder?.length
: userOrder
? "No Order"
: "Error"}
</td>
</>
);
};
export default OrderDetails;

182
src/views/UserAddress/userTable.js → src/views/customerDetails/userTable.js
View File

@ -17,32 +17,34 @@ import {
import SearchIcon from "@mui/icons-material/Search"; import SearchIcon from "@mui/icons-material/Search";
import Fuse from "fuse.js"; import Fuse from "fuse.js";
import { Typography } from "@material-ui/core"; import { Typography } from "@material-ui/core";
import OrderDetails from "./orderDetails";
const UserTable = () => { const UserTable = () => {
const token = isAutheticated(); const token = isAutheticated();
const [query, setQuery] = useState(""); const [query, setQuery] = useState("");
const navigate = useNavigate(); const navigate = useNavigate();
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [loading1, setLoading1] = useState(true);
const [success, setSuccess] = useState(true); const [success, setSuccess] = useState(true);
const [userAddress, setUserAddress] = useState([]); const [users, setUsers] = useState([]);
const [currentPage, setCurrentPage] = useState(1); const [currentPage, setCurrentPage] = useState(1);
const [itemPerPage, setItemPerPage] = useState(10); const [itemPerPage, setItemPerPage] = useState(10);
const [showData, setShowData] = useState(userAddress); const [showData, setShowData] = useState(users);
const handleShowEntries = (e) => { const handleShowEntries = (e) => {
setCurrentPage(1); setCurrentPage(1);
setItemPerPage(e.target.value); setItemPerPage(e.target.value);
}; };
const getUserAddressess = async () => { const getUsers = async () => {
axios axios
.get(`/api/user-address/getAddressess`, { .get(`/api/v1/admin/users`, {
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
}, },
}) })
.then((res) => { .then((res) => {
setUserAddress(res.data?.userAddress); setUsers(res.data.users);
setLoading(false); setLoading(false);
}) })
.catch((error) => { .catch((error) => {
@ -58,57 +60,58 @@ const UserTable = () => {
}; };
useEffect(() => { useEffect(() => {
getUserAddressess(); getUsers();
}, [success]); }, [success]);
console.log(userAddress); console.log(users);
useEffect(() => { useEffect(() => {
const loadData = () => { const loadData = () => {
const indexOfLastPost = currentPage * itemPerPage; const indexOfLastPost = currentPage * itemPerPage;
const indexOfFirstPost = indexOfLastPost - itemPerPage; const indexOfFirstPost = indexOfLastPost - itemPerPage;
setShowData(userAddress.slice(indexOfFirstPost, indexOfLastPost)); setShowData(users.slice(indexOfFirstPost, indexOfLastPost));
}; };
loadData(); loadData();
}, [currentPage, itemPerPage, userAddress]); }, [currentPage, itemPerPage, users]);
console.log(users);
const handleDelete = (id) => { // const handleDelete = (id) => {
swal({ // swal({
title: "Are you sure?", // title: "Are you sure?",
icon: "error", // icon: "error",
buttons: { // buttons: {
Yes: { text: "Yes", value: true }, // Yes: { text: "Yes", value: true },
Cancel: { text: "Cancel", value: "cancel" }, // Cancel: { text: "Cancel", value: "cancel" },
}, // },
}).then((value) => { // }).then((value) => {
if (value === true) { // if (value === true) {
axios // axios
.delete(`/api/user-address/deleteAddress/${id}`, { // .delete(`/api/user-address/deleteAddress/${id}`, {
headers: { // headers: {
"Access-Control-Allow-Origin": "*", // "Access-Control-Allow-Origin": "*",
Authorization: `Bearer ${token}`, // Authorization: `Bearer ${token}`,
}, // },
}) // })
.then((res) => { // .then((res) => {
swal({ // swal({
title: "Deleted", // title: "Deleted",
text: "Address Deleted successfully!", // text: "Address Deleted successfully!",
icon: "success", // icon: "success",
button: "ok", // button: "ok",
}); // });
setSuccess((prev) => !prev); // setSuccess((prev) => !prev);
}) // })
.catch((err) => { // .catch((err) => {
swal({ // swal({
title: "Warning", // title: "Warning",
text: "Something went wrong!", // text: "Something went wrong!",
icon: "error", // icon: "error",
button: "Retry", // button: "Retry",
dangerMode: true, // dangerMode: true,
}); // });
}); // });
} // }
}); // });
}; // };
return ( return (
<div className="main-content"> <div className="main-content">
@ -125,10 +128,10 @@ const UserTable = () => {
" "
> >
<div style={{ fontSize: "22px" }} className="fw-bold"> <div style={{ fontSize: "22px" }} className="fw-bold">
Users All Customers
</div> </div>
<div className="page-title-right"> {/* <div className="page-title-right">
<Button <Button
variant="contained" variant="contained"
color="primary" color="primary"
@ -143,7 +146,7 @@ const UserTable = () => {
> >
Add User Add User
</Button> </Button>
</div> </div> */}
</div> </div>
</div> </div>
</div> </div>
@ -188,12 +191,14 @@ const UserTable = () => {
style={{ background: "rgb(140, 213, 213)" }} style={{ background: "rgb(140, 213, 213)" }}
> >
<tr> <tr>
<th className="text-start">Id</th> <th>Customer Name</th>
<th className="text-start">User Name</th> <th>Unique Id </th>
<th className="text-start">Email</th> {/* <th>Profile Image</th> */}
<th className="text-start">Added On</th> <th>Date Registered</th>
<th className="text-start">Actions</th> <th>Last Purchase</th>
<th>Orders</th>
<th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -211,32 +216,40 @@ const UserTable = () => {
</td> </td>
</tr> </tr>
) : ( ) : (
showData.map((userAddress, i) => { showData.map((user, i) => {
return ( return (
<tr key={i}> <tr key={i}>
<td>{userAddress._id}</td> <td className="text-start">{user.name}</td>
<td className="text-start"> <td>{user._id}</td>
{userAddress.name}
</td>
<td className="text-start">
{userAddress.email}
</td>
<td className="text-start"> <td className="text-start">
{new Date( {new Date(user.createdAt).toLocaleString(
userAddress.createdAt "en-IN",
).toLocaleString("en-IN", { {
weekday: "short", weekday: "short",
month: "short", month: "short",
day: "numeric", day: "numeric",
year: "numeric", year: "numeric",
hour: "numeric", hour: "numeric",
minute: "numeric", minute: "numeric",
hour12: true, hour12: true,
})} }
)}
</td> </td>
{loading1 && (
<>
<td className="text-start">loading...</td>
<td className="text-start">loading...</td>
</>
)}
<OrderDetails
_id={user?._id}
setLoading1={setLoading1}
/>
<td className="text-start"> <td className="text-start">
<Link {/* <Link
to={`/users-address/view/${userAddress._id}`} to={`/users-address/view/${userAddress._id}`}
> >
<button <button
@ -299,6 +312,14 @@ const UserTable = () => {
> >
Delete Delete
</button> </button>
</Link> */}
<Link to={`/users/view/${user._id}`}>
<button
type="button"
className="mt-1 btn btn-info btn-sm waves-effect waves-light btn-table ml-2"
>
View
</button>
</Link> </Link>
</td> </td>
</tr> </tr>
@ -318,11 +339,8 @@ const UserTable = () => {
aria-live="polite" aria-live="polite"
> >
Showing {currentPage * itemPerPage - itemPerPage + 1} to{" "} Showing {currentPage * itemPerPage - itemPerPage + 1} to{" "}
{Math.min( {Math.min(currentPage * itemPerPage, users.length)} of{" "}
currentPage * itemPerPage, {users.length} entries
userAddress.length
)}{" "}
of {userAddress.length} entries
</div> </div>
</div> </div>
@ -370,7 +388,7 @@ const UserTable = () => {
{!( {!(
(currentPage + 1) * itemPerPage - itemPerPage > (currentPage + 1) * itemPerPage - itemPerPage >
userAddress.length - 1 users.length - 1
) && ( ) && (
<li className="paginate_button page-item "> <li className="paginate_button page-item ">
<span <span
@ -389,7 +407,7 @@ const UserTable = () => {
className={ className={
!( !(
(currentPage + 1) * itemPerPage - itemPerPage > (currentPage + 1) * itemPerPage - itemPerPage >
userAddress.length - 1 users.length - 1
) )
? "paginate_button page-item next" ? "paginate_button page-item next"
: "paginate_button page-item next disabled" : "paginate_button page-item next disabled"

0
src/views/UserAddress/viewAddress.js → src/views/customerDetails/viewDetails.js
View File