Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
f2edec3
feat: itegrate follow api
rishabhkunwar11 Jan 6, 2022
94ee19d
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Jan 10, 2022
72951be
feat: added view all feature in follower list
rishabhkunwar11 Jan 10, 2022
7464d6a
fix: post count was not properly visible
rishabhkunwar11 Jan 11, 2022
f7cf55f
feat: added event req page
rishabhkunwar11 Jan 28, 2022
4a6816f
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Jan 28, 2022
8a3caf6
fix: request event api integrated
rishabhkunwar11 Jan 28, 2022
b80f4a4
fix: added activity heatmap api
rishabhkunwar11 Jan 28, 2022
f6839c4
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Jan 28, 2022
55a5798
fix: added event filter and status upation
rishabhkunwar11 Feb 7, 2022
24e6e7f
feat: leaderboard ui api #840
jasurobo Feb 8, 2022
c55cacb
Merge pull request #847 from jasirneoito/840/feat-leaderboard
jasirtp Feb 8, 2022
6ed2931
feat: integrated followers api
rishabhkunwar11 Feb 8, 2022
f8d66dc
fix: removed console logs and minor bug fix
rishabhkunwar11 Feb 8, 2022
7829e77
feat: added calender heatmap
rishabhkunwar11 Feb 8, 2022
b81d571
fix: removed console logs
rishabhkunwar11 Feb 8, 2022
c2fe60e
fix: removed console log
rishabhkunwar11 Feb 8, 2022
80f1db0
Merge pull request #850 from Planet-NULLCAST/integrate-follower-api
jasirtp Feb 8, 2022
baea40d
Merge branch 'development' into 808/integrate-activity-calendar-heatmap
kunwar-11 Feb 8, 2022
cb51a74
Merge pull request #852 from kunwar-11/808/integrate-activity-calenda…
jasirtp Feb 8, 2022
4684568
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Feb 8, 2022
bac36a7
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Feb 8, 2022
3aa5b08
fix: removed console log
rishabhkunwar11 Feb 8, 2022
e66f6a6
Merge pull request #853 from Planet-NULLCAST/800/add-event-request-page
jasirtp Feb 8, 2022
610e04b
feat: added event filter and event review for admin
rishabhkunwar11 Feb 8, 2022
c7b7ce0
fix: removed console log
rishabhkunwar11 Feb 8, 2022
4163d31
Merge pull request #854 from kunwar-11/819/fix-added-event-filter
jasirtp Feb 8, 2022
5d31c38
fix: book event #797
jasurobo Feb 8, 2022
6b0b8a3
Merge pull request #855 from jasirneoito/797/feat-book-event
jasirtp Feb 8, 2022
7bb3973
fix: minor bug fix in follow api
rishabhkunwar11 Feb 8, 2022
89423ca
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Feb 8, 2022
a04d66e
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Feb 8, 2022
b2a422b
fix: book event #797
jasurobo Feb 8, 2022
44d850f
fix: minor bug fix
rishabhkunwar11 Feb 8, 2022
56c6ada
Merge pull request #857 from jasirneoito/797/feat-book-event
jasirtp Feb 8, 2022
59e9834
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Feb 8, 2022
1df4fd1
fix: minor bug fixes
rishabhkunwar11 Feb 8, 2022
e87c1a2
Merge branch 'main' of https://github.com/Planet-NULLCAST/curriculum …
rishabhkunwar11 Feb 8, 2022
9403c1a
fix: fixed event ended feature
rishabhkunwar11 Feb 8, 2022
a8ca529
Merge pull request #858 from kunwar-11/798/fix-navigate-user-to-event…
jasirtp Feb 8, 2022
6d3b8f7
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Feb 8, 2022
119f0c9
fix: minor changes
rishabhkunwar11 Feb 8, 2022
8aedf33
fix: minor fixes
rishabhkunwar11 Feb 8, 2022
176b5a1
Merge pull request #856 from kunwar-11/fix-minor-bug-in-follow-api
jasirtp Feb 8, 2022
ae839bb
Merge branch 'development' of https://github.com/Planet-NULLCAST/curr…
rishabhkunwar11 Feb 8, 2022
f67de16
fix: changed put to patch and toast message issue
rishabhkunwar11 Feb 16, 2022
27be827
Merge pull request #865 from kunwar-11/fix/toast-message-issue
jasirtp Feb 21, 2022
dffad64
fix: error toast on login after user verification
thealpha93 Apr 29, 2022
ecdc1b2
fix: preview page redirects to 404
thealpha93 Apr 29, 2022
bf68e63
Merge pull request #882 from Planet-NULLCAST/881-preview-page-redirec…
thealpha93 Apr 29, 2022
a8d8980
feat: js curriculum
ajoneoito Nov 22, 2022
d9f1744
Merge pull request #889 from devpenzil/js-curriculum
that-coder Feb 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 85 additions & 11 deletions component/admin/AdminEventList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,21 @@ function AdminEventList({ events, refresh }) {
notify(err?.response?.data?.message ?? err?.message, "error");
}
}

async function adminEventCheck(eventId, type) {
const updatedStatus = {
status: type
};
try {
const resp = await EventService.adminReviewEvent(eventId, updatedStatus);
if (resp) {
refresh();
}
} catch (error) {
notify(error?.response?.data?.message ?? error?.message, "error");
}
}

const editevent = (id) => {
router.push({
pathname: "events/create-event",
Expand Down Expand Up @@ -49,23 +64,82 @@ function AdminEventList({ events, refresh }) {
<div className="flex ">
<Link href={`/e/${obj.slug}`}>
<a target="_blank">
<div
className={`flex items-center w-28 justify-center rounded-full h-8 mr-3 cursor-pointer ${MyBlogStyles.draftedBg}`}
>
<>
<div
className={`w-2 h-2 mr-2 rounded-full ${MyBlogStyles.draftedDot}`}
></div>

<span
className={`capitalize ${MyBlogStyles.draftedText} `}
>
{obj.status === "published" ? "View" : "Preview"}
</span>
</>
</div>
</a>
</Link>

{obj.status == "published" ? (
<div
className={`flex items-center w-28 justify-center rounded-full h-8 mr-3 cursor-pointer ${MyBlogStyles.draftedBg}`}
className={`flex items-center w-28 justify-center rounded-full h-8 mr-3 ${MyBlogStyles.publishedBg} `}
>
<>
<div
className={`w-2 h-2 mr-2 rounded-full ${MyBlogStyles.draftedDot}`}
></div>

<span
className={`capitalize ${MyBlogStyles.publishedText} `}
>
Published
</span>
</div>
) : obj.status == "rejected" ? (
<div
className={`flex items-center w-28 justify-center rounded-full h-8 mr-3
${MyBlogStyles.dangerBg}`}
>
<span
className={`capitalize ${MyBlogStyles.dangerText}`}
>
Rejected
</span>
</div>
) : (
<div className="flex items-center">
<div
onClick={() => adminEventCheck(obj.id, "rejected")}
className={`flex items-center w-28 justify-center rounded-full h-8 mr-3 cursor-pointer hover:opacity-50 duration-500
${MyBlogStyles.dangerBg}`}
>
<span
className={`capitalize ${MyBlogStyles.draftedText} `}
className={`capitalize ${MyBlogStyles.dangerText}`}
>
{obj.status === "published" ? "View" : "Preview"}
Reject
</span>
</>
</div>
<div
onClick={() => adminEventCheck(obj.id, "published")}
className={`flex items-center w-28 justify-center rounded-full h-8 mr-3 cursor-pointer hover:opacity-50 duration-500 ${MyBlogStyles.successBg} `}
>
<span
className={`capitalize ${MyBlogStyles.successText} `}
>
Publish
</span>
</div>
</div>
</a>
</Link>
)}
{obj.status == "published" && (
<div
onClick={() => adminEventCheck(obj.id, "pending")}
className={`flex items-center w-28 justify-center rounded-full h-8 mr-3 cursor-pointer hover:opacity-50 duration-500 ${MyBlogStyles.warningBg} `}
>
<span
className={`capitalize ${MyBlogStyles.warningText} `}
>
Unpublish
</span>
</div>
)}
{/* {obj.status === "published" && (
<div
className={`flex items-center w-28 justify-center rounded-full h-8 mr-3 ${MyBlogStyles.publishedBg} `}
Expand Down
8 changes: 3 additions & 5 deletions component/admin/AdminNavbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,9 @@ export default function AdminNavbar({ changeTag, changeStatus, event }) {
// closeMenuOnSelect={false}
/>
)}
{event ? (
""
) : (
{
<Select
options={statusOptions}
options={event ? statusOptions.slice(0, 4) : statusOptions}
isMulti={false}
onChange={(e) => selectStatus(e)}
className={`basic-single postFilter md:block hidden m-0 outline-none focus:outline-none text-sm bg-gray-200 border rounded px-0 cursor-pointer ${styles.min_w_10}`}
Expand All @@ -99,7 +97,7 @@ export default function AdminNavbar({ changeTag, changeStatus, event }) {
placeholder="Select Status"
// closeMenuOnSelect={false}
/>
)}
}
{router.pathname.split("/")[2] === "events" && (
<div className="bg-black h-8 ml-4 hover:bg-white border border-black text-white hover:text-black hidden md:flex items-center text-sm font-semibold px-4 py-2 md:mr-3 rounded-sm cursor-pointer duration-700 blogs_h_40px__3sE3c">
<a href="/admin/events/create-event">Create Event</a>
Expand Down
26 changes: 13 additions & 13 deletions component/admin/EventInfo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
className="bg-gray-100 p-4 rounded border-grayBorder border-2"
name="event name"
placeholder="Enter Event Name"
value={eventDetails.eventName}
value={eventDetails?.eventName}
onChange={(e) =>
setEventDetails((prev) => ({
...prev,
Expand All @@ -116,7 +116,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
onBlur={(e) => eventNameValidation(e)}
/>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.eventNameError}
{eventDetailsError?.eventNameError}
</span>}
</div>
<div className="flex flex-col w-full ml-3">
Expand All @@ -131,7 +131,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
className="bg-gray-100 p-4 rounded border-grayBorder border-2"
name="event location"
placeholder="Paste location here"
value={eventDetails.eventLocation}
value={eventDetails?.eventLocation}
onBlur={(e) => eventLocationValidation(e)}
onChange={(e) =>
setEventDetails((prev) => ({
Expand All @@ -141,7 +141,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
}
/>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.eventLocationError}
{eventDetailsError?.eventLocationError}
</span>}
</div>
</div>
Expand All @@ -159,10 +159,10 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
}

}
value={eventDetails.eventDescription}
value={eventDetails?.eventDescription}
/>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.eventDescriptionError}
{eventDetailsError?.eventDescriptionError}
</span>}
</div>
<div className="flex flex-col w-full mb-4">
Expand All @@ -174,14 +174,14 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
className="bg-gray-100 p-4 rounded border-grayBorder border-2"
name="event link"
placeholder="Link Here"
value={eventDetails.eventLink}
value={eventDetails?.eventLink}
onBlur={(e) => eventLinkValidation(e)}
onChange={(e) =>
setEventDetails((prev) => ({ ...prev, eventLink: e.target.value }))
}
/>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.eventLinkError}
{eventDetailsError?.eventLinkError}
</span>}
</div>
<div className="flex justify-center item-center mb-5">
Expand All @@ -195,7 +195,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
min={new Date().toISOString().split('T')[0]}
name="event date"
placeholder="choose"
value={eventDetails.eventDate}
value={eventDetails?.eventDate}
onBlur={(e) => eventDateValidation(e)}
onChange={(e) =>
setEventDetails((prev) => ({
Expand All @@ -205,7 +205,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
}
/>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.eventDateError}
{eventDetailsError?.eventDateError}
</span>}
</div>
<div className="flex flex-col w-full ml-3">
Expand All @@ -217,7 +217,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
className="bg-gray-100 p-4 rounded border-grayBorder border-2"
name="event time"
placeholder="choose"
value={eventDetails.eventTime}
value={eventDetails?.eventTime}
onBlur={(e) => eventTimeValidation(e)}
onChange={(e) =>
setEventDetails((prev) => ({
Expand All @@ -227,7 +227,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
}
/>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.eventTimeError}
{eventDetailsError?.eventTimeError}
</span>}
</div>
</div>
Expand All @@ -249,7 +249,7 @@ export default function EventInfo({ eventDetails, setEventDetails, eventDetailsE
</label>
</div>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.eventImageError}
{eventDetailsError?.eventImageError}
</span>}
</div>
);
Expand Down
12 changes: 6 additions & 6 deletions component/admin/OrganizerInfo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const OrganizerInfo = ({ eventDetails, setEventDetails, eventDetailsError, setEv
<div className="flex items-center">
<div className="relative">
<img
src={`${eventDetails.organizerImage ? eventDetails.organizerImage.name ? image : eventDetails.organizerImage
src={`${eventDetails?.organizerImage ? eventDetails.organizerImage.name ? image : eventDetails.organizerImage
: "/images/svgs/avatar.svg"
}`}
onClick={() => ref.current.click()}
Expand All @@ -60,7 +60,7 @@ const OrganizerInfo = ({ eventDetails, setEventDetails, eventDetailsError, setEv
/>
</label>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.organizerImageError}
{eventDetailsError?.organizerImageError}
</span>}
</div>
</div>
Expand All @@ -77,7 +77,7 @@ const OrganizerInfo = ({ eventDetails, setEventDetails, eventDetailsError, setEv
className="bg-gray-100 p-4 rounded border-grayBorder border-2"
name="organizer name"
placeholder="Organizer Name"
value={eventDetails.organizerName}
value={eventDetails?.organizerName}
onBlur={(e) => organizerNameValidation(e)}
onChange={(e) =>
setEventDetails((prev) => ({
Expand All @@ -87,7 +87,7 @@ const OrganizerInfo = ({ eventDetails, setEventDetails, eventDetailsError, setEv
}
/>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.organizerNameError}
{eventDetailsError?.organizerNameError}
</span>}
</div>
<div className="flex flex-col">
Expand All @@ -99,7 +99,7 @@ const OrganizerInfo = ({ eventDetails, setEventDetails, eventDetailsError, setEv
className="bg-gray-100 p-4 rounded border-grayBorder border-2"
name="Tag Line"
placeholder="Tag here"
value={eventDetails.tagLine}
value={eventDetails?.tagLine}
onBlur={(e) => organizerDesignationValidation(e)}
onChange={(e) =>
setEventDetails((prev) => ({
Expand All @@ -109,7 +109,7 @@ const OrganizerInfo = ({ eventDetails, setEventDetails, eventDetailsError, setEv
}
/>
{<span className="flex items-center font-bold tracking-wide text-red-danger text-xs mt-1 ml-0">
{eventDetailsError.tagLineError}
{eventDetailsError?.tagLineError}
</span>}
</div>
</div>
Expand Down
Loading