From 3ec524a110a99db99331f6693505c9a0eda04e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Sepp=C3=A4?= <joasep@utu.fi>
Date: Tue, 14 Mar 2023 11:14:38 +0200
Subject: [PATCH] Made time better formatted
---
messages-app-frontend/src/Message.tsx | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/messages-app-frontend/src/Message.tsx b/messages-app-frontend/src/Message.tsx
index 5d5e1c7..18de699 100644
--- a/messages-app-frontend/src/Message.tsx
+++ b/messages-app-frontend/src/Message.tsx
@@ -12,11 +12,27 @@ type IProps = {
export default class Message extends React.Component<IProps>{
+ formatTime = (date: Date) => {
+ let today = new Date();
+
+ if(date.getDay() === today.getDay()){
+ return "today at " + date.toLocaleTimeString();
+ }
+ else if(date.getDay() === today.getDay()-1){
+ return "yesterday at " + date.toLocaleTimeString();
+ }
+ else{
+ return date.toLocaleString();
+ }
+ }
+
timeCreated = (singleMessage: messageType) => {
if(this.props.singleMessage.createdAt !== undefined){
+ let createdAt = new Date(this.props.singleMessage.createdAt);
+
return (
- <Typography>
- Created at: {this.props.singleMessage.createdAt.toString()}
+ <Typography variant='body2'>
+ Created {this.formatTime(createdAt)}
</Typography>
)
}
@@ -25,9 +41,11 @@ export default class Message extends React.Component<IProps>{
timeModified = (singleMessage: messageType) => {
if(this.props.singleMessage.modifiedAt !== undefined){
+ let modifiedAt = new Date(this.props.singleMessage.modifiedAt);
+
return (
- <Typography>
- Modified at: {this.props.singleMessage.modifiedAt.toString()}
+ <Typography variant="body2">
+ Modified {this.formatTime(modifiedAt)}
</Typography>
)
}
--
GitLab