From bb03c150c527bf2b5b629b76082851d6b03ccf32 Mon Sep 17 00:00:00 2001 From: Rishabh Kunwar Date: Thu, 2 Dec 2021 16:17:11 +0530 Subject: [PATCH 1/2] fix: some minor bug fixes in event and admin blogs section --- component/admin/AdminNavbar.jsx | 7 +++++-- pages/admin/events/create-event.js | 2 +- pages/admin/events/index.js | 2 +- services/EventService.js | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/component/admin/AdminNavbar.jsx b/component/admin/AdminNavbar.jsx index c8c9781c..b772ba19 100644 --- a/component/admin/AdminNavbar.jsx +++ b/component/admin/AdminNavbar.jsx @@ -4,6 +4,7 @@ import Select from "react-select"; import styles from "../myblogs/blogs.module.scss"; import TagService from "../../services/TagService"; import notify from "../../lib/notify"; +import { useRouter } from 'next/router' export default function AdminNavbar({ changeTag, changeStatus, event }) { const statusOptions = [ @@ -15,6 +16,8 @@ export default function AdminNavbar({ changeTag, changeStatus, event }) { ]; const [tagOptions, setTagOptions] = useState([]); + const router = useRouter() + useEffect(() => { getSettingsTags(); }, []); @@ -91,9 +94,9 @@ export default function AdminNavbar({ changeTag, changeStatus, event }) { placeholder="Select Status" // closeMenuOnSelect={false} />} - } diff --git a/pages/admin/events/create-event.js b/pages/admin/events/create-event.js index 76dfd3a0..a0c9c6bd 100644 --- a/pages/admin/events/create-event.js +++ b/pages/admin/events/create-event.js @@ -96,7 +96,7 @@ export async function getImageUrl(eventData, response) { } const validateForm = (eventDetails, setEventDetailsError) => { - let isValid = false; + let isValid = true; if (eventDetails.organizerName.trim()) { setEventDetailsError((prev) => ({ ...prev, organizerNameError: "" })); } else { diff --git a/pages/admin/events/index.js b/pages/admin/events/index.js index dab219f0..85e340b5 100644 --- a/pages/admin/events/index.js +++ b/pages/admin/events/index.js @@ -213,7 +213,7 @@ const Admin = () => { ) : (
- Oops ! No posts! + Oops ! No Events!
)} diff --git a/services/EventService.js b/services/EventService.js index 88982373..778ac439 100644 --- a/services/EventService.js +++ b/services/EventService.js @@ -51,10 +51,10 @@ async function createNewEvent(userCookie, eventData) { }) if(response){ const res = await getImageUrl(eventData , response) - response = await updateEvent({ + response = await updateEvent(response.data.data.id , { guest_image : res[0], banner_image : res[1] - }, response.data.data.id) + }) return response } } catch (err) { From 4a3f8e7210d7410ee6de542b97fa8ad515240c7e Mon Sep 17 00:00:00 2001 From: Rishabh Kunwar Date: Thu, 2 Dec 2021 16:29:33 +0530 Subject: [PATCH 2/2] fix: hide create event button from admin navbar when not no events page --- component/admin/AdminNavbar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/admin/AdminNavbar.jsx b/component/admin/AdminNavbar.jsx index b772ba19..b573ea7f 100644 --- a/component/admin/AdminNavbar.jsx +++ b/component/admin/AdminNavbar.jsx @@ -94,7 +94,7 @@ export default function AdminNavbar({ changeTag, changeStatus, event }) { placeholder="Select Status" // closeMenuOnSelect={false} />} - {router.pathname.split('/')[2] !== 'blogs' &&