Skip to content

Jay Mehta / zango-frontend

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 7fe6a04a by jaymehta
Options

changes

1 parent 0e13ff9f
Inline Side-by-side
Showing 3 changed files with 86 additions and 89 deletions
components/layout/VendorDashboardSidebar.js
import Image from 'next/image'; import Image from "next/image";
import { useRouter } from 'next/router'; import { useRouter } from "next/router";
import React, { useState } from 'react'; import React, { useState } from "react";
import { ToastContainer } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";
const Sidebar = () => { const Sidebar = () => {
const router = useRouter(); const router = useRouter();
const [collapsed, setCollapsed] = useState(false);
const [collapsed, setCollapsed] = useState(false); const toggleSidebar = () => {
setCollapsed(!collapsed);
};
const toggleSidebar = () => { return (
setCollapsed(!collapsed); <div className={`sidebar ${collapsed ? "collapsed" : ""}`}>
}; <ToastContainer position="bottom-right"></ToastContainer>
return ( {/* <button className="toggle-btn" onClick={toggleSidebar}>
<div className={`sidebar ${collapsed ? 'collapsed' : ''}`}>
{/* <button className="toggle-btn" onClick={toggleSidebar}>
Toggle Sidebar Toggle Sidebar
</button> */} </button> */}
<ul> <ul>
<li className={router.pathname === "/vendor/dashboard" ? "active" : ""}> <li className={router.pathname === "/vendor/dashboard" ? "active" : ""}>
<a href="/vendor/dashboard"> <a href="/vendor/dashboard">
<Image alt="" width={22} height={15} src="/images/vendor/icon-dashboard.svg" /> <Image alt="" width={22} height={15} src="/images/vendor/icon-dashboard.svg" />
<span>Dashboard</span> <span>Dashboard</span>
</a> </a>
</li> </li>
<li className={router.pathname === "/vendor/orders" ? "active" : ""}> <li className={router.pathname === "/vendor/orders" ? "active" : ""}>
<a href="/vendor/orders"> <a href="/vendor/orders">
<Image alt="" width={22} height={15} src="/images/vendor/icon-orders.svg" /> <Image alt="" width={22} height={15} src="/images/vendor/icon-orders.svg" />
<span>Orders</span> <span>Orders</span>
</a> </a>
</li> </li>
<li className={router.pathname === "/vendor/activities" ? "active" : ""}> <li className={router.pathname === "/vendor/activities" ? "active" : ""}>
<a href="/vendor/activities"> <a href="/vendor/activities">
<Image alt="" width={22} height={15} src="/images/vendor/icon-activities.svg" /> <Image alt="" width={22} height={15} src="/images/vendor/icon-activities.svg" />
<span>Activities</span> <span>Activities</span>
</a> </a>
</li> </li>
</ul> </ul>
</div> </div>
); );
}; };
export default Sidebar;
\ No newline at end of file \ No newline at end of file
export default Sidebar;
components/vendor/ActivityDetails.js
...@@ -124,50 +124,49 @@ const monthsArray = [ ...@@ -124,50 +124,49 @@ const monthsArray = [
// import { colourOptions } from '../data'; // import { colourOptions } from '../data';
const animatedComponents = makeAnimated(); const animatedComponents = makeAnimated();
const ActivityDetails = ({ isUpdate }) => { const ActivityDetails = ({ isUpdate }) => {
const ActivityApprovalStatus = ({ status }) => {
const ActivityApprovalStatus = ({ status }) => { if (status) {
if (status) { switch (status) {
switch (status) { case true:
case true: return (
return ( <>
<> <div className=" ">
<div className=" "> <div className="alert alert-success alert-dismissible fade show text-center" role="alert">
<div className="alert alert-success alert-dismissible fade show text-center" role="alert"> <div className="text-center">
<div className="text-center"> <span>
<span> <p className=" text-center">
<p className=" text-center"> Activity approved! <CheckCircleTwoTone twoToneColor="#00b33c" />
Activity approved! <CheckCircleTwoTone twoToneColor="#00b33c" /> </p>
</p> </span>
</span> <p className=" text-center">If you make changes, the details will be sent again for approval.</p>
<p className=" text-center">If you make changes, the details will be sent again for approval.</p> </div>
</div> </div>
</div> </div>
</div> </>
</> );
);
case false: case false:
return ( return (
<> <>
<div className="col-12 offset-lg-2 col-lg-8 "> <div className="col-12 offset-lg-2 col-lg-8 ">
<div className="alert alert-danger alert-dismissible fade show text-center" role="alert"> <div className="alert alert-danger alert-dismissible fade show text-center" role="alert">
<div className="text-center"> <div className="text-center">
<p className="p1 text-center">Your profile has been rejected!</p> <p className="p1 text-center">Your profile has been rejected!</p>
<p className="p2 text-center"> Please contact the admin for more details!</p> <p className="p2 text-center"> Please contact the admin for more details!</p>
</div>
</div> </div>
</div> </div>
</div> </>
</> );
);
case "none": case "none":
return <></>; return <></>;
default: default:
break; break;
}
} }
} };
};
const dispatch = useDispatch(); const dispatch = useDispatch();
const { categories } = useSelector(state => state.categories); const { categories } = useSelector(state => state.categories);
const { subCategories } = useSelector(state => state.subCategories); const { subCategories } = useSelector(state => state.subCategories);
...@@ -335,25 +334,11 @@ const ActivityApprovalStatus = ({ status }) => { ...@@ -335,25 +334,11 @@ const ActivityApprovalStatus = ({ status }) => {
} }
let fromDate; let fromDate;
let toDate; let toDate;
console.log("timeslots", activityPeriodState); console.log("timeslots", activityPeriodState, startDate, endDate);
if (!startDate || !endDate) { if (!startDate || !endDate) {
fromDate = sanitizeTimeRange({ data: activityPeriodState[0] }); fromDate = sanitizeTimeRange({ data: activityPeriodState[0] });
toDate = sanitizeTimeRange({ data: activityPeriodState[1] }); toDate = sanitizeTimeRange({ data: activityPeriodState[1] });
if (!activityPeriodState || !activityPeriodState.length > 0) { if (!activityPeriodState || !activityPeriodState.length > 0) {
// let timeSlots = [];
// timeSlots = timeArray.map(item => {
// console.log("sanitizeTimeFormat({ data: item })", sanitizeTimeFormat({ data: item }));
// if (!sanitizeTimeFormat({ data: item })) {
// console.log("sanitize 1", sanitizeTimeFormat({ data: item }));
// toast.error("Time slots can not be empty!");
// setTimeSlotError(true);
// return;
// }
// console.log("sanitize 2", sanitizeTimeFormat({ data: item }));
// timeSlots = [...timeSlots, sanitizeTimeFormat({ data: item })];
// return sanitizeTimeFormat({ data: item });
// });
toast.error("Please select time range"); toast.error("Please select time range");
return; return;
} }
...@@ -1054,9 +1039,12 @@ const ActivityApprovalStatus = ({ status }) => { ...@@ -1054,9 +1039,12 @@ const ActivityApprovalStatus = ({ status }) => {
</div> </div>
<div className="col-6 col-lg-5"> <div className="col-6 col-lg-5">
<div className="input-group"> <div className="input-group">
<Button onClick={()=> { <Button
router.push("/vendor/activities") onClick={() => {
}} className="btn btn-primary btn-submit"> router.push("/vendor/activities");
}}
className="btn btn-primary btn-submit"
>
See all activities See all activities
</Button> </Button>
</div> </div>
......
pages/vendor/activities/[id].js
import { Layout } from "antd"; import { Layout } from "antd";
import React from "react"; import React from "react";
// import { ToastContainer } from "react-toastify";
// import "react-toastify/dist/ReactToastify.css";
// import { ToastContainer } from "react-bootstrap";
import Sidebar from "../../../components/layout/VendorDashboardSidebar"; import Sidebar from "../../../components/layout/VendorDashboardSidebar";
import ActivityDetails from "../../../components/vendor/ActivityDetails"; import ActivityDetails from "../../../components/vendor/ActivityDetails";
import ActivityListingRBAC from "../../../components/vendor/ActivityListingRBAC"; import ActivityListingRBAC from "../../../components/vendor/ActivityListingRBAC";
...@@ -12,6 +16,8 @@ import { wrapper } from "../../../redux/store"; ...@@ -12,6 +16,8 @@ import { wrapper } from "../../../redux/store";
const EditActivityDetail = () => { const EditActivityDetail = () => {
return ( return (
<Layout> <Layout>
{/* <ToastContainer position="bottom-right"></ToastContainer> */}
<div className="sidebarContainer"> <div className="sidebarContainer">
<Sidebar /> <Sidebar />
<div className="content"> <div className="content">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!