Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add date of creation in journal #4949

Merged
merged 13 commits into from
Mar 27, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/Models/Journal/Entry.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public function getInfoForJournalEntry()
'month_name' => mb_convert_case(DateHelper::getShortMonth($this->date), MB_CASE_UPPER, 'UTF-8'),
'year' => $this->date->year,
'date' => $this->date,
'created_at' => DateHelper::getShortDateWithTime($this->created_at),
];
}
}
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/langs/en.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/vendor.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
"/js/vendor.js": "/js/vendor.js?id=00e7f0754586d71c64d5",
"/js/app.js": "/js/app.js?id=bef2cb7cade956c77c81",
"/js/vendor.js": "/js/vendor.js?id=65df6699385df5742dbb",
"/js/app.js": "/js/app.js?id=d3b0bb3f5f191081bd3d",
"/css/app-ltr.css": "/css/app-ltr.css?id=96fcb4c95f14e7e346ab",
"/css/app-rtl.css": "/css/app-rtl.css?id=a59d56bd052fc3e3dbcd",
"/css/stripe.css": "/css/stripe.css?id=04066fb482310d18299c",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
<h3 class="mb1">
{{ entry.title }}
</h3>
<p class="mb1">
<span class="pr2 f6 avenir">
{{ $t('journal.journal_created_at', { date: entry.created_at }) }}
</span>
</p>
sktlmarat marked this conversation as resolved.
Show resolved Hide resolved
sktlmarat marked this conversation as resolved.
Show resolved Hide resolved

<span dir="auto" class="markdown" v-html="compiledMarkdown(entry.post)"></span>

Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/journal.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
'journal_add' => 'Add a journal entry',
'journal_edit' => 'Edit a journal entry',
'journal_empty' => 'Empty journal',
'journal_created_at' => 'Created at {date}',
'journal_created_automatically' => 'Created automatically',
'journal_entry_type_journal' => 'Journal entry',
'journal_entry_type_activity' => 'Activity',
Expand Down