diff --git a/Gemfile.lock b/Gemfile.lock index e094cc014c8..63430cea07c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM ast (2.4.2) bcrypt (3.1.16) bindex (0.8.1) - bootsnap (1.7.2) + bootsnap (1.9.3) msgpack (~> 1.0) builder (3.2.4) bullet (6.1.3) diff --git a/app/assets/stylesheets/atoms/_a-textarea-bottom-note.sass b/app/assets/stylesheets/atoms/_a-textarea-bottom-note.sass index 6ffbb28a88a..cb6218cac41 100644 --- a/app/assets/stylesheets/atoms/_a-textarea-bottom-note.sass +++ b/app/assets/stylesheets/atoms/_a-textarea-bottom-note.sass @@ -1,3 +1,7 @@ ++media-breakpoint-down(md) + .a-textarea-bottom-note__banner + display: none + +media-breakpoint-up(lg) .a-textarea-bottom-note position: relative @@ -9,5 +13,5 @@ +position(absolute, left 1px, bottom 1px, right 1px) +border-radius(bottom, 3px) padding: .5rem - +text-block(.8125rem 1.4, center) + +text-block(.75rem 1.4, center) border-top: solid 1px $border-more-shade diff --git a/app/assets/stylesheets/blocks/form/_form-actions.sass b/app/assets/stylesheets/blocks/form/_form-actions.sass index eb92cdf5e5b..4d875bf2422 100644 --- a/app/assets/stylesheets/blocks/form/_form-actions.sass +++ b/app/assets/stylesheets/blocks/form/_form-actions.sass @@ -18,6 +18,7 @@ display: flex align-items: flex-end justify-content: center + flex-wrap: wrap &.is-ais-flex-start align-items: flex-start +media-breakpoint-down(sm) diff --git a/app/assets/stylesheets/blocks/form/_form-tabs.sass b/app/assets/stylesheets/blocks/form/_form-tabs.sass index dead5168ac7..9c1b6ca487a 100644 --- a/app/assets/stylesheets/blocks/form/_form-tabs.sass +++ b/app/assets/stylesheets/blocks/form/_form-tabs.sass @@ -2,7 +2,8 @@ display: flex margin-bottom: 1rem border-bottom: solid 1px $border - .a-card > &:first-child + .a-card > &:first-child, + .a-card__inner > &:first-child margin-top: 1rem .form-tabs__tab diff --git a/app/assets/stylesheets/blocks/side/_side-tabs-contents.sass b/app/assets/stylesheets/blocks/side/_side-tabs-contents.sass index 3399f806d7e..7b9c988d8fa 100644 --- a/app/assets/stylesheets/blocks/side/_side-tabs-contents.sass +++ b/app/assets/stylesheets/blocks/side/_side-tabs-contents.sass @@ -7,6 +7,8 @@ border-top-left-radius: 0 max-height: calc(100vh - 100px) overflow-y: auto + .card-header + display: none #side-tabs-1:checked ~ .side-tabs-contents #side-tabs-content-1 display: block diff --git a/app/assets/stylesheets/blocks/side/_side-tabs-nav.sass b/app/assets/stylesheets/blocks/side/_side-tabs-nav.sass index 87b0b699911..2e08f3f976b 100644 --- a/app/assets/stylesheets/blocks/side/_side-tabs-nav.sass +++ b/app/assets/stylesheets/blocks/side/_side-tabs-nav.sass @@ -1,7 +1,6 @@ .side-tabs-nav__items display: flex +position(relative, 2) - margin-bottom: -1px +margin(horizontal, auto) max-width: 50rem @@ -18,10 +17,10 @@ color: $default-text .side-tabs-nav__item-link - +text-block(.875rem 1.4, flex) + +text-block(.8125rem 1.4, flex 600) cursor: pointer padding: .75em 1.25em - border: solid 1px $border-shade + border: solid 1px $border-more-shade border-bottom: none +position(relative, bottom -1px) +border-radius(top, .25rem) diff --git a/app/assets/stylesheets/blocks/thread/_thread-list-item.sass b/app/assets/stylesheets/blocks/thread/_thread-list-item.sass index 2e4e7e0f458..ff1ae1f3874 100644 --- a/app/assets/stylesheets/blocks/thread/_thread-list-item.sass +++ b/app/assets/stylesheets/blocks/thread/_thread-list-item.sass @@ -48,6 +48,8 @@ padding-left: 3.75rem +media-breakpoint-up(md) min-height: 2.75rem + .has-no-author-image & + padding-left: 0 +media-breakpoint-down(sm) padding-left: 3rem @@ -113,6 +115,8 @@ .thread-list-item__user +position(absolute, left 0, top 0) + .has-no-author-image & + display: none .thread-list-item__user-icon +size(2.75rem) diff --git a/app/assets/stylesheets/mixins/_long-text-style.sass b/app/assets/stylesheets/mixins/_long-text-style.sass index e7648577bf5..06104ec7c1a 100644 --- a/app/assets/stylesheets/mixins/_long-text-style.sass +++ b/app/assets/stylesheets/mixins/_long-text-style.sass @@ -23,6 +23,7 @@ =long-text-style($pc-font-size: 1rem, $mobile-font-size: .8125rem, $background: $base, $font: $default-text) font-size: $pc-font-size + word-break: break-all +media-breakpoint-down(sm) font-size: $mobile-font-size >*:first-child @@ -60,7 +61,6 @@ p +text-block(1em 1.86) margin-bottom: 1.5em - word-break: break-all a +hover-link-reversal +default-link diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb new file mode 100644 index 00000000000..e00a77a3bf5 --- /dev/null +++ b/app/controllers/api/subscriptions_controller.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class API::SubscriptionsController < API::BaseController + def index + @subscriptions = Subscription.new.all + end +end diff --git a/app/controllers/api/users/recent_reports_controller.rb b/app/controllers/api/users/recent_reports_controller.rb new file mode 100644 index 00000000000..85704c1c5ef --- /dev/null +++ b/app/controllers/api/users/recent_reports_controller.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class API::Users::RecentReportsController < API::BaseController + def index + @user = User.find(params[:user_id]) + @reports = @user.reports.limit(10).order(reported_on: :DESC) + end +end diff --git a/app/controllers/companies/users_controller.rb b/app/controllers/companies/users_controller.rb index 64f15633b4c..9b9218c62a9 100644 --- a/app/controllers/companies/users_controller.rb +++ b/app/controllers/companies/users_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Companies::UsersController < ApplicationController - TARGETS = %w[student_and_trainee all].freeze + TARGETS = %w[all student_and_trainee graduate adviser mentor].freeze before_action :require_login def index diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 93673dd8582..5c300c85cb9 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -61,7 +61,7 @@ def set_page def page_params keys = %i[title body tag_list practice_id slug] - keys << :user_id if admin_login? + keys << :user_id if admin_or_mentor_login? params.require(:page).permit(*keys) end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index d38e35d0261..85e9e37241a 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -50,7 +50,7 @@ def work_params end def set_my_work - @work = if admin_login? + @work = if admin_or_mentor_login? Work.find(params[:id]) else current_user.works.find(params[:id]) diff --git a/app/javascript/comments.vue b/app/javascript/comments.vue index b9249d44613..ee091ac5225 100644 --- a/app/javascript/comments.vue +++ b/app/javascript/comments.vue @@ -5,9 +5,7 @@ .thread-comments-more(v-show='!loadedComment') .thread-comments-more__inner .thread-comments-more__action - button#js-shortcut-post-comment.a-button.is-lg.is-text.is-block( - @click='showComments' - ) + button.a-button.is-lg.is-text.is-block(@click='showComments') | コメント({{ commentLimit }})をもっと見る comment( v-for='(comment, index) in comments', diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index cd34e8ddc7b..2184f4359c7 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -59,3 +59,5 @@ require('../practice-select.js') require('../companies.js') require('../worried-users.js') require('../report_template.js') +require('../user-recent-reports.js') +require('../subscription-status.js') diff --git a/app/javascript/question-edit.vue b/app/javascript/question-edit.vue index d676de531ec..776424e470c 100644 --- a/app/javascript/question-edit.vue +++ b/app/javascript/question-edit.vue @@ -15,7 +15,7 @@ .thread-header-metas__start .thread-header-metas__meta a.a-user-name(:href='`/users/${question.user.id}`') - | {{ question.user.login_name }} + | {{ question.user.long_name }} .thread-header-metas__meta .a-meta time.thread_header_date-value( diff --git a/app/javascript/reports.vue b/app/javascript/reports.vue index 6e63c5740cb..d48c4bd9a7a 100644 --- a/app/javascript/reports.vue +++ b/app/javascript/reports.vue @@ -1,6 +1,12 @@