diff --git a/package-lock.json b/package-lock.json index 7033c1f..87cc204 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6688,9 +6688,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", - "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "funding": [ { "type": "individual", @@ -7721,9 +7721,9 @@ } }, "node_modules/ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", "dev": true }, "node_modules/is-array-buffer": { @@ -20077,9 +20077,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", - "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==" + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==" }, "for-each": { "version": "0.3.3", @@ -20828,9 +20828,9 @@ "requires": {} }, "ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", "dev": true }, "is-array-buffer": { diff --git a/src/pages/admin/events/index.tsx b/src/pages/admin/events/index.tsx index 46e7579..094cbdd 100644 --- a/src/pages/admin/events/index.tsx +++ b/src/pages/admin/events/index.tsx @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import { NextPage } from "next"; import useSWR from "swr"; -import { formatRelative } from "date-fns"; +import { formatRelative, formatISO } from "date-fns"; import { toast } from "react-toastify"; import styled from "styled-components"; import AdminListCommon from "@views/admin/AdminListCommon"; @@ -120,8 +120,8 @@ const Renderer: React.FC = () => { {events.sort(eventSort).filter(dateFilter).map((event) => ( {event.title_fi} - {formatRelative(new Date(event.start_time), new Date())} - {formatRelative(new Date(event.end_time), new Date())} + {formatISO(new Date(event.start_time), { representation: "date" })} + {formatISO(new Date(event.end_time), { representation: "date" })} confirmDelete(event)}> Delete diff --git a/src/pages/admin/feed/index.tsx b/src/pages/admin/feed/index.tsx index 140ba28..ba589dc 100644 --- a/src/pages/admin/feed/index.tsx +++ b/src/pages/admin/feed/index.tsx @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import { NextPage } from "next"; import useSWR from "swr"; -import { formatRelative } from "date-fns"; +import { formatRelative, formatISO } from "date-fns"; import { toast } from "react-toastify"; import styled from "styled-components"; import AdminListCommon from "@views/admin/AdminListCommon"; @@ -89,7 +89,7 @@ const Renderer: React.FC = () => { {post.title_fi} {post.description_fi} - {formatRelative(new Date(post.publish_time), new Date())} + {formatISO(new Date(post.publish_time), { representation: "date" })} confirmDelete(post)}> Delete diff --git a/src/pages/admin/jobads/index.tsx b/src/pages/admin/jobads/index.tsx index 6672c4c..f56482d 100644 --- a/src/pages/admin/jobads/index.tsx +++ b/src/pages/admin/jobads/index.tsx @@ -1,7 +1,7 @@ import React from "react"; import { NextPage } from "next"; import useSWR from "swr"; -import { formatRelative } from "date-fns"; +import { formatRelative, formatISO } from "date-fns"; import { toast } from "react-toastify"; import styled from "styled-components"; import AdminListCommon from "@views/admin/AdminListCommon"; @@ -64,7 +64,7 @@ const Renderer: React.FC = () => { {ad.description_fi} {ad.autohide_enabled - ? formatRelative(new Date(ad.autohide_at), new Date()) + ? formatISO(new Date(ad.autohide_at), { representation: "date" }) : "Disabled"} diff --git a/src/pages/admin/signups/index.tsx b/src/pages/admin/signups/index.tsx index 703610b..3cf1320 100644 --- a/src/pages/admin/signups/index.tsx +++ b/src/pages/admin/signups/index.tsx @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import { NextPage } from "next"; import useSWR from "swr"; -import { formatRelative } from "date-fns"; +import { formatRelative, formatISO } from "date-fns"; import { toast } from "react-toastify"; import styled from "styled-components"; import AdminListCommon from "@views/admin/AdminListCommon"; @@ -122,8 +122,8 @@ const Renderer: React.FC = () => { {signupForms.sort(signupFormSort).filter(dateFilter).map((signupForm) => ( {signupForm.title_fi} - {formatRelative(new Date(signupForm.start_time), new Date())} - {formatRelative(new Date(signupForm.end_time), new Date())} + {formatISO(new Date(signupForm.start_time), { representation: "date" })} + {formatISO(new Date(signupForm.end_time), { representation: "date" })} View Send diff --git a/src/views/FreshmenPage/FreshmenPageHero.tsx b/src/views/FreshmenPage/FreshmenPageHero.tsx index 014d950..97b77ea 100644 --- a/src/views/FreshmenPage/FreshmenPageHero.tsx +++ b/src/views/FreshmenPage/FreshmenPageHero.tsx @@ -19,7 +19,7 @@ const FreshmenPageHero: React.FC = () => (