vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

Changed text string "Done!" to "Mark task Done!" - to avoid confusion while editing and accidentally marking a task as done when you are done editing details #1294

Closed
dmorlitz wants to merge 2 commits from (deleted):main into main
pull from: (deleted):main
merge into: vikunja:main
Conversation 3 Commits 2 Files Changed 3 +4 -4
dmorlitz commented 2022-01-04 14:27:41 +00:00
Contributor
Copy Link

Changed the label "Done" when editing a task to "Mark task done" to be more specific. This will help avoid accidentally clicking on the "Done" button when you are editing a task because it appears to be the way to close the details page - but it is not.

Changed the label "Done" when editing a task to "Mark task done" to be more specific. This will help avoid accidentally clicking on the "Done" button when you are editing a task because it appears to be the way to close the details page - but it is not.
dmorlitz added 1 commit 2022-01-04 14:27:42 +00:00
frederick commented 2022-01-04 14:30:26 +00:00
Member
Copy Link

Hi dmorlitz!

Thank you for creating a PR!

I've deployed the changes of this PR on a preview environment under this URL: https://1294-main--vikunja-frontend-preview.netlify.app

You can use this url to view the changes live and test them out.
You will need to manually connect this to an api running somehwere. The easiest to use is https://try.vikunja.io/.

Have a nice day!

Beep boop, I'm a bot.

Hi dmorlitz! Thank you for creating a PR! I've deployed the changes of this PR on a preview environment under this URL: https://1294-main--vikunja-frontend-preview.netlify.app You can use this url to view the changes live and test them out. You will need to manually connect this to an api running somehwere. The easiest to use is https://try.vikunja.io/. Have a nice day! > Beep boop, I'm a bot.
dmorlitz added 1 commit 2022-01-04 15:56:19 +00:00
konrad requested changes 2022-01-04 16:15:27 +00:00
konrad left a comment
Owner

Hi! Thanks for the PR.

Please fix the failing test: https://drone.kolaente.de/vikunja/frontend/6334/1/7

The test expects to find a button with the text "Done!" on it - because that's changed the test fails. A good solution would be to add a v-cy="'mark-task-done-button'" to the button and then change the selector of the test to [data-cy="mark-task-done-button"]. That way the test would not depend on the text in the button.

Hi! Thanks for the PR. Please fix the failing test: https://drone.kolaente.de/vikunja/frontend/6334/1/7 The test expects to find a button with the text "Done!" on it - because that's changed the test fails. A good solution would be to add a `v-cy="'mark-task-done-button'"` to the button and then change the selector of the test to `[data-cy="mark-task-done-button"]`. That way the test would not depend on the text in the button.
src/views/tasks/ShowTasks.vue
@ -208,3 +208,3 @@
// We can't use the api sorting here because that sorts tasks with a due date after
// ones without a due date.
this.tasks = tasks.sort((a, b) => {
this.tasks = tasks.sort((b, a) => {
konrad commented 2022-01-04 16:11:39 +00:00
Owner

Why this change?

Why this change?
dpschen commented 2022-01-04 16:17:40 +00:00
Member

It's written in the commit message. But seems like a different issue => should be in different pull reuqest

It's written in the commit message. But seems like a different issue => should be in different pull reuqest
dpschen requested changes 2022-01-04 16:16:58 +00:00
src/i18n/lang/en.json
@ -546,3 +546,3 @@
"chooseEndDate": "Click here to set an end date",
"move": "Move task to a different list",
"done": "Done!",
"done": "Mark task done!",
dpschen commented 2022-01-04 16:14:34 +00:00
Member

The test is now failing. Can you adjust the "Can mark a task as done" test?

Edit: see @konrads comment.

The test is now failing. Can you adjust the "Can mark a task as done" test? **Edit:** see @konrads comment.
src/views/list/views/List.vue
@ -366,4 +366,4 @@ export default {
.list-view .task-add {
padding: 1rem 1rem 0;
}
</style>
dpschen commented 2022-01-04 16:15:59 +00:00
Member

Can you remove these changes?
We try to limit changes that are not necessary.
We want to integrate a formater (prettier). Until then we try to minize diffs to simplify merges.

Can you remove these changes? We try to limit changes that are not necessary. We want to integrate a formater (prettier). Until then we try to minize diffs to simplify merges.
src/views/tasks/ShowTasks.vue
@ -278,4 +278,4 @@ h3 {
.llama-cool {
margin-top: 2rem;
}
</style>
dpschen commented 2022-01-04 16:16:06 +00:00
Member

Can you remove these changes?

Can you remove these changes?
dmorlitz closed this pull request 2022-01-04 17:06:31 +00:00
konrad commented 2022-01-05 13:10:30 +00:00
Owner
Copy Link

@dmorlitz No need to close the PR right away (did we came across as rude? That wasn't our intention)

@dmorlitz No need to close the PR right away (did we came across as rude? That wasn't our intention)
dpschen commented 2022-01-05 15:16:31 +00:00
Member
Copy Link

@dmorlitz No need to close the PR right away (did we came across as rude? That wasn't our intention)

Was not our intention at all!

> @dmorlitz No need to close the PR right away (did we came across as rude? That wasn't our intention) Was not our intention at all!
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
konrad
dpschen
Labels
Clear labels   
area/internal-code

   
changes requested

   
confirmed

   
dependencies

   
duplicate

This issue or pull request already exists

  
good first issue

   
help wanted

Need some help

  
hosting

   
invalid

Something is wrong

  
kind/bug

Something is not working

  
kind/feature

New feature

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
area/internal-code
changes requested
confirmed
dependencies
duplicate
good first issue
help wanted
hosting
invalid
kind/bug
kind/feature
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
4 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: vikunja/frontend#1294
No description provided.
Delete Branch "(deleted):main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?