diff --git a/app/controllers/courses/practices_controller.rb b/app/controllers/courses/practices_controller.rb index 6ca92fadcb9..818f1304b8d 100644 --- a/app/controllers/courses/practices_controller.rb +++ b/app/controllers/courses/practices_controller.rb @@ -3,7 +3,7 @@ class Courses::PracticesController < ApplicationController def index @course = Course.find(params[:course_id]) - @categories = @course.categories.order(:created_at) + @categories = @course.categories.includes(practices: %i[practices_books learning_minute_statistic started_students]).order(:created_at) @learnings = current_user.learnings end end diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 1970339a236..b3acb69aec5 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -3,7 +3,7 @@ class WelcomeController < ApplicationController skip_before_action :require_active_user_login, raise: false layout 'welcome' - DEFAULT_COURSE = 'Railsプログラマー' + DEFAULT_COURSE = 'Railsエンジニア' def index @mentors = current_user ? User.mentors_sorted_by_created_at : User.visible_sorted_mentors diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb index 0d70b08d366..f08debb4aeb 100644 --- a/app/decorators/user_decorator.rb +++ b/app/decorators/user_decorator.rb @@ -29,11 +29,11 @@ def cached_completed_percentage end def completed_fraction - "修了: #{completed_practices.size} (必須: #{completed_practices_include_progress.size}/#{practices_include_progress.size})" + "修了: #{completed_practices.size} (必須: #{completed_practices_include_progress_size}/#{practices_include_progress.pluck(:id).uniq.size})" end def completed_fraction_in_metas - "#{completed_practices.size} (必須:#{completed_practices_include_progress.size})" + "#{completed_practices.size} (必須:#{completed_practices_include_progress_size})" end def customer_url diff --git a/app/helpers/meta_tags_helper.rb b/app/helpers/meta_tags_helper.rb index 2c67c7f2bcf..2852fa7ef62 100644 --- a/app/helpers/meta_tags_helper.rb +++ b/app/helpers/meta_tags_helper.rb @@ -7,7 +7,7 @@ def default_meta_tags site: 'FBC', reverse: true, charset: 'utf-8', - description: '月額29,800円、全機能が使えるお試し期間付き。フィヨルドブートキャンプは現場の即戦力になるためのスキルとプログラミングの楽しさを伝える、現役エンジニアが考える理想のプログラミングスクールの実現に励んでいます。', + description: '月額29,800円、全機能が使えるお試し期間付き。FBCは現場の即戦力になるためのスキルとプログラミングの楽しさを伝える、現役ソフトウェアエンジニアが考える理想のプログラミングスクールの実現に励んでいます。', viewport: 'width=device-width, initial-scale=1.0', og: { title: :title, @@ -31,7 +31,7 @@ def default_meta_tags def welcome_meta_tags default_meta_tags.deep_merge({ title:, - description: '月額29,800円、全機能が使えるお試し期間付き。フィヨルドブートキャンプは現場の即戦力になるためのスキルとプログラミングの楽しさを伝える、現役エンジニアが考える理想のプログラミングスクールの実現に励んでいます。', + description: '月額29,800円、全機能が使えるお試し期間付き。FBCは現場の即戦力になるためのスキルとプログラミングの楽しさを伝える、現役ソフトウェアエンジニアが考える理想のプログラミングスクールの実現に励んでいます。', og: { title: title || 'FJORD BOOT CAMP(フィヨルドブートキャンプ)', description: :description diff --git a/app/javascript/stylesheets/application/blocks/practice/_categories.sass b/app/javascript/stylesheets/application/blocks/practice/_categories.sass index 27279abe917..b77aedc6b30 100644 --- a/app/javascript/stylesheets/application/blocks/practice/_categories.sass +++ b/app/javascript/stylesheets/application/blocks/practice/_categories.sass @@ -48,15 +48,12 @@ .categories-item__description +position(relative) margin-bottom: 1rem - p - +text-block(.875rem 1.6 0 .6em) - *:last-child - margin-bottom: 0 .categories-item__edit float: right margin-left: .5rem +position(relative, top -.25rem) + z-index: 2 .categories-item__edit-link +size(2rem) diff --git a/app/javascript/stylesheets/application/blocks/user/_user-group.sass b/app/javascript/stylesheets/application/blocks/user/_user-group.sass index 1a114c51fbe..7bc1d59fa53 100644 --- a/app/javascript/stylesheets/application/blocks/user/_user-group.sass +++ b/app/javascript/stylesheets/application/blocks/user/_user-group.sass @@ -57,6 +57,8 @@ .user-group__counts +media-breakpoint-up(md) margin-top: -.5rem + flex: 1 + max-width: 29rem .card-counts__item width: 3.5rem color: var(--default-text) diff --git a/app/javascript/stylesheets/atoms/_a-form-help.sass b/app/javascript/stylesheets/atoms/_a-form-help.sass index a8ddb0cde60..0aa6fce9aa7 100644 --- a/app/javascript/stylesheets/atoms/_a-form-help.sass +++ b/app/javascript/stylesheets/atoms/_a-form-help.sass @@ -2,7 +2,12 @@ font-size: .75rem color: var(--semi-muted-text) &:not(:first-child) - margin-top: .5em + margin-top: .5rem + label + &:not(:first-child) + margin-top: 0 + & + input, + & + textarea + margin-top: .5rem em font-style: normal font-weight: 600 diff --git a/app/javascript/stylesheets/atoms/_a-long-text.sass b/app/javascript/stylesheets/atoms/_a-long-text.sass index 642da7c5fd7..81ca7cdd11a 100644 --- a/app/javascript/stylesheets/atoms/_a-long-text.sass +++ b/app/javascript/stylesheets/atoms/_a-long-text.sass @@ -10,6 +10,16 @@ font-size: .8125rem +media-breakpoint-down(sm) font-size: .75rem + &.has-no-headding + h1, + h2, + h3, + h4, + h5, + h6 + +text-block(1em 1.6 0 .625em, 600) + border: none + padding: 0 .a-long-text + & margin-top: 2em padding-top: 2em diff --git a/app/javascript/stylesheets/atoms/_a-short-text.sass b/app/javascript/stylesheets/atoms/_a-short-text.sass index 7c3f7802c3a..8b6a748f4cb 100644 --- a/app/javascript/stylesheets/atoms/_a-short-text.sass +++ b/app/javascript/stylesheets/atoms/_a-short-text.sass @@ -1,8 +1,8 @@ .a-short-text p - +text-block(1em 1.7 .75em) + +text-block(1em 1.6 .75em) li - +text-block(1em 1.7) + +text-block(1em 1.6) ol, ul margin-left: 1.25em @@ -26,6 +26,9 @@ >li >ul list-style-type: square + a + +hover-link-reversal + +default-link hr display: block +size(100% 0) @@ -37,5 +40,17 @@ text-align: center &.is-sm font-size: .8125rem + &.has-no-headding + h1, + h2, + h3, + h4, + h5, + h6 + +text-block(1em 1.6 0 .625em, 700) + border: none + padding: 0 *:first-child margin-top: 0 + *:last-child + margin-bottom: 0 diff --git a/app/javascript/stylesheets/config/mixins/_long-text-style.sass b/app/javascript/stylesheets/config/mixins/_long-text-style.sass index 83e4e2295ba..823df980d95 100644 --- a/app/javascript/stylesheets/config/mixins/_long-text-style.sass +++ b/app/javascript/stylesheets/config/mixins/_long-text-style.sass @@ -77,7 +77,7 @@ +text-block(1.125em 1.6, 600) margin-bottom: .625em h6 - +text-block(1em 1.86 0 .625em, 600) + +text-block(1em 1.6 0 .625em, 600) p +text-block(1em 1.86) margin-bottom: 1.5em diff --git a/app/models/user.rb b/app/models/user.rb index 786182cd4f6..32ea366a275 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -492,7 +492,7 @@ def away? end def completed_percentage - completed_practices_include_progress.size.to_f / practices_include_progress.size * MAX_PERCENTAGE + completed_practices_include_progress_size.to_f / practices_include_progress.pluck(:id).uniq.size * MAX_PERCENTAGE end def completed_practices_size_by_category @@ -508,9 +508,9 @@ def completed_practices_size_by_category .count('DISTINCT practices.id') end - def completed_practices_include_progress + def completed_practices_include_progress_size practices_include_progress.joins(:learnings) - .merge(Learning.complete.where(user_id: id)) + .merge(Learning.complete.where(user_id: id)).pluck(:id).uniq.size end def active? diff --git a/app/views/application/_user_menu.html.slim b/app/views/application/_user_menu.html.slim index b3cf0375e0a..2db7ff448ac 100644 --- a/app/views/application/_user_menu.html.slim +++ b/app/views/application/_user_menu.html.slim @@ -4,6 +4,10 @@ = link_to root_path, class: 'header-dropdown__item-link' do | ダッシュボード + li.header-dropdown__item + = link_to user_path(id: current_user.id), + class: 'header-dropdown__item-link' do + | マイプロフィール li.header-dropdown__item = link_to edit_current_user_path, class: 'header-dropdown__item-link' do diff --git a/app/views/articles/_ad.html.slim b/app/views/articles/_ad.html.slim index 314c862a2e2..558292ccd5f 100644 --- a/app/views/articles/_ad.html.slim +++ b/app/views/articles/_ad.html.slim @@ -12,8 +12,8 @@ aside.bootcamp-ad .a-short-text.is-sm p | フィヨルドブートキャンプは、 - | プログラマーとして就職を目指せるスキルを - | 「プロの現場でプラス戦力として数えられるプログラマー」とし、 + | ソフトウェアエンジニアとして就職を目指せるスキルを + | 「プロの現場でプラス戦力として数えられるソフトウェアエンジニア」とし、 | それを身につけることを目標とした | オンラインプログラミングスクールです。 br diff --git a/app/views/articles/_share_button_facebook.html.erb b/app/views/articles/_share_button_facebook.html.erb index d492e338d7d..6d081ee3d95 100644 --- a/app/views/articles/_share_button_facebook.html.erb +++ b/app/views/articles/_share_button_facebook.html.erb @@ -1,8 +1,8 @@
-