scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-01 19:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Show date along with time in messages (#1748)

Browse Source
This commit is contained in:
Pranav Raj S
2021-02-11 12:10:08 +05:30
committed by GitHub
parent a880845d2b
commit d92a6a3078
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/dashboard/mixins/specs/time.spec.js Normal file
View File

@@ -0,0 +1,10 @@
import TimeMixin from '../time';
describe('#messageStamp', () => {
it('returns correct value', () => {
expect(TimeMixin.methods.messageStamp(1612971343)).toEqual('3:35 PM');
expect(TimeMixin.methods.messageStamp(1612971343, 'LLL d, h:mm a')).toEqual(
'Feb 10, 3:35 PM'
);
});
});

5
app/javascript/dashboard/mixins/time.js
View File

@@ -1,13 +1,12 @@
/* eslint no-console: 0 */
import fromUnixTime from 'date-fns/fromUnixTime';
import format from 'date-fns/format';
import formatDistanceToNow from 'date-fns/formatDistanceToNow';
export default {
methods: {
messageStamp(time) {
messageStamp(time, dateFormat = 'h:mm a') {
const unixTime = fromUnixTime(time);
return format(unixTime, 'h:mm a');
return format(unixTime, dateFormat);
},
dynamicTime(time) {
const unixTime = fromUnixTime(time);