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

Support optional date field for todo items #112

Merged
merged 14 commits into from
Oct 27, 2024
Merged

Support optional date field for todo items #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
eefd442
Move tags field into optional fields expandable section
arnellebalane Oct 13, 2024
51dfd6e
Configure Prettier to organize imports
arnellebalane Oct 13, 2024
9b23985
Add optional date field in TodoForm
arnellebalane Oct 13, 2024
b0dc849
Display todo date in TodoItem component
arnellebalane Oct 20, 2024
c0c2fb9
Open optional fields section when there are values set
arnellebalane Oct 20, 2024
fe777c6
Move todos to the appropriate list based on the todo date
arnellebalane Oct 20, 2024
58cff4d
Move todos to the appropriate list only once per day
arnellebalane Oct 20, 2024
fc84e5d
Add todos settings for toggling optional fields
arnellebalane Oct 20, 2024
70e0653
Add button to clear the date field in the todo form
arnellebalane Oct 20, 2024
50a72fc
Move optional fields into a separate component
arnellebalane Oct 20, 2024
26170f1
Add setting for moving todos to appropriate list automatically
arnellebalane Oct 20, 2024
cab9e9b
Fix logic to determine when date is in the current week
arnellebalane Oct 20, 2024
effe2b9
Rename state for tracking last todos move to moveTodosLastUpdated
arnellebalane Oct 21, 2024
793e00a
Add some unit tests and fix broken integration tests for tags feature
arnellebalane Oct 27, 2024
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
19 changes: 17 additions & 2 deletions .prettierrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,23 @@
"singleQuote": true,
"printWidth": 120,
"bracketSameLine": false,
"plugins": ["prettier-plugin-svelte"],

"plugins": [
"prettier-plugin-svelte",
"@ianvs/prettier-plugin-sort-imports"
],
"importOrder": [
"<BUILTIN _MODULES>",
"<THIRD_PARTY_MODULES>",
"",
"^(@components|.*/components/.*)",
"",
"^@(?!components)",
"^[.]{2}",
"",
"^[.]",
"",
".css$"
],
"overrides": [
{
"files": "*.svelte",
Expand Down
14 changes: 8 additions & 6 deletions cypress/integration/tags.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { faker } from '@faker-js/faker';
import orderBy from 'lodash/orderBy';

import { faker } from '@faker-js/faker';
import { TODOS_EVENTUALLY, TODOS_THIS_WEEK, TODOS_TODAY } from '../../src/features/todos/constants';
import { generateTodo } from '../../src/features/todos/utils/test-helpers';
import { STORAGE_KEY_DATA, STORAGE_KEY_TAGS } from '../lib/constants';
Expand All @@ -23,6 +24,7 @@ describe('tags', () => {
it('can add tags when adding a new todo', () => {
cy.get('[data-cy="add-todo-btn"]').click();
cy.get('[data-cy="todo-form-body"]').type(body);
cy.get('[data-cy="todo-form-optional-fields"]').click();

cy.get('[data-cy="tags-input"]').type(tagOne).focus().trigger('keydown', { code: 'Enter' });
cy.get('[data-cy="tags-input"]').type(tagTwo).focus().trigger('keydown', { code: 'Enter' });
Expand All @@ -34,8 +36,8 @@ describe('tags', () => {
.eq(0)
.within(() => {
cy.get('[data-cy="todo-item-tag"]').should('have.length', 2);
cy.get('[data-cy="todo-item-tag"]').eq(0).should('have.text', tagOne);
cy.get('[data-cy="todo-item-tag"]').eq(1).should('have.text', tagThree);
cy.get('[data-cy="todo-item-tag"]').eq(0).should('contains.text', tagOne);
cy.get('[data-cy="todo-item-tag"]').eq(1).should('contains.text', tagThree);
});
});

Expand All @@ -52,8 +54,8 @@ describe('tags', () => {
.eq(0)
.within(() => {
cy.get('[data-cy="todo-item-tag"]').should('have.length', 2);
cy.get('[data-cy="todo-item-tag"]').eq(0).should('have.text', tagOne);
cy.get('[data-cy="todo-item-tag"]').eq(1).should('have.text', tagThree);
cy.get('[data-cy="todo-item-tag"]').eq(0).should('contains.text', tagOne);
cy.get('[data-cy="todo-item-tag"]').eq(1).should('contains.text', tagThree);
});
});
});
Expand Down Expand Up @@ -95,7 +97,7 @@ describe('tags', () => {

cy.get('[data-cy="todo-item"]').each((element) => {
cy.wrap(element).within(() => {
cy.get('[data-cy="todo-item-tag"]').should('have.length', 1).eq(0).should('have.text', tagTwo);
cy.get('[data-cy="todo-item-tag"]').should('have.length', 1).eq(0).should('contains.text', tagTwo);
});
});
});
Expand Down
Loading