-
Notifications
You must be signed in to change notification settings - Fork 71
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
「2回連続sadのユーザー」のカードをVue化する #5621
「2回連続sadのユーザー」のカードをVue化する #5621
Conversation
4c4fe9a
to
5849255
Compare
@fuwa-syugyo |
@AyakaTakashima |
@fuwa-syugyo |
@AyakaTakashima |
17c9478
to
85a8246
Compare
@fuwa-syugyo |
@komagata |
app/javascript/packs/application.js
Outdated
@@ -95,6 +97,8 @@ mounter.addComponent(UserMentorMemo) | |||
mounter.addComponent(UserRecentReports) | |||
mounter.addComponent(Talks) | |||
mounter.addComponent(Footprints) | |||
mounter.addComponent(Report) |
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.
この行は必要ないかも?
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.
@komagata
ほんとですね🙇♀️
当初Report.vueを直接app/views/users/_sad_emotion_report.html.slim
に埋め込もうと考えていてそのまま残ってしまってました🙇♀️
ご指摘ありがとうございます🙇♀️
85a8246
to
460639b
Compare
@komagata |
@AyakaTakashima 「WIP」というコミットメッセージはちょっと意味がわからないのでわかるように別のものにするか、他のコミットと一緒にしてしまうのがいいと思います〜 |
@komagata |
460639b
to
6905562
Compare
@komagata |
df0a516
to
8af0e9e
Compare
@AyakaTakashima 手元の feature/replace-card-user-become-sad-twice-consecutively-with-vue-component の削除が必要です。
をやってみてくださいー。 |
@machida > git checkout origin main
error: pathspec 'main' did not match any file(s) known to git
|
@AyakaTakashima ごめんなさい!ミスです🙇♂️ git checkout main でした🙇♂️ |
@machida > git checkout main
> git branch -D feature/replace-card-user-become-sad-twice-consecutively-with-vue-component
> git fetch
> git checkout feature/replace-card-user-become-sad-twice-consecutively-with-vue-component
error: The branch 'feature/replace-card-user-become-sad-twice-consecutively-with-vue-component' is not fully merged.
If you are sure you want to delete it, run 'git branch -D feature/replace-card-user-become-sad-twice-consecutively-with-vue-component'. というエラーメッセージが出たので |
@komagata |
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.
conflictの修正をお願いします〜
8af0e9e
to
ce1374a
Compare
@komagata |
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.
確認させて頂きました。OKです〜🙆♂️
Issue
概要
メンターのダッシュボードに、二回連続sadになった人の日報が表示される場所があります。
この日報のカードをvue化しました。
変更確認方法
feature/replace-card-user-become-sad-twice-consecutively-with-vue-component
をローカルに取り込むrails s
でローカル環境を立ち上げるhttp://localhost:3000/
へアクセス変更前後での画面変更点
見た目上の変更はありません。