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.

Sign up for GitHub

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

Jump to bottom

feat: Add a confirmation to delete a journal entry #4308 #4514

Merged
merged 4 commits into from
Oct 9, 2020
Merged

feat: Add a confirmation to delete a journal entry #4308 #4514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a3b66d
feat: Add a confirmation to delete a journal entry #4308
simonardejr Oct 3, 2020
9a00122
Merge remote-tracking branch 'upstream/master' into 4308-Add-a-confir…
simonardejr Oct 6, 2020
5df22aa
changing native confirm dialog to confirm component
simonardejr Oct 6, 2020
93468f3
building for production (yarn prod)
simonardejr Oct 6, 2020
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
6 changes: 3 additions & 3 deletions public/css/app-ltr.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/css/app-rtl.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/vendor.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
"/js/vendor.js": "/js/vendor.js?id=30196262d2017b9a059e",
"/js/app.js": "/js/app.js?id=bff74b3baecd183e247b",
"/css/app-ltr.css": "/css/app-ltr.css?id=3656924c5fce352ba736",
"/css/app-rtl.css": "/css/app-rtl.css?id=8ee9e03a2fc4b4087b8a",
"/js/vendor.js": "/js/vendor.js?id=74d43287b992d0e25181",
"/js/app.js": "/js/app.js?id=6ff9db58e9bfffe92906",
"/css/app-ltr.css": "/css/app-ltr.css?id=d2a2367de0f3c208746d",
"/css/app-rtl.css": "/css/app-rtl.css?id=3bd996c232ca7d74f063",
"/css/stripe.css": "/css/stripe.css?id=746c8aaac01c56d3cee1",
"/js/stripe.js": "/js/stripe.js?id=31bf2d83f6ef3685ff0b"
}
10 changes: 8 additions & 2 deletions resources/js/components/journal/partials/JournalContentEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
</a>
</li>
<li class="di">
<a v-cy-name="'entry-delete-button-' + entry.id" class="pointer" href="" @click.prevent="trash()">
<confirm :message="$t('journal.delete_confirmation')" @confirm="trash()" v-cy-name="'entry-delete-button-' + entry.id">
{{ $t('app.delete') }}
</a>
</confirm>
</li>
</ul>
</div>
Expand All @@ -53,8 +53,14 @@
</template>

<script>
import Confirm from '../../partials/Confirm.vue';

export default {

components: {
Confirm,
},

props: {
journalEntry: {
type: Object,
Expand Down