Skip to content

Upcoming questions show "closes in x days" instead of "opens in x day" #437

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

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Upcoming questions show "closes in x days" instead of "opens in x day" #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions front_end/src/app/(main)/questions/[id]/components/sidebar/sidebar_question_info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const SidebarQuestionInfo: FC<Props> = ({ postData }) => {
const locale = useLocale();
const t = useTranslations();

const isUpcoming = new Date(postData.open_time).getTime() > Date.now();
return (
<div className="flex flex-col items-start gap-4 self-stretch @container">
<div className="flex flex-col justify-between gap-3 self-stretch @lg:grid @lg:grid-cols-4 @lg:gap-1">
Expand All @@ -30,11 +31,13 @@ const SidebarQuestionInfo: FC<Props> = ({ postData }) => {

<div className="flex justify-between gap-4 @lg:flex-col @lg:justify-start @lg:gap-1">
<span className="text-xs font-medium uppercase text-gray-700 dark:text-gray-700-dark">
{t("opened")}:
{t(isUpcoming ? "opens" : "opened")}:
</span>
<span className="text-sm font-medium leading-4 text-gray-900 dark:text-gray-900-dark">
{postData.published_at &&
formatDate(locale, new Date(postData.published_at))}
{formatDate(
locale,
new Date(isUpcoming ? postData.open_time : postData.published_at)
)}
</span>
</div>

Expand Down
10 changes: 9 additions & 1 deletion front_end/src/components/post_status/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,22 @@ type Props = {
const PostStatus: FC<Props> = ({ resolution, post }) => {
const t = useTranslations();
const locale = useLocale();
const { status, scheduled_close_time, scheduled_resolve_time } = post;
const { status, scheduled_close_time, scheduled_resolve_time, open_time } = post;

const statusInfo = useMemo(() => {
if (status === PostStatusEnum.CLOSED) {
return [t("resolutionPending")];
}

if (status === PostStatusEnum.APPROVED) {
if (new Date(open_time).getTime() > Date.now()) {
return [
t("opens"),
formatRelativeDate(locale, new Date(open_time), {
short: true,
}),
];
}
return [
t("closes"),
formatRelativeDate(locale, new Date(scheduled_close_time), {
Expand Down