Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct behavior of date formatting

Browse source
This commit is contained in:
Dane Everitt 2019-08-05 22:22:31 -07:00
parent e23f609e7a
commit 1769d191d2
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Transformers/Daemon/FileObjectTransformer.php
View file

@ -38,8 +38,8 @@ class FileObjectTransformer extends BaseDaemonTransformer
'is_symlink' => Arr::get($item, 'symlink', false), 'is_symlink' => Arr::get($item, 'symlink', false),
'is_editable' => in_array(Arr::get($item, 'mime', ''), $this->editable), 'is_editable' => in_array(Arr::get($item, 'mime', ''), $this->editable),
'mimetype' => Arr::get($item, 'mime'), 'mimetype' => Arr::get($item, 'mime'),
'created_at' => Carbon::parse(explode(' ', Arr::get($item, 'created', ''))[0] ?? '')->toIso8601String(), 'created_at' => Carbon::parse(Arr::get($item, 'created', ''))->toIso8601String(),
'modified_at' => Carbon::parse(explode(' ', Arr::get($item, 'modified', ''))[0] ?? '')->toIso8601String(), 'modified_at' => Carbon::parse(Arr::get($item, 'modified', ''))->toIso8601String(),
]; ];
} }

2
resources/scripts/components/server/files/FileObjectRow.tsx
View file

@ -62,7 +62,7 @@ export default ({ file }: { file: FileObject }) => {
{Math.abs(differenceInHours(file.modifiedAt, new Date())) > 48 ? {Math.abs(differenceInHours(file.modifiedAt, new Date())) > 48 ?
format(file.modifiedAt, 'MMM Do, YYYY h:mma') format(file.modifiedAt, 'MMM Do, YYYY h:mma')
: :
distanceInWordsToNow(file.modifiedAt, { includeSeconds: true }) distanceInWordsToNow(file.modifiedAt, { addSuffix: true })
} }
</div> </div>
</a> </a>