From c6ca81931b6437f3c4e3c524e4c6a4aff5edc1b7 Mon Sep 17 00:00:00 2001 From: hirokiej <123009866+hirokiej@users.noreply.github.com> Date: Mon, 26 May 2025 13:53:28 +0900 Subject: [PATCH 01/37] =?UTF-8?q?new-user=E3=81=8B=E3=81=A9=E3=81=86?= =?UTF-8?q?=E3=81=8B=E3=82=92=E5=88=A4=E5=AE=9A=E3=81=99=E3=82=8Bjoining?= =?UTF-8?q?=5Fstatus=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/decorators/user_decorator.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb index 1f015f1d50c..c2a82ea7db8 100644 --- a/app/decorators/user_decorator.rb +++ b/app/decorators/user_decorator.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true module UserDecorator + NEW_USER_DAYS = 7 + include Role include Retire @@ -91,4 +93,8 @@ def niconico_calendar(dates_and_reports) [*blanks, *dates_and_reports].each_slice(7).to_a end + + def joining_status + elapsed_days <= NEW_USER_DAYS ? 'new-user' : 'standard-user' + end end From 44c89d015b2b89852b0d5b710050e31cba73efb2 Mon Sep 17 00:00:00 2001 From: hirokiej <123009866+hirokiej@users.noreply.github.com> Date: Mon, 26 May 2025 13:56:31 +0900 Subject: [PATCH 02/37] =?UTF-8?q?=E5=8B=95=E7=9A=84=E3=81=ABnew-user?= =?UTF-8?q?=E3=81=8Bstandard-user=E3=82=AF=E3=83=A9=E3=82=B9=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E6=88=90=E3=81=99=E3=82=8Bjoining=5Fstatus=5Fclass?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/products/product_component.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/components/products/product_component.rb b/app/components/products/product_component.rb index 94aeb93c9ec..640360e0b86 100644 --- a/app/components/products/product_component.rb +++ b/app/components/products/product_component.rb @@ -15,6 +15,10 @@ def role_class "is-#{@product.user.primary_role}" end + def joining_status_class + "is-#{@product.user.joining_status}" + end + def practice_title "#{@product.practice.title}の提出物" end From 4d602f7475a6ff5d14082397076f4924cad2ed30 Mon Sep 17 00:00:00 2001 From: hirokiej <123009866+hirokiej@users.noreply.github.com> Date: Mon, 26 May 2025 14:20:11 +0900 Subject: [PATCH 03/37] =?UTF-8?q?span=E3=81=AB=E3=83=A6=E3=83=BC=E3=82=B6?= =?UTF-8?q?=E3=83=BC=E3=81=AEjoining=5Fstatus=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/user-icon.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/javascript/user-icon.js b/app/javascript/user-icon.js index 2f57ed3119b..f87cbc90c23 100644 --- a/app/javascript/user-icon.js +++ b/app/javascript/user-icon.js @@ -9,7 +9,11 @@ export default function userIcon({ link.classList.add(linkClass) const span = document.createElement('span') - span.classList.add('a-user-role', `is-${user.primary_role}`) + span.classList.add( + 'a-user-role', + `is-${user.primary_role}`, + `is-${user.joining_status}` + ) const img = document.createElement('img') img.src = user.avatar_url From d6d6e56603ac2980b89556ceb5ad8a2c4dc3b4ec Mon Sep 17 00:00:00 2001 From: hirokiej <123009866+hirokiej@users.noreply.github.com> Date: Mon, 26 May 2025 14:16:23 +0900 Subject: [PATCH 04/37] =?UTF-8?q?Slim=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=ABjoining=5Fstatus=E3=82=AF=E3=83=A9=E3=82=B9=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/products/product_component.html.slim | 4 ++-- app/components/works/work_component.html.slim | 2 +- app/views/admin/users/_table.html.slim | 2 +- app/views/coding_tests/coding_test_submissions/show.html.slim | 2 +- app/views/companies/products/_product.html.slim | 2 +- app/views/companies/users/_user.html.slim | 2 +- app/views/courses/practices/_practice_user_icon.html.slim | 2 +- app/views/events/_event.html.slim | 2 +- app/views/footprints/_footprint.html.slim | 2 +- app/views/generations/index.html.slim | 2 +- app/views/questions/_answer.html.slim | 2 +- app/views/questions/_new_answer.html.slim | 2 +- app/views/regular_events/_regular_event.html.slim | 2 +- app/views/regular_events/_regular_event_meta.html.slim | 2 +- app/views/tags/_user.html.slim | 2 +- app/views/users/_icon.html.slim | 2 +- app/views/users/_profile.html.slim | 2 +- app/views/users/_user.html.slim | 2 +- app/views/users/areas/index.html.slim | 2 +- app/views/users/comments/_comment.html.slim | 2 +- app/views/works/show.html.slim | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim index 1c235fb103f..f6d5fbc253b 100644 --- a/app/components/products/product_component.html.slim +++ b/app/components/products/product_component.html.slim @@ -3,7 +3,7 @@ - if @display_user_icon .card-list-item__user = link_to user_url(@product.user), class: "card-list-item__user-link" do - span class=["a-user-role", role_class] + span class=["a-user-role", role_class, joining_status_class] = image_tag @product.user.avatar_url, class: "card-list-item__user-icon a-user-icon", title: @product.user.icon_title, @@ -79,7 +79,7 @@ - @product.commented_users.distinct.each do |user| a.card-list-item__user-icons-icon href=user_path(user) = image_tag user.avatar_url, - class: "a-user-icon #{role_class}", + class: "a-user-icon #{role_class} #{joining_status_class}", title: user.icon_title, alt: user.icon_title diff --git a/app/components/works/work_component.html.slim b/app/components/works/work_component.html.slim index 5b1ad159ac5..ea583162182 100644 --- a/app/components/works/work_component.html.slim +++ b/app/components/works/work_component.html.slim @@ -14,7 +14,7 @@ .thumbnail-card__author .thumbnail-card__icon = link_to user_path(work.user) do - span class="a-user-role is-#{work.user.primary_role}" + span class="a-user-role is-#{work.user.primary_role} is-#{work.user.joining_status}" = creator_avatar .thumbnail-card__user = link_to work.user.name, user_path(work.user), class: 'a-user-name' diff --git a/app/views/admin/users/_table.html.slim b/app/views/admin/users/_table.html.slim index 8bba4807dab..c4e1d6b56db 100644 --- a/app/views/admin/users/_table.html.slim +++ b/app/views/admin/users/_table.html.slim @@ -71,7 +71,7 @@ td.admin-table__item-value.text-left = link_to user, class: 'admin-table__user', target: '_blank', rel: 'noopener' do span.admin-table__user-icon - span(class="a-user-role is-#{user.primary_role}") + span(class="a-user-role is-#{user.primary_role} is-#{user.joining_status}") = image_tag user.avatar_url, title: user.icon_title, class: 'admin-table__user-icon a-user-icon' span.admin-table__user-login-name = user.login_name diff --git a/app/views/coding_tests/coding_test_submissions/show.html.slim b/app/views/coding_tests/coding_test_submissions/show.html.slim index 34aaaf04300..b1a3d541a21 100644 --- a/app/views/coding_tests/coding_test_submissions/show.html.slim +++ b/app/views/coding_tests/coding_test_submissions/show.html.slim @@ -37,7 +37,7 @@ ruby: = link_to cts.user, itemprop: 'url', class: 'page-content-header__user-link' do - span class="a-user-role is-#{cts.user.primary_role}" + span class="a-user-role is-#{cts.user.primary_role} is-#{cts.joining_status}" = image_tag cts.user.avatar_url, title: cts.user.icon_title, class: 'page-content-header__user-icon-image a-user-icon' diff --git a/app/views/companies/products/_product.html.slim b/app/views/companies/products/_product.html.slim index f494e4221cb..41620406526 100644 --- a/app/views/companies/products/_product.html.slim +++ b/app/views/companies/products/_product.html.slim @@ -66,7 +66,7 @@ title="#{user.icon_title}" alt="#{user.icon_title}" src="#{user.avatar_url}" - class="is-#{user.primary_role}") + class="is-#{user.primary_role} is-#{user.joining_status}") - if product.self_last_commented_at && product.mentor_last_commented_at .card-list-item-meta__item diff --git a/app/views/companies/users/_user.html.slim b/app/views/companies/users/_user.html.slim index 2ec06621686..d1fa4a2dd09 100644 --- a/app/views/companies/users/_user.html.slim +++ b/app/views/companies/users/_user.html.slim @@ -17,7 +17,7 @@ .users-item__header-start .users-item__icon = link_to user.url - span(:class='["a-user-role", roleClass]') + span(:class='["a-user-role", roleClass, joiningStatusClass]') img.users-item__user-icon-image.a-user-icon( title="#{user.login_name}(#{user.name})" alt="#{user.login_name}(#{user.name})" diff --git a/app/views/courses/practices/_practice_user_icon.html.slim b/app/views/courses/practices/_practice_user_icon.html.slim index 21bb3fe209b..baeed512193 100644 --- a/app/views/courses/practices/_practice_user_icon.html.slim +++ b/app/views/courses/practices/_practice_user_icon.html.slim @@ -1,4 +1,4 @@ .a-user-icons__item a.a-user-icons__item-link(href="#{user_path(started_or_submitted_student)}") - span.a-user-role(class="a-user-role is-#{started_or_submitted_student.primary_role}") + span.a-user-role(class="a-user-role is-#{started_or_submitted_student.primary_role} is-#{started_or_submitted_student.joining_status}") = image_tag started_or_submitted_student.avatar_url, title: started_or_submitted_student.icon_title, class: 'a-user-icons__item-icon a-user-icon' diff --git a/app/views/events/_event.html.slim b/app/views/events/_event.html.slim index f5ea90eedfc..d9db5b00a14 100644 --- a/app/views/events/_event.html.slim +++ b/app/views/events/_event.html.slim @@ -79,7 +79,7 @@ - event.participants.each do |participant| li.user-icons-item = link_to participant do - span class="a-user-role is-#{participant.primary_role}" + span class="a-user-role is-#{participant.primary_role} is-#{participant.joining_status}" = image_tag participant.avatar_url, title: participant.icon_title, class: "a-user-icon is-sm is-#{participant.login_name}", alt: participant.login_name - else .o-empty-message diff --git a/app/views/footprints/_footprint.html.slim b/app/views/footprints/_footprint.html.slim index 2346ddce4d4..74e8a6baf92 100644 --- a/app/views/footprints/_footprint.html.slim +++ b/app/views/footprints/_footprint.html.slim @@ -1,4 +1,4 @@ li.user-icons__item a.user-icons__item-link href=footprint.user.url - span.a-user-role class="is-#{footprint.user.primary_role}" + span.a-user-role class="is-#{footprint.user.primary_role} is=#{footprint.user.joining_status}" img.a-user-icon.is-sm title=footprint.user.icon_title alt=footprint.user.icon_title src=footprint.user.avatar_url class="is-#{footprint.user.login_name}" diff --git a/app/views/generations/index.html.slim b/app/views/generations/index.html.slim index f39d90bd761..d4c79918b80 100644 --- a/app/views/generations/index.html.slim +++ b/app/views/generations/index.html.slim @@ -53,6 +53,6 @@ main.page-main - ActiveDecorator::Decorator.instance.decorate(user) .a-user-icons__item = link_to user_path(user), class: 'a-user-icons__item-link' do - span class=["a-user-role", "is-#{user.primary_role}"] + span class=["a-user-role", "is-#{user.primary_role}, "is-#{user.joining_status}"] img.a-user-icons__item-icon.a-user-icon src=user.avatar_url title=user.icon_title data-login-name=user.login_name = paginate @generations diff --git a/app/views/questions/_answer.html.slim b/app/views/questions/_answer.html.slim index 8f3fd1a7047..acd1b2e0274 100644 --- a/app/views/questions/_answer.html.slim +++ b/app/views/questions/_answer.html.slim @@ -1,7 +1,7 @@ .thread-comment.answer id="answer_#{answer.id}" data-question_id="#{question.id}" data-answer_id="#{answer.id}" data-answer_description="#{answer.description}" .thread-comment__start a.thread-comment__user-link href="#{answer.user.url}" - span class="a-user-role is-#{answer.user.primary_role}" + span class="a-user-role is-#{answer.user.primary_role} is-#{answer.user.joining_status}" img.thread-comment__user-icon.a-user-icon src="#{answer.user.avatar_url}" - if answer.user.company && (answer.user.adviser? || answer.user.trainee?) a.thread-comment__company-link href="#{company_path(answer.user.company)}" diff --git a/app/views/questions/_new_answer.html.slim b/app/views/questions/_new_answer.html.slim index b3174590acd..b8e41d8f0c6 100644 --- a/app/views/questions/_new_answer.html.slim +++ b/app/views/questions/_new_answer.html.slim @@ -1,6 +1,6 @@ .thread-comment-form.new-answer data-question_id="#{question.id}" .thread-comment__start - span class="a-user-role is-#{user.primary_role}" + span class="a-user-role is-#{user.primary_role} is-#{user.joining_status}" img.thread-comment__user-icon.a-user-icon src="#{user.avatar_url}" alt="#{current_user.icon_title}" .thread-comment__end .answer-editor diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index 6aa2dc1e6b8..cc3f1c2813f 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -84,7 +84,7 @@ - regular_event.participants.each do |participant| li.user-icons-item = link_to participant do - span class="a-user-role is-#{participant.primary_role}" + span class="a-user-role is-#{participant.primary_role} is-#{participant.joining_status}" = image_tag participant.avatar_url, title: participant.icon_title, class: "a-user-icon is-sm is-#{participant.login_name}", alt: participant.login_name - if admin_login? = link_to regular_event_participation_path(regular_event_id: regular_event, participant_id: participant), diff --git a/app/views/regular_events/_regular_event_meta.html.slim b/app/views/regular_events/_regular_event_meta.html.slim index d74b1a4d532..cc622f6a037 100644 --- a/app/views/regular_events/_regular_event_meta.html.slim +++ b/app/views/regular_events/_regular_event_meta.html.slim @@ -9,7 +9,7 @@ - regular_event.organizers.each do |organizer| li.user-icons-item = link_to organizer do - span class="a-user-role is-#{organizer.primary_role}" + span class="a-user-role is-#{organizer.primary_role} is-#{organizer.joining_status}" = image_tag organizer.avatar_url, title: organizer.icon_title, class: "a-user-icon is-sm is-#{organizer.login_name}", alt: organizer.login_name .event-meta__item dt.event-meta__item-label diff --git a/app/views/tags/_user.html.slim b/app/views/tags/_user.html.slim index c469a57c70d..ffb44a3b626 100644 --- a/app/views/tags/_user.html.slim +++ b/app/views/tags/_user.html.slim @@ -1,4 +1,4 @@ .a-user-icons__item = link_to user, class: 'a-user-icons__item-link' do - span class="a-user-role is-#{user.primary_role}" + span class="a-user-role is-#{user.primary_role} is-#{user.joining_status}" = image_tag user.avatar_url, title: user.icon_title, class: 'a-user-icons__item-icon a-user-icon' diff --git a/app/views/users/_icon.html.slim b/app/views/users/_icon.html.slim index 4f419cadc77..390d612832b 100644 --- a/app/views/users/_icon.html.slim +++ b/app/views/users/_icon.html.slim @@ -9,5 +9,5 @@ ruby: class: user.icon_classes(image_class) } = link_to user, link_options do - span class="a-user-role is-#{user.primary_role}" + span class="a-user-role is-#{user.primary_role} is-#{user.joining_status}" = image_tag user.avatar_url, image_options diff --git a/app/views/users/_profile.html.slim b/app/views/users/_profile.html.slim index cccd3e35606..e0af097d392 100644 --- a/app/views/users/_profile.html.slim +++ b/app/views/users/_profile.html.slim @@ -2,7 +2,7 @@ header.page-content-header .page-content-header__start .page-content-header__user = link_to user, class: 'page-content-header__user-link' do - span class="a-user-role is-#{user.primary_role}" + span class="a-user-role is-#{user.primary_role} is-#{user.joining_status}" = image_tag user.avatar_url, title: user.icon_title, class: 'user-profile__user-icon-image a-user-icon' - if user.company.present? .user-profile__company-logo diff --git a/app/views/users/_user.html.slim b/app/views/users/_user.html.slim index 229685cdff1..5a3e321603d 100644 --- a/app/views/users/_user.html.slim +++ b/app/views/users/_user.html.slim @@ -17,7 +17,7 @@ .users-item__header-start .users-item__icon = link_to user.url - span class="a-user-role is-#{user.primary_role}" + span class="a-user-role is-#{user.primary_role} is-#{user.joining_status}" img.users-item__user-icon-image.a-user-icon title=user.icon_title alt=user.icon_title src=user.avatar_url - if user.company&.logo_url .users-item__company diff --git a/app/views/users/areas/index.html.slim b/app/views/users/areas/index.html.slim index 60a9e36f4eb..4dbfc4ca193 100644 --- a/app/views/users/areas/index.html.slim +++ b/app/views/users/areas/index.html.slim @@ -39,7 +39,7 @@ main.page-main .a-user-icons__items - users_group_by_area[:users].each do |user| a.a-user-icons__item-link href=user.url - span.a-user-role class="is-#{user.primary_role}" + span.a-user-role class="is-#{user.primary_role} is-#{user.joining_status}" img.a-user-icons__item-icon.a-user-icon src=user.avatar_url title=user.icon_title data-login-name=user.login_name = paginate @sorted_user_groups_by_area_user_num - else diff --git a/app/views/users/comments/_comment.html.slim b/app/views/users/comments/_comment.html.slim index c35281c35c9..e57619cbd45 100644 --- a/app/views/users/comments/_comment.html.slim +++ b/app/views/users/comments/_comment.html.slim @@ -18,7 +18,7 @@ - if user_comments_page? h2.card-list-item-title__title = link_to commentable, class: 'card-list-item-title__link a-text-link' do - span class="a-user-role is-#{commentable.user.primary_role} align-middle" + span class="a-user-role is-#{commentable.user.primary_role} is-#{commentable.user.joining_status} align-middle" = image_tag commentable.user.avatar_url, title: commentable.user.icon_title, class: 'thread-comment__title-icon a-user-icon' = commentable.title - else diff --git a/app/views/works/show.html.slim b/app/views/works/show.html.slim index f11925bd4bc..e3652e36590 100644 --- a/app/views/works/show.html.slim +++ b/app/views/works/show.html.slim @@ -25,7 +25,7 @@ hr.a-border .page-content-header__user .page-content-header__user-icon = link_to user_portfolio_path(@work.user), itemprop: 'url', class: 'page-content-header__user-link' do - span class="a-user-role is-#{@work.user.primary_role}" + span class="a-user-role is-#{@work.user.primary_role} is-#{@work.user.joining_status}" = image_tag @work.user.avatar_url, title: @work.user.icon_title, class: 'page-content-header__user-icon a-user-icon' .page-content-header__end .page-content-header__row From 4f07a06e0ffd8cdbfe1e54a9ff737ac45be8966f Mon Sep 17 00:00:00 2001 From: hirokiej <123009866+hirokiej@users.noreply.github.com> Date: Mon, 26 May 2025 14:27:06 +0900 Subject: [PATCH 05/37] =?UTF-8?q?joining=5Fstatus=E3=82=92=E3=83=95?= =?UTF-8?q?=E3=83=AD=E3=83=B3=E3=83=88=E3=82=A8=E3=83=B3=E3=83=89=E3=81=A7?= =?UTF-8?q?=E3=82=82=E5=88=A9=E7=94=A8=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/comments/_user_icons.json.jbuilder | 1 + app/views/api/courses/practices/index.json.jbuilder | 1 + app/views/api/generations/users/_user.json.jbuilder | 1 + app/views/api/products/_product.json.jbuilder | 1 + app/views/api/searchables/_searchable.json.jbuilder | 2 ++ app/views/api/users/_list_user.json.jbuilder | 2 +- app/views/api/users/_user.json.jbuilder | 2 +- app/views/application/_current_user.html.erb | 2 +- 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/api/comments/_user_icons.json.jbuilder b/app/views/api/comments/_user_icons.json.jbuilder index 5d61fcba7bf..dd5e3db924e 100644 --- a/app/views/api/comments/_user_icons.json.jbuilder +++ b/app/views/api/comments/_user_icons.json.jbuilder @@ -8,6 +8,7 @@ if report.comments.present? json.user_icon user.avatar_url json.user_id user.id json.primary_role user.primary_role + json.joining_status user.joining_status end end end diff --git a/app/views/api/courses/practices/index.json.jbuilder b/app/views/api/courses/practices/index.json.jbuilder index 07acdba279a..daed04f247c 100644 --- a/app/views/api/courses/practices/index.json.jbuilder +++ b/app/views/api/courses/practices/index.json.jbuilder @@ -18,6 +18,7 @@ json.categories @categories do |category| json.icon_title user.icon_title json.roles user.roles json.primary_role user.primary_role + json.joining_status user.joining_status end end end diff --git a/app/views/api/generations/users/_user.json.jbuilder b/app/views/api/generations/users/_user.json.jbuilder index 259649bb9a8..af7b8107627 100644 --- a/app/views/api/generations/users/_user.json.jbuilder +++ b/app/views/api/generations/users/_user.json.jbuilder @@ -4,3 +4,4 @@ json.avatar_url user.avatar_url json.icon_title user.icon_title json.login_name user.login_name json.primary_role user.primary_role +json.joining_status user.joining_status diff --git a/app/views/api/products/_product.json.jbuilder b/app/views/api/products/_product.json.jbuilder index f71c326143b..8f2ab0717ad 100644 --- a/app/views/api/products/_product.json.jbuilder +++ b/app/views/api/products/_product.json.jbuilder @@ -50,6 +50,7 @@ json.comments do json.url user_path(user) json.icon_title user.icon_title json.primary_role user.primary_role + json.joining_status user.joining_status end end end diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder index bd555287943..34be9fb0242 100644 --- a/app/views/api/searchables/_searchable.json.jbuilder +++ b/app/views/api/searchables/_searchable.json.jbuilder @@ -12,6 +12,7 @@ if searchable.respond_to?(:user) json.avatar_url searchable.user.avatar_url json.icon_title searchable.user.icon_title json.primary_role searchable.user.primary_role + json.joining_status searchable.user.joining_status end json.is_comment_or_answer comment_or_answer?(searchable) if comment_or_answer?(searchable) @@ -25,4 +26,5 @@ json.is_user user?(searchable) if user?(searchable) json.avatar_url searchable.avatar_url json.primary_role searchable.primary_role + json.joining_status searchable.joining_status end diff --git a/app/views/api/users/_list_user.json.jbuilder b/app/views/api/users/_list_user.json.jbuilder index c7203150480..3e641a631d6 100644 --- a/app/views/api/users/_list_user.json.jbuilder +++ b/app/views/api/users/_list_user.json.jbuilder @@ -1,6 +1,6 @@ user_course_practice = ActiveDecorator::Decorator.instance.decorate(UserCoursePractice.new(user)) -json.(user, :id, :login_name, :name, :description, :github_account, :twitter_account, :facebook_url, :blog_url, :job_seeker, :job, :os, :experiences, :email, :roles, :primary_role, :icon_title, :graduated_on) +json.(user, :id, :login_name, :name, :description, :github_account, :twitter_account, :facebook_url, :blog_url, :job_seeker, :job, :os, :experiences, :email, :roles, :primary_role, :icon_title, :graduated_on, :joining_status) json.tag_list user.tags.pluck(:name) json.url user_url(user) json.updated_at l(user.updated_at) diff --git a/app/views/api/users/_user.json.jbuilder b/app/views/api/users/_user.json.jbuilder index 952e6c4d6eb..3ec434140ea 100644 --- a/app/views/api/users/_user.json.jbuilder +++ b/app/views/api/users/_user.json.jbuilder @@ -1,4 +1,4 @@ -columns = %i(id login_name email long_name url roles primary_role icon_title) +columns = %i(id login_name email long_name url roles primary_role icon_title joining_status) columns << :mentor_memo if admin_or_mentor_login? json.(user, *columns) json.avatar_url user.avatar_url diff --git a/app/views/application/_current_user.html.erb b/app/views/application/_current_user.html.erb index c112bc7e8fc..dcb1d39f404 100644 --- a/app/views/application/_current_user.html.erb +++ b/app/views/application/_current_user.html.erb @@ -1,5 +1,5 @@