Merge pull request #3104 from fjordllc/main

Release 2021-08-12 14:02:37

app/assets/stylesheets/article.sass

@@ -13,13 +13,13 @@ body
   margin-top: 2rem
   margin-bottom: 2rem
 
-.a-card
-  background-color: white
-  border-radius: .25rem
-  border: solid 1px $border-more-shade
-  max-width: 50rem
-  margin-left: auto
-  margin-right: auto
+  .a-card
+    background-color: white
+    border-radius: .25rem
+    border: solid 1px $border-more-shade
+    max-width: 50rem
+    margin-left: auto
+    margin-right: auto
 
 .article__title
   padding: 1.25rem 2rem

app/assets/stylesheets/atoms/_a-card.sass

@@ -2,22 +2,20 @@
   background-color: $base
   border-radius: .25rem
   border: solid 1px $border-more-shade
-  max-width: 48rem
   +margin(horizontal, auto)
   +media-breakpoint-down(lg)
     &:not(:last-child)
       margin-bottom: 1rem
   .a-card + &
-    margin-top: 1.25rem
+    +media-breakpoint-up(xl)
+      margin-top: 1.25rem
     +media-breakpoint-down(lg)
       margin-top: 1rem
   &.is-borderd
     border: solid 4px $welcome-default-text
   [class*=col-] + [class*=col-] &:first-child
     +media-breakpoint-down(md)
       margin-top: 1rem
-  &.is-max-width-100
-    max-width: 110rem
 
 .a-card-notice
   p

app/assets/stylesheets/atoms/_a-form-help.sass

@@ -2,6 +2,21 @@
   font-size: .75rem
   margin-top: .5em
   color: $semi-muted-text
+  &.is-important
+    border: dashed 1px $border-shade
+    padding: 1em 1.25em
+    border-radius: 4px
+    color: $default-text
+    h2
+      +text-block(1.125em 1.4)
+      margin-bottom: .25em
+    [class*=is-select] + &
+      margin-top: .75rem
+    .a-horizontal-dashed
+      +margin(vertical, 1em)
+    .a-form-help-link
+      display: inline-block
+      margin-top: .25em
   &.is-text-align-right
     text-align: right
   &.is-text-align-center

app/assets/stylesheets/atoms/_a-horizontal-dashed.sass

@@ -0,0 +1,3 @@
+.a-horizontal-dashed
+  +size(100% 1px)
+  border-top: dashed 1px $border-shade

app/assets/stylesheets/blocks/admin/_admin-table.sass

@@ -4,10 +4,7 @@
   100%
     background-color: $base
 
-
 .admin-table
-  max-width: 110rem
-  +margin(horizontal, auto)
   margin-bottom: 1.5rem
   +media-breakpoint-down(sm)
     overflow-x: auto

app/assets/stylesheets/blocks/card/_card-books.sass

@@ -10,6 +10,7 @@
     +flex-link
   +media-breakpoint-down(sm)
     +block-link
+    overflow: hidden
 
 .card-books-item__start
   +media-breakpoint-up(md)

app/assets/stylesheets/blocks/card/_card-main-actions.sass

@@ -26,6 +26,9 @@
     max-width: 100%
     &.is-sub
       text-align: right
+  &.is-end
+    margin-left: auto
+    flex-basis: 2.5rem
 
 .card-main-actions__delete
   +hover-link-reversal

app/assets/stylesheets/blocks/form/_form.sass

@@ -1,12 +1,9 @@
 .form
-  max-width: 87.5rem
   +margin(horizontal, auto)
   .a-card + &
     margin-top: 1.25rem
 
 .form__items
-  max-width: 82rem
-  +margin(horizontal, auto)
   .form__items + &
     margin-top: 1.75rem
 

app/assets/stylesheets/blocks/page/_two-columns.sass

@@ -1,11 +1,9 @@
 .two-columns
-  +margin(horizontal, auto)
   +position(relative)
   +media-breakpoint-up(md)
-    max-width: 58rem
     display: flex
     justify-content: space-between
     align-items: flex-start
 
 .two-columns__inner
-  flex: 100
+  flex: 1

app/assets/stylesheets/blocks/practice/_categories.sass

@@ -4,8 +4,6 @@
   width: 100%
 
 .categories-items
-  max-width: 58rem
-  +margin(horizontal, auto)
   +position(relative)
   display: flex
   justify-content: space-between
@@ -15,7 +13,7 @@
   display: none
 
 .categories-items__inner
-  flex: 100
+  flex: 1
 
 .categories-item
   &:not(:last-child)

app/assets/stylesheets/blocks/practice/_practice-contents.sass

@@ -1,6 +1,4 @@
 .practice-contents
-  max-width: 58rem
-  +margin(horizontal, auto)
   +position(relative)
   display: flex
   justify-content: space-between
@@ -19,7 +17,7 @@
 .practice-contents__title
   +text-block(1.5rem 1.4, 600 $side)
   +media-breakpoint-down(sm)
-    font-size: 1rem
+    font-size: 1.25rem
     word-break: break-all
 
 .practice-contents__pub-date

app/assets/stylesheets/blocks/thread/_thread-comments-container.sass

@@ -1,7 +1,3 @@
-.thread-comments-container
-  max-width: 52rem
-  +margin(horizontal, auto)
-
 .thread-comments-container__title
   +text-block(1.125rem 1.45 0 1.5rem, flex 600)
   align-items: center

app/assets/stylesheets/blocks/thread/_thread-comments.sass

@@ -1,8 +1,6 @@
 $thread-header-author: 3.5rem
 .thread-comments
   +position(relative)
-  max-width: 52rem
-  +margin(horizontal, auto)
   border-radius: .25rem
 
 .thread-comment

app/assets/stylesheets/blocks/thread/_thread-questions.sass

@@ -1,8 +1,6 @@
 $thread-header-author: 3.5rem
 .thread-questions
   +position(relative)
-  max-width: 52rem
-  +margin(horizontal, auto)
   border-radius: .25rem
 
 .thread-question

app/assets/stylesheets/blocks/thread/_thread.sass

@@ -3,7 +3,6 @@ $thread-header-author: 6rem
   +position(relative)
   +margin(horizontal, auto)
   +media-breakpoint-up(md)
-    max-width: 52rem
     padding-left: 5rem
     margin-bottom: 2rem
     &.is-header-author
@@ -14,7 +13,6 @@ $thread-header-author: 6rem
     &.is-page
       margin-top: 1rem
       padding-left: 0
-      max-width: 47rem
 
 .thread__body
   border-top: $background solid 1px

app/assets/stylesheets/blocks/user/_niconico-calendar.sass

@@ -51,6 +51,12 @@
     background-color: #ecf3f7
   &.is-soso
     background-color: #fff9e8
+  &.is-today
+    .niconico-calendar__day-inner
+      border: dashed 2px $info
+    .niconico-calendar__day-label
+      font-weight: 600
+      color: $info
 
 .niconico-calendar__day-inner
   +block-link

app/assets/stylesheets/initializers/_reset.sass

@@ -45,3 +45,6 @@ input[type="submit"]
 +placeholder
   color: $placeholder-text
   font-weight: 400
+
+hr
+  border: none

app/assets/stylesheets/shared/_base.sass

@@ -54,27 +54,7 @@ body
     padding-top: 4rem
     overflow-y: auto
 
-.container
-  +padding(horizontal, 1.5rem)
-  max-width: 100%
-  body &.has-no-right-padding
-    padding-right: 0
-  +media-breakpoint-down(md)
-    +padding(horizontal, 1rem)
-  body.is-learning-page &
-    &.is-md
-      width: 48rem
-      +margin(horizontal, auto)
-  body.welcome &
-    width: 75rem
-    +padding(horizontal, 1rem)
-    +margin(horizontal, auto)
-    &.is-md
-      width: 48rem
-
 .columns
-  max-width: 75rem
-  +margin(horizontal, auto)
   .columns + &
     margin-top: 1.5rem
 

app/assets/stylesheets/shared/_container.sass

@@ -0,0 +1,21 @@
+.container
+  max-width: 100%
+  +margin(horizontal, auto)
+  +media-breakpoint-up(lg)
+    +padding(horizontal, 1.5rem)
+  +media-breakpoint-down(md)
+    +padding(horizontal, 1rem)
+  &.is-xxxl
+    width: 93.75rem
+  &.is-xxl
+    width: 82.5rem
+  &.is-xl
+    width: 71.5rem
+  &.is-lg
+    width: 60rem
+  &.is-md
+    width: 45rem
+  &.is-sm
+    width: 33.75rem
+  body &.has-no-right-padding
+    padding-right: 0

app/controllers/api/correct_answers_controller.rb

@@ -7,8 +7,12 @@ class API::CorrectAnswersController < API::BaseController
   def create
     @answer = @question.answers.find(params[:answer_id])
     @answer.type = 'CorrectAnswer'
-    @answer.save!
-    render json: @answer
+    if @answer.save
+      ChatNotifier.message("質問「#{@answer.question.title}」のベストアンサーが選ばれました。\r#{url_for(@answer.question)}")
+      render json: @answer
+    else
+      head :bad_request
+    end
   end
 
   def update

app/controllers/api/mentor_memos_controller.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class API::MentorMemosController < API::BaseController
+  before_action :require_mentor_login_for_api
+  before_action :set_user, only: %i[update]
+
+  def update
+    if @user.update_mentor_memo(user_params[:mentor_memo])
+      head :ok
+    else
+      head :bad_request
+    end
+  end
+
+  private
+
+  def set_user
+    @user = User.find(params[:id])
+  end
+
+  def user_params
+    params.require(:user).permit(:mentor_memo)
+  end
+end

app/controllers/api/products/not_responded_controller.rb

@@ -7,7 +7,6 @@ def index
                 .not_responded_products
                 .list
                 .reorder_for_not_responded_products
-                .page(params[:page])
     @latest_product_submitted_just_5days = @products.find { |product| product.elapsed_days == 5 }
     @latest_product_submitted_just_6days = @products.find { |product| product.elapsed_days == 6 }
     @latest_product_submitted_over_7days = @products.find { |product| product.elapsed_days >= 7 }

app/controllers/api/users_controller.rb

@@ -2,7 +2,7 @@
 
 class API::UsersController < API::BaseController
   before_action :set_user, only: %i[show update]
-  before_action :require_mentor_login_for_api, only: %i[update]
+  before_action :require_login_for_api
   PAGER_NUMBER = 20
 
   def index
@@ -30,8 +30,7 @@ def index
   def show; end
 
   def update
-    @user = User.find(params[:id])
-    if @user.update_mentor_memo(user_params[:mentor_memo])
+    if @user == current_user && @user.update(user_params)
       head :ok
     else
       head :bad_request
@@ -52,6 +51,6 @@ def set_user
   end
 
   def user_params
-    params.require(:user).permit(:tag_list, :mentor_memo)
+    params.require(:user).permit(:tag_list)
   end
 end

app/controllers/courses/categories_controller.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Courses::CategoriesController < ApplicationController
+  before_action :require_admin_login
+
+  def index
+    @course = Course.find(params[:course_id])
+    @categories = @course.categories.order(:position)
+  end
+end

app/controllers/current_user/products/index.html.slim

@@ -14,7 +14,7 @@ header.page-header
   = render 'home/page_tabs', user: @current_user
 
 .page-body
-  .container
+  .container.is-md
     - if @products.present?
       .thread-list.a-card
         = render partial: 'products/product', collection: @products, as: :product

app/javascript/announcements.vue

@@ -8,7 +8,7 @@
         i.far.fa-smile
       p.o-empty-message__text
         | {{ title }}はありません
-  .container(v-else)
+  .container.is-md(v-else)
     nav.pagination(v-if='totalPages > 1')
       pager(v-bind='pagerProps')
     .thread-list.a-card

app/javascript/answer.vue

@@ -121,7 +121,7 @@ export default {
     hasCorrectAnswer: { type: Boolean, required: true },
     questionUser: { type: Object, required: true }
   },
-  data: () => {
+  data() {
     return {
       description: '',
       editing: false,

app/javascript/answers.vue

@@ -72,7 +72,7 @@ export default {
     questionUser: { type: Object, required: true },
     currentUser: { type: Object, required: true }
   },
-  data: () => {
+  data() {
     return {
       answers: [],
       description: '',