git.iko.soy/urbit.org
on master help sign in
fix events slug page dates
commit7319a56f713dcf70eff624463b3d355642fcd1fb authorGavin Atkinson <gvnatknsn@protonmail.com> dateMon 23 Aug 2021, 14:51 (5 years ago) parent1f83666
4 files changed+9−11
compare with master
unifiedsplit
components/Search.js−1 lib/lib.js−1 pages/events/[slug].js+9−7 scripts/event_date_upgrade.js−2
components/Search.js−1
@@ -26,7 +26,6 @@ class Search extends Component {
2626 }
2727
2828 onSelect(item) {
29− console.log(item);
3029 if (item.slug) {
3130 this.props.router.push(item.slug);
3231 }
lib/lib.js−1
@@ -74,7 +74,6 @@ export function getAllPosts(fields = [], key, sort = "date") {
7474 .map((slug) => getPostBySlug(slug, fields, key))
7575 // sort posts by date in descending order
7676 .sort((post1, post2) => {
77− console.log(DateTime.fromISO(post1.date));
7877 if (sort === "date") {
7978 return DateTime.fromISO(post1.date) > DateTime.fromISO(post2.date)
8079 ? -1
pages/events/[slug].js+9−7
@@ -7,6 +7,7 @@ import {
77 getPreviousPost,
88 formatDate,
99 formatTime,
10+ formatTimeZone,
1011 generateDisplayDate,
1112 generateRealtimeDate,
1213} from "../../lib/lib";
@@ -33,9 +34,10 @@ export default function Event({
3334 const starts = generateDisplayDate(event.starts, event.timezone);
3435 const ends = generateDisplayDate(event.ends, event.timezone);
3536
36− const hasEnded = generateRealtimeDate(event.ends) > DateTime.now();
37+ const inFuture = generateRealtimeDate(starts) > DateTime.now();
38+
3739 const happeningNow =
38− generateRealtimeDate(event.starts) > DateTime.now() && !hasEnded;
40+ generateRealtimeDate(event.starts) > DateTime.now() && !inFuture;
3941
4042 return (
4143 <Container>
@@ -53,7 +55,7 @@ export default function Event({
5355 {formatTime(starts)}
5456 <ShowOrHide condition={typeof event.ends !== "undefined"}>
5557 {` to ${formatTime(ends)}`}
56− {" " + starts.toFormat("ZZZZ")}
58+ {" " + formatTimeZone(ends)}
5759 </ShowOrHide>
5860 </p>
5961 <div className="mt-6">
@@ -88,7 +90,7 @@ export default function Event({
8890 </p>
8991 </ShowOrHide>
9092 </div>
91− {hasEnded && event.registration_url ? (
93+ {inFuture && event.registration_url ? (
9294 <div className="table mt-6">
9395 <a
9496 className="button-sm bg-green-400 text-white"
@@ -159,7 +161,7 @@ export async function getStaticProps({ params }) {
159161 "registration_url",
160162 "youtube",
161163 "description",
162− "date",
164+ "starts",
163165 "hosts",
164166 "guests",
165167 "dark",
@@ -180,7 +182,7 @@ export async function getStaticProps({ params }) {
180182 "registration_url",
181183 "youtube",
182184 "description",
183− "date",
185+ "starts",
184186 "hosts",
185187 "guests",
186188 "dark",
@@ -199,7 +201,7 @@ export async function getStaticProps({ params }) {
199201 "registration_url",
200202 "youtube",
201203 "description",
202− "date",
204+ "starts",
203205 "hosts",
204206 "slug",
205207 "guests",
scripts/event_date_upgrade.js−2
@@ -47,7 +47,5 @@ fs.readdirSync(dir, { withFileTypes: true })
4747 options
4848 );
4949
50− console.log(data);
51−
5250 // fs.writeFileSync(path.join(dir, f.name), data);
5351 });