TTMK/web2.0-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '59-chamge-admin-event-date-format' into 'master'

Browse Source 
Update date formats

Closes #59

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!130
This commit is contained in:
Justus Ojala
2024-02-28 16:21:27 +00:00
committed by GitLab
parent 325e51953a a7fff40d74
commit 96a3709f0c
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+12 -12
View File
@@ -6688,9 +6688,9 @@
"dev": true "dev": true
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
"version": "1.15.0", "version": "1.15.5",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
"integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==", "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@@ -7721,9 +7721,9 @@
} }
}, },
"node_modules/ip": { "node_modules/ip": {
"version": "1.1.8", "version": "1.1.9",
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
"integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
"dev": true "dev": true
}, },
"node_modules/is-array-buffer": { "node_modules/is-array-buffer": {
@@ -20077,9 +20077,9 @@
"dev": true "dev": true
}, },
"follow-redirects": { "follow-redirects": {
"version": "1.15.0", "version": "1.15.5",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
"integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==" "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw=="
}, },
"for-each": { "for-each": {
"version": "0.3.3", "version": "0.3.3",
@@ -20828,9 +20828,9 @@
"requires": {} "requires": {}
}, },
"ip": { "ip": {
"version": "1.1.8", "version": "1.1.9",
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
"integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==", "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
"dev": true "dev": true
}, },
"is-array-buffer": { "is-array-buffer": {
src/pages/admin/events/index.tsx
+3 -3
View File
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { NextPage } from "next"; import { NextPage } from "next";
import useSWR from "swr"; import useSWR from "swr";
import { formatRelative } from "date-fns"; import { formatRelative, formatISO } from "date-fns";
import { toast } from "react-toastify"; import { toast } from "react-toastify";
import styled from "styled-components"; import styled from "styled-components";
import AdminListCommon from "@views/admin/AdminListCommon"; import AdminListCommon from "@views/admin/AdminListCommon";
@@ -120,8 +120,8 @@ const Renderer: React.FC = () => {
{events.sort(eventSort).filter(dateFilter).map((event) => ( {events.sort(eventSort).filter(dateFilter).map((event) => (
<tr key={event.id}> <tr key={event.id}>
<td><Link to={`${URL}/${event.id}`}>{event.title_fi}</Link></td> <td><Link to={`${URL}/${event.id}`}>{event.title_fi}</Link></td>
<td>{formatRelative(new Date(event.start_time), new Date())}</td> <td>{formatISO(new Date(event.start_time), { representation: "date" })}</td>
<td>{formatRelative(new Date(event.end_time), new Date())}</td> <td>{formatISO(new Date(event.end_time), { representation: "date" })}</td>
<td> <td>
<StyledButton $colorOverride="red" buttonStyle="filled" onClick={() => confirmDelete(event)}> <StyledButton $colorOverride="red" buttonStyle="filled" onClick={() => confirmDelete(event)}>
Delete Delete
src/pages/admin/feed/index.tsx
+2 -2
View File
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { NextPage } from "next"; import { NextPage } from "next";
import useSWR from "swr"; import useSWR from "swr";
import { formatRelative } from "date-fns"; import { formatRelative, formatISO } from "date-fns";
import { toast } from "react-toastify"; import { toast } from "react-toastify";
import styled from "styled-components"; import styled from "styled-components";
import AdminListCommon from "@views/admin/AdminListCommon"; import AdminListCommon from "@views/admin/AdminListCommon";
@@ -89,7 +89,7 @@ const Renderer: React.FC = () => {
<tr key={post.id}> <tr key={post.id}>
<td><Link to={`${URL}/${post.id}`}>{post.title_fi}</Link></td> <td><Link to={`${URL}/${post.id}`}>{post.title_fi}</Link></td>
<td>{post.description_fi}</td> <td>{post.description_fi}</td>
<td>{formatRelative(new Date(post.publish_time), new Date())}</td> <td>{formatISO(new Date(post.publish_time), { representation: "date" })}</td>
<td> <td>
<StyledButton $colorOverride="red" buttonStyle="filled" onClick={() => confirmDelete(post)}> <StyledButton $colorOverride="red" buttonStyle="filled" onClick={() => confirmDelete(post)}>
Delete Delete
src/pages/admin/jobads/index.tsx
+2 -2
View File
@@ -1,7 +1,7 @@
import React from "react"; import React from "react";
import { NextPage } from "next"; import { NextPage } from "next";
import useSWR from "swr"; import useSWR from "swr";
import { formatRelative } from "date-fns"; import { formatRelative, formatISO } from "date-fns";
import { toast } from "react-toastify"; import { toast } from "react-toastify";
import styled from "styled-components"; import styled from "styled-components";
import AdminListCommon from "@views/admin/AdminListCommon"; import AdminListCommon from "@views/admin/AdminListCommon";
@@ -64,7 +64,7 @@ const Renderer: React.FC = () => {
<td>{ad.description_fi}</td> <td>{ad.description_fi}</td>
<td> <td>
{ad.autohide_enabled {ad.autohide_enabled
? formatRelative(new Date(ad.autohide_at), new Date()) ? formatISO(new Date(ad.autohide_at), { representation: "date" })
: "Disabled"} : "Disabled"}
</td> </td>
<td> <td>
src/pages/admin/signups/index.tsx
+3 -3
View File
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { NextPage } from "next"; import { NextPage } from "next";
import useSWR from "swr"; import useSWR from "swr";
import { formatRelative } from "date-fns"; import { formatRelative, formatISO } from "date-fns";
import { toast } from "react-toastify"; import { toast } from "react-toastify";
import styled from "styled-components"; import styled from "styled-components";
import AdminListCommon from "@views/admin/AdminListCommon"; import AdminListCommon from "@views/admin/AdminListCommon";
@@ -122,8 +122,8 @@ const Renderer: React.FC = () => {
{signupForms.sort(signupFormSort).filter(dateFilter).map((signupForm) => ( {signupForms.sort(signupFormSort).filter(dateFilter).map((signupForm) => (
<tr key={signupForm.id}> <tr key={signupForm.id}>
<td><Link to={`${URL}/${signupForm.id}`}>{signupForm.title_fi}</Link></td> <td><Link to={`${URL}/${signupForm.id}`}>{signupForm.title_fi}</Link></td>
<td>{formatRelative(new Date(signupForm.start_time), new Date())}</td> <td>{formatISO(new Date(signupForm.start_time), { representation: "date" })}</td>
<td>{formatRelative(new Date(signupForm.end_time), new Date())}</td> <td>{formatISO(new Date(signupForm.end_time), { representation: "date" })}</td>
<td><Link to={`${URL}/${signupForm.id}/list`}>View</Link></td> <td><Link to={`${URL}/${signupForm.id}/list`}>View</Link></td>
<td><Link to={`${URL}/${signupForm.id}/email`}>Send</Link></td> <td><Link to={`${URL}/${signupForm.id}/email`}>Send</Link></td>
<td> <td>