Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix publication #114

Merged
merged 3 commits into from
Apr 7, 2024
+72 −97
Merged

Fix publication #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25c1e30
Date
Udito3 Apr 7, 2024
65dac25
Avatar
Udito3 Apr 7, 2024
e8f549b
Fix send publication
Udito3 Apr 7, 2024
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
104 changes: 47 additions & 57 deletions components/modals/Preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import React from 'react';
import { useTheme } from '@/utils/provider/ThemeProvider';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faCalendar, faClose, faEllipsisVertical } from '@fortawesome/free-solid-svg-icons';
import { MDXEditor, linkPlugin, linkDialogPlugin } from '@mdxeditor/editor';
import Constants from '@/utils/constants';
import Modal from './Modal';
import EventDateAndImage from '../EventDateAndImage';
import Markdown from 'react-markdown';
import style from '@/markdown-styles.module.css';
import dayjs from 'dayjs';
import Avatar from '../Avatar';

export interface PreviewInfos {
news: string;
Expand All @@ -35,6 +35,47 @@ interface Props {
export default function Preview({ locale, infos, onClosePreview }: Props) {
const { isLight } = useTheme();

function formatDateRange(infos: PreviewInfos) {
let formattedDate;

// If there is only a start date or start date and end date have the same day and month
if (
infos.eventStartDate &&
(!infos.eventEndDate ||
(dayjs(infos.eventStartDate).day() === dayjs(infos.eventEndDate).day() &&
dayjs(infos.eventStartDate).month() === dayjs(infos.eventEndDate).month()))
) {
formattedDate = <p>{dayjs(infos.eventStartDate).format('D MMMM YYYY')}</p>;
}
// If there is a start date and an end date with the same month
else if (
infos.eventStartDate &&
infos.eventEndDate &&
dayjs(infos.eventStartDate).month() === dayjs(infos.eventEndDate).month()
) {
formattedDate = (
<p>
{dayjs(infos.eventStartDate).format('D')} - {dayjs(infos.eventEndDate).format('D MMMM YYYY')}
</p>
);
}
// If there is a start date and an end date not in the same month
else if (
infos.eventStartDate &&
infos.eventEndDate &&
dayjs(infos.eventStartDate).month() !== dayjs(infos.eventEndDate).month()
) {
formattedDate = (
<>
<p>{dayjs(infos.eventStartDate).format('D MMMM YYYY')} - </p>
<p>{dayjs(infos.eventEndDate).format('D MMMM YYYY')}</p>
</>
);
}

return formattedDate;
}

return (
<Modal>
<div className="flex justify-between">
Expand Down Expand Up @@ -72,60 +113,7 @@ export default function Preview({ locale, infos, onClosePreview }: Props) {
</div>
<div>
<p>{infos.eventDateTitle}</p>
{infos.eventStartDate && (
<>
{/* If there is only a start date */}
{infos.eventStartDate && !infos.eventEndDate && (
<p>
{new Date(infos.eventStartDate).toLocaleDateString(locale, {
day: 'numeric',
month: 'long',
year: 'numeric',
})}
</p>
)}
{/* If there is a start date and a end date with the same month */}
{infos.eventStartDate &&
infos.eventEndDate &&
new Date(infos.eventStartDate).getMonth() === new Date(infos.eventEndDate).getMonth() && (
<p>
{new Date(infos.eventStartDate).toLocaleDateString(locale, {
day: 'numeric',
})}
{' - '}
{new Date(infos.eventEndDate).toLocaleDateString(locale, {
day: 'numeric',
})}{' '}
{new Date(infos.eventStartDate).toLocaleDateString(locale, {
month: 'long',
year: 'numeric',
})}
</p>
)}
{/* If there is a start date and a end date not in the same month */}
{infos.eventStartDate &&
infos.eventEndDate &&
new Date(infos.eventStartDate).getMonth() !== new Date(infos.eventEndDate).getMonth() && (
<>
<p>
{new Date(infos.eventStartDate).toLocaleDateString(locale, {
day: 'numeric',
month: 'long',
year: 'numeric',
})}
{' - '}
</p>
<p>
{new Date(infos.eventEndDate).toLocaleDateString(locale, {
day: 'numeric',
month: 'long',
year: 'numeric',
})}
</p>
</>
)}
</>
)}
{infos.eventStartDate && formatDateRange(infos)}
</div>
</div>
</div>
Expand All @@ -139,7 +127,9 @@ export default function Preview({ locale, infos, onClosePreview }: Props) {
isLight ? 'bg-red' : 'bg-gray-700'
}`}
>
<div className="flex bg-white rounded-full h-10 w-10 mr-2 my-1"></div>
<div className="flex mr-2 my-1">
<Avatar size="h-10 w-10" />
</div>
<div>
<p className="font-bold text-sm">{infos.author}</p>
<p className="text-xs text-white">{infos.activityArea}</p>
Expand Down
65 changes: 25 additions & 40 deletions components/modals/PublicationDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import Markdown from 'react-markdown';
import style from '@/markdown-styles.module.css';
import { ActivityArea, getActivityAreaName } from '@/models/activity-area';
import dayjs from 'dayjs';
import { useLoading } from '@/utils/provider/LoadingProvider';

const EditorComp = dynamic(() => import('../EditorComponent'), { ssr: false });

Expand Down Expand Up @@ -58,7 +59,7 @@ export default function PublicationDetails({
user = publication.organizer;
}

const [, startTransition] = useTransition();
const { startTransition } = useLoading();
const [title, setTitle] = useState(publication?.title || '');
const [imageSrc, setImageSrc] = useState(publication?.imageUrl || '');
const [imageBinary, setImageBinary] = useState<Blob>();
Expand Down Expand Up @@ -131,36 +132,29 @@ export default function PublicationDetails({
};

const [missingFields, setMissingFields] = useState<string[]>([]);
const isSubmittingRef = useRef(false);
const createOrUpdate = (formData: FormData) => {
if (isSubmittingRef.current) {
return;
}

isSubmittingRef.current = true;

const newMissingFields = [];
if (!title) newMissingFields.push(t('modal.title'));
if (!imageSrc) newMissingFields.push(t('modal.image'));
if (!imageAltText) newMissingFields.push(t('modal.alt-text'));
if (!content) newMissingFields.push(t('modal.content'));
if (!eventStartDate) newMissingFields.push(t('modal.event-start-date'));
if (!eventEndDate) newMissingFields.push(t('modal.event-end-date'));
if (!publishedDate) newMissingFields.push(t('modal.published-date'));

setMissingFields(newMissingFields);

if (newMissingFields.length > 0) {
setToast(`${t('modal.error-toast-message')}: ${newMissingFields.join(', ')}`, AlertType.error);
return;
}
startTransition(async () => {
const newMissingFields = [];
if (!title) newMissingFields.push(t('modal.title'));
if (!imageSrc) newMissingFields.push(t('modal.image'));
if (!imageAltText) newMissingFields.push(t('modal.alt-text'));
if (!content) newMissingFields.push(t('modal.content'));
if (!eventStartDate) newMissingFields.push(t('modal.event-start-date'));
if (!eventEndDate) newMissingFields.push(t('modal.event-end-date'));
if (!publishedDate) newMissingFields.push(t('modal.published-date'));

setMissingFields(newMissingFields);

if (newMissingFields.length > 0) {
setToast(`${t('modal.error-toast-message')}: ${newMissingFields.join(', ')}`, AlertType.error);
return;
}

if (new Date(eventEndDate).getTime() < new Date(eventStartDate).getTime()) {
setToast(t('modal.date-error-toast-message'), AlertType.error);
return;
}
if (new Date(eventEndDate).getTime() < new Date(eventStartDate).getTime()) {
setToast(t('modal.date-error-toast-message'), AlertType.error);
return;
}

startTransition(async () => {
var helloEvent;
formData = updateFormData(formData);

Expand All @@ -175,7 +169,6 @@ export default function PublicationDetails({
helloEvent ? AlertType.success : AlertType.error
);

isSubmittingRef.current = false;
if (!helloEvent) return;
else onClose();
});
Expand Down Expand Up @@ -296,26 +289,18 @@ export default function PublicationDetails({
);
};

const isSubmittingDraftRef = useRef(false);
const handleDraft = async () => {
if (isSubmittingDraftRef.current) {
return;
}

isSubmittingDraftRef.current = true;

const formData = new FormData();
const updatedFormData = updateFormData(formData, true);

startTransition(async () => {
const formData = new FormData();
const updatedFormData = updateFormData(formData, true);

const helloEvent = await draftAPublication(updatedFormData);

setToast(
t(`modal.draft-${helloEvent ? 'success' : 'error'}-toast-message`),
helloEvent ? AlertType.success : AlertType.error
);

isSubmittingDraftRef.current = false;
if (helloEvent) onClose();
});
};
Expand Down
Loading