Skip to content

Treat dates as date objects #81

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

Closed
wants to merge 1 commit into from
+199 −171
Closed

Treat dates as date objects #81

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
122 changes: 61 additions & 61 deletions src/lib/ContestTile/ContestTile.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ export const ContestTileUpcoming: Story = (args) => {
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.DARK : ContestTileVariant.LIGHT}
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.COMPACT_DARK : ContestTileVariant.COMPACT_LIGHT }
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
</Fragment>
};
Expand All @@ -85,14 +85,14 @@ export const ContestTileUpcomingRollingTriage: Story = (args) => {
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.DARK : ContestTileVariant.LIGHT}
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.COMPACT_DARK : ContestTileVariant.COMPACT_LIGHT }
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
</Fragment>
};
Expand All @@ -104,14 +104,14 @@ export const ContestTileLive: Story = (args) => {
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.DARK : ContestTileVariant.LIGHT}
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.COMPACT_DARK : ContestTileVariant.COMPACT_LIGHT }
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
</Fragment>
};
Expand All @@ -123,14 +123,14 @@ export const ContestTileLiveCohort1: Story = (args) => {
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.DARK : ContestTileVariant.LIGHT}
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.COMPACT_DARK : ContestTileVariant.COMPACT_LIGHT }
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
</Fragment>
};
Expand All @@ -141,14 +141,14 @@ export const ContestTileLivePreCohort2: Story = (args) => {
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.DARK : ContestTileVariant.LIGHT}
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.COMPACT_DARK : ContestTileVariant.COMPACT_LIGHT }
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
</Fragment>
};
Expand All @@ -159,14 +159,14 @@ export const ContestTileLiveAwaitingCohort3: Story = (args) => {
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.DARK : ContestTileVariant.LIGHT}
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.COMPACT_DARK : ContestTileVariant.COMPACT_LIGHT }
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
</Fragment>
};
Expand All @@ -178,14 +178,14 @@ export const ContestTileEnded: Story = (args) => {
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.DARK : ContestTileVariant.LIGHT}
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
<ContestTile
{...args}
variant={isDark ? ContestTileVariant.COMPACT_DARK : ContestTileVariant.COMPACT_LIGHT }
startDate={new Date(args.contestData.startDate).toISOString()}
endDate={new Date(args.contestData.endDate).toISOString()}
startDate={new Date(args.contestData.startDate)}
endDate={new Date(args.contestData.endDate)}
/>
</Fragment>
};
Expand All @@ -196,10 +196,10 @@ export const BountyTile: Story = (args) => {
return <Fragment>
<ContestTile {...args}
variant={isDark ? ContestTileVariant.DARK : ContestTileVariant.LIGHT}
startDate={new Date(args.bountyData.startDate).toISOString()} />
startDate={new Date(args.bountyData.startDate)} />
<ContestTile {...args}
variant={isDark ? ContestTileVariant.COMPACT_DARK : ContestTileVariant.COMPACT_LIGHT }
startDate={new Date(args.bountyData.startDate).toISOString()} />
startDate={new Date(args.bountyData.startDate)} />
</Fragment>
}

Expand All @@ -216,8 +216,8 @@ ContestTileUpcoming.args = {
...defaultArgs,
contestData: {
...defaultArgs.contestData,
startDate: "2030-07-12T18:00:00Z",
endDate: "2030-07-21T18:00:00.000Z",
startDate: new Date("2030-07-12T18:00:00Z"),
endDate: new Date("2030-07-21T18:00:00.000Z"),
status: AuditStatus.PreAudit,
}
};
Expand All @@ -227,19 +227,19 @@ ContestTileUpcomingRollingTriage.args = {
...defaultArgs.contestData,
cohorts: [{
name: "cohort-1",
pauseTime: addDays(Date.now(), 6).toISOString(),
pauseTime: addDays(Date.now(), 6),
resumeTime: null
}, {
name: "cohort-2",
pauseTime: addDays(Date.now(), 13).toISOString(),
resumeTime: addDays(Date.now(), 9).toISOString(),
pauseTime: addDays(Date.now(), 13),
resumeTime: addDays(Date.now(), 9),
}, {
name: "cohort-3",
pauseTime: null,
resumeTime: addDays(Date.now(), 16).toISOString(),
resumeTime: addDays(Date.now(), 16),
}],
startDate: addDays(Date.now(), 3).toISOString(),
endDate: addDays(Date.now(), 20).toISOString(),
startDate: addDays(Date.now(), 3),
endDate: addDays(Date.now(), 20),
status: AuditStatus.PreAudit,
}
};
Expand All @@ -249,8 +249,8 @@ ContestTileLive.args = {
...defaultArgs,
contestData: {
...defaultArgs.contestData,
startDate: "2023-07-12T18:00:00Z",
endDate: "2030-07-21T18:00:00.000Z",
startDate: new Date("2023-07-12T18:00:00Z"),
endDate: new Date("2030-07-21T18:00:00.000Z"),
status: AuditStatus.Active,
}
};
Expand All @@ -260,19 +260,19 @@ ContestTileLiveCohort1.args = {
...defaultArgs.contestData,
cohorts: [{
name: "cohort-1",
pauseTime: addDays(Date.now(), 4).toISOString(),
pauseTime: addDays(Date.now(), 4),
resumeTime: null
}, {
name: "cohort-2",
pauseTime: addDays(Date.now(), 11).toISOString(),
resumeTime: addDays(Date.now(), 7).toISOString(),
pauseTime: addDays(Date.now(), 11),
resumeTime: addDays(Date.now(), 7),
}, {
name: "cohort-3",
pauseTime: null,
resumeTime: addDays(Date.now(), 14).toISOString(),
resumeTime: addDays(Date.now(), 14),
}],
startDate: subDays(Date.now(), 1).toISOString(),
endDate: addDays(Date.now(), 18).toISOString(),
startDate: subDays(Date.now(), 1),
endDate: addDays(Date.now(), 18),
status: AuditStatus.Active,
}
};
Expand All @@ -282,19 +282,19 @@ ContestTileLivePreCohort2.args = {
...defaultArgs.contestData,
cohorts: [{
name: "cohort-1",
pauseTime: subDays(Date.now(), 1).toISOString(),
pauseTime: subDays(Date.now(), 1),
resumeTime: null
}, {
name: "cohort-2",
pauseTime: addDays(Date.now(), 6).toISOString(),
resumeTime: addDays(Date.now(), 2).toISOString(),
pauseTime: addDays(Date.now(), 6),
resumeTime: addDays(Date.now(), 2),
}, {
name: "cohort-3",
pauseTime: null,
resumeTime: addDays(Date.now(), 9).toISOString(),
resumeTime: addDays(Date.now(), 9),
}],
startDate: subDays(Date.now(), 6).toISOString(),
endDate: addDays(Date.now(), 16).toISOString(),
startDate: subDays(Date.now(), 6),
endDate: addDays(Date.now(), 16),
status: AuditStatus.Paused,
}
};
Expand All @@ -304,19 +304,19 @@ ContestTileLiveAwaitingCohort3.args = {
...defaultArgs.contestData,
cohorts: [{
name: "cohort-1",
pauseTime: subDays(Date.now(), 11).toISOString(),
pauseTime: subDays(Date.now(), 11),
resumeTime: null
}, {
name: "cohort-2",
pauseTime: subDays(Date.now(), 4).toISOString(),
resumeTime: subDays(Date.now(), 8).toISOString(),
pauseTime: subDays(Date.now(), 4),
resumeTime: subDays(Date.now(), 8),
}, {
name: "cohort-3",
pauseTime: null,
resumeTime: subDays(Date.now(), 1).toISOString(),
resumeTime: subDays(Date.now(), 1),
}],
startDate: subDays(Date.now(), 16).toISOString(),
endDate: addDays(Date.now(), 6).toISOString(),
startDate: subDays(Date.now(), 16),
endDate: addDays(Date.now(), 6),
status: AuditStatus.Paused,
}
};
Expand All @@ -325,8 +325,8 @@ ContestTileEnded.args = {
...defaultArgs,
contestData: {
...defaultArgs.contestData,
startDate: "2023-07-12T18:00:00Z",
endDate: "2023-07-21T18:00:00Z",
startDate: new Date("2023-07-12T18:00:00Z"),
endDate: new Date("2023-07-21T18:00:00Z"),
status: AuditStatus.Review,
}
};
Expand All @@ -335,7 +335,7 @@ BountyTile.args = {
htmlId: "",
bountyData: {
amount: "$80,000 USDC",
startDate: "2023-07-12T18:00:00Z",
startDate: new Date("2023-07-12T18:00:00Z"),
repoUrl: "https://github.com/code-423n4/2023-07-axelar",
bountyUrl: "https://code4rena.com/audits/2023-07-axelar-network#top",
ecosystem: "Polkadot" as ContestEcosystem,
Expand Down
8 changes: 4 additions & 4 deletions src/lib/ContestTile/ContestTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ export const ContestCountdown = ({
updateContestStatus: CountdownProps["updateContestStatus"]
}) => {
let text = "Ends in ";
let start = schedule.start.toISOString();
let end = schedule.end.toISOString();
let start = schedule.start;
let end = schedule.end;
if (schedule.contestStatus === Status.UPCOMING) {
text = "Starts in ";
} else if (schedule.contestStatus === Status.LIVE) {
if (schedule.status === AuditStatus.Paused && schedule.resume && +schedule.resume >= Date.now()) {
text = "Next submission phase starts in ";
start = schedule.resume.toISOString();
start = schedule.resume;
} else if (schedule.status === AuditStatus.Paused && schedule.resume && +schedule.resume <= Date.now()) {
// The resume time has elapsed, give a generic time for now
return (
Expand All @@ -149,7 +149,7 @@ export const ContestCountdown = ({
);
} else if (schedule.status === AuditStatus.Active && schedule.pause && +schedule.pause >= Date.now()) {
text = "Current submission phase ends in ";
end = schedule.pause.toISOString();
end = schedule.pause;
}
}
return Countdown({
Expand Down
24 changes: 12 additions & 12 deletions src/lib/ContestTile/ContestTile.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export type ContestEcosystem = "Algorand" | "Aptos" | "Blast" | "Cosmos" | "EVM"
export type CodingLanguage = "Cairo" | "GO" | "HUFF" | "Ink" | "Move" | "Noir" | "Other" | "Rain" | "Rust" | "Rust evm" | "Solidity" | "Vyper" | "Yul";

export interface ContestCohort {
resumeTime: string | null;
pauseTime: string | null;
resumeTime: Date | null;
pauseTime: Date | null;
name: string;
}

Expand Down Expand Up @@ -42,8 +42,8 @@ export interface ContestTileProps {
export interface BountyTileData {
/** Max reward amount for the current bounty. */
amount: string;
/** Date string for the current bounty's start date. */
startDate: string;
/** Date for the current bounty's start date. */
startDate: Date;
/** Absolute url or relative path to the page of the current bounty. */
bountyUrl: string;
/** Absolute url to the bounty's source code. */
Expand Down Expand Up @@ -81,13 +81,13 @@ export interface ContestTileData {
amount: string;
/** Callback function to be triggered on contest time/status changes. */
updateContestStatus?: () => void;
/** Date string for the current contest's start date. */
startDate: string;
/** Date string for the current contest's end date. */
endDate: string;
/** Date for the current contest's start date. */
startDate: Date;
/** Date for the current contest's end date. */
endDate: Date;
/** Boolean indicating certification status of logged in user. Required for viewing certain contests. */
isUserCertified: boolean;
status: AuditStatus;
status: AuditStatus | null;
}

export interface BaseContestSchedule {
Expand All @@ -104,7 +104,7 @@ export interface BaseContestSchedule {
}

export interface ContestSchedule extends BaseContestSchedule {
status: AuditStatus;
status: AuditStatus | null;
end: Date;
/** The time the current cohort will pause. */
pause: Date | null;
Expand All @@ -113,8 +113,8 @@ export interface ContestSchedule extends BaseContestSchedule {
}

export interface CountdownProps {
start: string;
end: string;
start: Date;
end: Date;
text?: string | ReactNode;
updateContestStatus?: () => void;
}
2 changes: 1 addition & 1 deletion src/lib/ContestTile/DefaultTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ function IsBounty({
bountyTimelineObject?: BaseContestSchedule | undefined;
}) {
const { bountyUrl, amount, startDate, ecosystem, languages } = bountyData;
const endDate = "2999-01-01T00:00:00Z"
const endDate = new Date("2999-01-01T00:00:00Z");
let ecosystemLogoName: string = "";
if (ecosystem) {
switch (ecosystem) {
Expand Down
Loading
Loading