Commit 7fe6a04a by jaymehta

changes

1 parent 0e13ff9f
import Image from 'next/image';
import { useRouter } from 'next/router';
import React, { useState } from 'react';
import Image from "next/image";
import { useRouter } from "next/router";
import React, { useState } from "react";
import { ToastContainer } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";
const Sidebar = () => {
const router = useRouter();
......@@ -12,7 +13,9 @@ const Sidebar = () => {
};
return (
<div className={`sidebar ${collapsed ? 'collapsed' : ''}`}>
<div className={`sidebar ${collapsed ? "collapsed" : ""}`}>
<ToastContainer position="bottom-right"></ToastContainer>
{/* <button className="toggle-btn" onClick={toggleSidebar}>
Toggle Sidebar
</button> */}
......
......@@ -124,8 +124,7 @@ const monthsArray = [
// import { colourOptions } from '../data';
const animatedComponents = makeAnimated();
const ActivityDetails = ({ isUpdate }) => {
const ActivityApprovalStatus = ({ status }) => {
const ActivityApprovalStatus = ({ status }) => {
if (status) {
switch (status) {
case true:
......@@ -167,7 +166,7 @@ const ActivityApprovalStatus = ({ status }) => {
break;
}
}
};
};
const dispatch = useDispatch();
const { categories } = useSelector(state => state.categories);
const { subCategories } = useSelector(state => state.subCategories);
......@@ -335,25 +334,11 @@ const ActivityApprovalStatus = ({ status }) => {
}
let fromDate;
let toDate;
console.log("timeslots", activityPeriodState);
console.log("timeslots", activityPeriodState, startDate, endDate);
if (!startDate || !endDate) {
fromDate = sanitizeTimeRange({ data: activityPeriodState[0] });
toDate = sanitizeTimeRange({ data: activityPeriodState[1] });
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");
return;
}
......@@ -1054,9 +1039,12 @@ const ActivityApprovalStatus = ({ status }) => {
</div>
<div className="col-6 col-lg-5">
<div className="input-group">
<Button onClick={()=> {
router.push("/vendor/activities")
}} className="btn btn-primary btn-submit">
<Button
onClick={() => {
router.push("/vendor/activities");
}}
className="btn btn-primary btn-submit"
>
See all activities
</Button>
</div>
......
import { Layout } from "antd";
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 ActivityDetails from "../../../components/vendor/ActivityDetails";
import ActivityListingRBAC from "../../../components/vendor/ActivityListingRBAC";
......@@ -12,6 +16,8 @@ import { wrapper } from "../../../redux/store";
const EditActivityDetail = () => {
return (
<Layout>
{/* <ToastContainer position="bottom-right"></ToastContainer> */}
<div className="sidebarContainer">
<Sidebar />
<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!