-
Notifications
You must be signed in to change notification settings - Fork 1k
Delete account: design improvements #2682
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
Open
nqst
wants to merge
16
commits into
basecamp:main
Choose a base branch
from
nqst:delete-account-improvements
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
74dc92f
Update wording
nqst 615ac94
Add styles for danger zone section
nqst 932d408
Extract generic `.checkbox` from `.step__checkbox`
nqst 04bf063
Make the Delete account dialog more careful
nqst 7ddd853
Adjust wording
nqst d0bdc16
Adjust spacing
nqst ae96509
`.step__checkbox` is now unused
nqst eac7509
Reset checkbox when cancellation dialog closes
nqst f603468
Cleanup
nqst 33c5e0d
Cleanup
nqst 0555523
Merge branch 'main' into delete-account-improvements
nqst 1315e73
Format
nqst 46943dc
Use Cancel instead of Delete
nqst c977d03
Use `fire()` instead of `dispatch()`
nqst 754e2e3
Cancel → Delete
nqst 6d6f94c
Merge branch 'main' into delete-account-improvements
nqst File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import { Controller } from "@hotwired/stimulus" | ||
|
|
||
| export default class extends Controller { | ||
| static values = { name: String } | ||
|
|
||
| fire() { | ||
| this.dispatch(this.nameValue, { target: document, prefix: false }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,20 @@ | ||
| import { Controller } from "@hotwired/stimulus" | ||
|
|
||
| export default class extends Controller { | ||
| static targets = [ "element" ] | ||
| static targets = [ "element", "checkbox" ] | ||
|
|
||
| toggle() { | ||
| this.elementTargets.forEach((element) => { | ||
| element.toggleAttribute("disabled") | ||
| }) | ||
| } | ||
|
|
||
| reset() { | ||
| this.checkboxTargets.forEach((checkbox) => { | ||
| checkbox.checked = false | ||
| }) | ||
| this.elementTargets.forEach((element) => { | ||
| element.toggleAttribute("disabled", true) | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <%= turbo_frame_tag step do %> | ||
| <li class="step"> | ||
| <%= form_with model: [step.card, step], data: { controller: "form" } do |form| %> | ||
| <%= form.check_box :completed, { class: "step__checkbox", data: { action: "change->form#submit" } } %> | ||
| <%= form.check_box :completed, { class: "checkbox", data: { action: "change->form#submit" } } %> | ||
| <% end %> | ||
| <%= link_to step.content, edit_card_step_path(step.card, step), class: "step__content" %> | ||
| </li> | ||
| </li> | ||
| <% end %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <ol class="steps txt-small margin-block"> | ||
| <% card.steps.each do |step| %> | ||
| <li class="step"> | ||
| <%= check_box_tag :completed, { class: "step__checkbox", disabled: true, checked: step.completed? } %> | ||
| <%= check_box_tag :completed, { class: "checkbox", disabled: true, checked: step.completed? } %> | ||
| <%= tag.span step.content, class: "step__content" %> | ||
| </li> | ||
| </li> | ||
| <% end %> | ||
| </ol> | ||
| </ol> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is unrelated to the changes in this PR (I just renamed the class here), but it seems to be a valid bug. I can address it separately if you’d like, or feel free to accept the suggestion if it’s looking good to you.