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

ダッシュボードにある最新のブックマークに削除の機能を追加した #5585

Merged
merged 14 commits into from
Oct 25, 2022
Merged

ダッシュボードにある最新のブックマークに削除の機能を追加した #5585

merged 14 commits into from
Oct 25, 2022

Conversation

choco0809
Copy link
Contributor

@choco0809 choco0809 commented Sep 24, 2022 •
edited
Loading

issue

概要

ダッシュボードにある最新のブックマークに編集ボタンを追加し、編集ボタンがONの時のみ削除ボタンが表示されるよう変更。

変更確認方法

  1. ブランチfeature/add_current-bookmark_delete-button_to_the_dashboardをローカルに取り込む。

  2. bin/rails sでローカル環境を立ち上げる

  3. kimuraでログインする

  4. 特定の日報をブックマークする

  5. 編集ボタンにチェックする
    ※ 現在、削除ボタンが表示されるとレイアウトがずれてしまいますが、ここはデザインで対応して頂く予定です。

    変更前

    _development__ダッシュボード___FBC

    変更後

    _development__ダッシュボード___FBC

  6. 削除ボタンをクリックすると、該当の日報が削除される。
    _development__ダッシュボード___FBC

@choco0809 choco0809 self-assigned this Sep 24, 2022
@choco0809 choco0809 force-pushed the feature/add_current-bookmark_delete-button_to_the_dashboard branch from 0808f65 to e8e8147 Compare October 1, 2022 07:44
@choco0809 choco0809 mentioned this pull request Oct 1, 2022
Closed
@choco0809 choco0809 marked this pull request as ready for review October 2, 2022 05:24
@choco0809
Copy link
Contributor Author

@AyakaTakashima
お疲れ様です〜🙏
お手隙の際に、ご確認していただければと思います🙇‍♂️

AyakaTakashima
AyakaTakashima approved these changes Oct 3, 2022
View reviewed changes
Copy link
Contributor

@AyakaTakashima AyakaTakashima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@choco0809
お待たせしました🙇‍♀️
動作、コード共に問題ないと思います！
approveさせていただきます🎉

@AyakaTakashima
Copy link
Contributor

AyakaTakashima commented Oct 3, 2022 •
edited
Loading

@choco0809
approveした後に申し訳ございません！
先ほど、自分のPRを見ていたらkomagataさんから下記のようなコメントをいただきました🥹
#5461 (comment)

レビューした時はcapybara専用（？）のメソッドがあるとは知らず、OKしてしまったのですが
可能であればchocoさんのテストもcapybaraのメソッドに書き換えた方がいいかもしれません😭！
ご参考までに🙇‍♀️

@choco0809
Copy link
Contributor Author

@AyakaTakashima
有益な情報ありがとうございます😭
早速、capybaraでチェックボックスに関するメソッド発見できたので、書き換え用と思います🙏

@choco0809
Copy link
Contributor Author

@machida
お疲れ様です🙇‍♂️
デザインをお手隙の際によろしくお願いします🙏

@choco0809 choco0809 requested a review from machida October 4, 2022 10:23
@machida
Copy link
Member

machida commented Oct 4, 2022

@choco0809 デザイン了解ですー🙋‍♂️

@choco0809 choco0809 force-pushed the feature/add_current-bookmark_delete-button_to_the_dashboard branch from 6f5453c to 2993819 Compare October 4, 2022 14:14
@machida machida self-assigned this Oct 12, 2022
@machida machida force-pushed the feature/add_current-bookmark_delete-button_to_the_dashboard branch from a0f47f5 to 6b60d1f Compare October 13, 2022 04:31
@machida
Copy link
Member

machida commented Oct 13, 2022

@choco0809 デザイン入れましたーコンフリクト解消のため、最新のmainからrebaseしたので、手元で

git pull --rebase origin feature/add_current-bookmark_delete-button_to_the_dashboard

しておいてくださいー

@machida
Copy link
Member

machida commented Oct 13, 2022

@komagata レビューお願いします🙏

@machida machida requested a review from komagata October 13, 2022 04:32
@choco0809
Copy link
Contributor Author

@machida

git pull --rebase origin feature/add_current-bookmark_delete-button_to_the_dashboard

了解しました🙏
デザイン対応ありがとうございます🙇

komagata
komagata reviewed Oct 24, 2022
View reviewed changes
Copy link
Member

@komagata komagata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflictの修正をお願いします〜

@choco0809 choco0809 force-pushed the feature/add_current-bookmark_delete-button_to_the_dashboard branch from 2c76dba to 72488a9 Compare October 24, 2022 11:05
@choco0809 choco0809 force-pushed the feature/add_current-bookmark_delete-button_to_the_dashboard branch from 72488a9 to b1443d7 Compare October 25, 2022 01:02
@choco0809
Copy link
Contributor Author

@komagata
conflict解消しましたので、ご確認おねがいします🙏

@choco0809 choco0809 requested a review from komagata October 25, 2022 02:47
komagata
komagata approved these changes Oct 25, 2022
View reviewed changes
Copy link
Member

@komagata komagata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

確認させて頂きました。OKです〜🙆‍♂️

@komagata komagata merged commit b708c3e into main Oct 25, 2022
@komagata komagata deleted the feature/add_current-bookmark_delete-button_to_the_dashboard branch October 25, 2022 18:00
@github-actions github-actions bot mentioned this pull request Oct 25, 2022
Merged
8 tasks
@junohm410 junohm410 mentioned this pull request Dec 31, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AyakaTakashima AyakaTakashima AyakaTakashima approved these changes

@machida machida machida approved these changes

@komagata komagata komagata approved these changes

Assignees

@machida machida

@choco0809 choco0809

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@choco0809 @AyakaTakashima @machida @komagata