Skip to content

Draft: Sync calendar with entries on journal page #62

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

Open
meimeisuns wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Draft: Sync calendar with entries on journal page #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca4c1e9
Set endtime as beginning of month
Sep 21, 2022
167275d
Use end of month as starttime when switching month
Sep 21, 2022
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
23 changes: 22 additions & 1 deletion src/Journal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,18 @@ export default class Journal extends React.Component<
const { entriesSnapshot } = this.state;
const { user } = this.props;
const startTime = moment(date);
const endTime = moment(startTime).subtract(DISPLAY_INTERVAL_DAYS, "days");
const days_ahead_of_month_start = startTime.diff(
moment(startTime).startOf("month"),
"day",
true
);
const is_close_to_month_start =
days_ahead_of_month_start < DISPLAY_INTERVAL_DAYS;
// Initially show entries from only this month if entries
// within display interval cross over into previous month
const endTime = is_close_to_month_start
? moment(startTime).startOf("month")
: moment(startTime).subtract(DISPLAY_INTERVAL_DAYS, "days");

if (entriesSnapshot) {
this.setState({ isLoading: true });
Expand All @@ -203,6 +214,16 @@ export default class Journal extends React.Component<
moment(activeStartDate).endOf("month"),
moment(activeStartDate)
);

// if active date is in current month in time,
// use today (i.e., latest entry). Otherwise, use end of month
const today = moment();
const monthDiff = today.diff(activeStartDate, "month", true);
if (monthDiff <= 1 && monthDiff > 0) {
this.handleNewDateClick(today, null);
} else {
this.handleNewDateClick(moment(activeStartDate).endOf("month"), null);
}
};

fetchHotDates = async (start: moment.Moment, end: moment.Moment) => {
Expand Down