Release 2021-10-01 14:11:20

Gemfile.lock

@@ -241,10 +241,10 @@ GEM
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     nio4r (2.5.8)
-    nokogiri (1.12.3)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.12.3-x86_64-darwin)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     oauth (0.5.5)
     oauth2 (1.4.4)

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

@@ -0,0 +1,10 @@
+.a-dropdown
+  overflow: hidden
+  background-color: $base
+  border: solid 1px $border-shade
+  box-shadow: rgba(black, .2) 0 0 .375rem
+  border-radius: .25rem
+
+.a-dropdown__item
+  &:not(:last-child)
+    border-bottom: solid 1px $border

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

@@ -29,6 +29,8 @@
   &.is-end
     margin-left: auto
     flex-basis: 2.5rem
+    +media-breakpoint-down(sm)
+      margin-bottom: 0
 
 .card-main-actions__delete
   +hover-link-reversal

app/assets/stylesheets/blocks/course/_courses.sass

@@ -11,10 +11,33 @@
 .courses-item__title
   +text-block(1.125rem 1.4)
 
+.courses-item__title-icon
+  +text-block(.6875rem, inline-flex $semi-muted-text nowrap 400)
+  +padding(horizontal, .5rem)
+  height: 1.125rem
+  margin-right: .5rem
+  border-radius: .75rem
+  align-items: center
+  justify-content: center
+  +media-breakpoint-up(md)
+    +position(relative, top -.125rem)
+  +media-breakpoint-down(sm)
+    +position(relative, top -.1875rem)
+  &.is-closed
+    background-color: #e9ebef
+
 .courses-item__title-link
-  display: block
+  +block-link
+
+.courses-item__title-label
   color: $main-text
-  +hover-link
+  transition: all .2s ease-out
+  .is-closed &
+    color: $muted-text
+  .is-closed .courses-item__title-link:hover &,
+  .courses-item__title-link:hover &
+    text-decoration: underline
+    color: $main-text
 
 .courses-item__description
   padding: .5rem 1.25rem 1.25rem

app/assets/stylesheets/blocks/header/_.header-notification-icon.sass

@@ -0,0 +1,50 @@
+.header-notification-icon
+  +text-block(1.25rem 1, center)
+  +media-breakpoint-down(sm)
+    +text-block(1.125rem 1)
+    .has-count &
+      color: $default-text
+
+.header-notification-count
+  background-color: $badge-color
+  +text-block(.625rem 1, center $reversal-text flex)
+  align-items: center
+  justify-content: center
+  border-radius: 1rem
+  position: absolute
+  +media-breakpoint-up(md)
+    +size(1.25rem .875rem)
+    +position(right .25rem, top .25rem)
+  +media-breakpoint-down(sm)
+    +size(1.125rem .75rem)
+    +position(right .125rem, top .125rem)
+
+.header-notifications-item__body
+  width: 100%
+  +media-breakpoint-up(md)
+    color: $default-text
+  +media-breakpoint-down(sm)
+    color: $reversal-text
+
+.header-notifications-item__user-icon
+  float: left
+  +size(2rem)
+  margin-right: .5rem
+  margin-bottom: .25rem
+
+.header-notifications-item__message
+  p
+    line-height: 1.45
+    margin-bottom: .375em
+    +media-breakpoint-up(md)
+      font-size: .8125rem
+    +media-breakpoint-down(sm)
+      font-size: .75rem
+
+.header-notifications-item__created-at
+  text-align: right
+  display: block
+  +media-breakpoint-up(md)
+    font-size: .75rem
+  +media-breakpoint-down(sm)
+    font-size: .625rem

app/assets/stylesheets/blocks/header/_header-dropdown.sass

@@ -16,8 +16,8 @@
 
 .header-dropdown__inner
   +media-breakpoint-up(md)
-    background-color: $base
     +position(absolute, right 0, top 100%, 2)
+    background-color: $base
     border: solid 1px $border-shade
     width: 14rem
     box-shadow: rgba(black, .2) 0 0 .375rem
@@ -63,7 +63,7 @@
     .header-dropdown__item:not(:last-child) &
       border-bottom: solid 1px $background
     &:hover
-      background-color: $background-more-tint
+      background-color: $hover-background
   +media-breakpoint-down(sm)
     color: $reversal-text
     border-bottom: solid 1px $side-border

app/assets/stylesheets/blocks/page/_page-tabs.sass

@@ -31,7 +31,7 @@
 
 .page-tabs__item-link
   +flex-link
-  +text-block(.825rem 1, $default-text 600)
+  +text-block(.825rem 1, $semi-muted-text 600)
   align-items: center
   justify-content: center
   height: 2.75rem

app/assets/stylesheets/blocks/shared/_tab-nav.sass

@@ -25,14 +25,14 @@
 
 .tab-nav__item-link
   +block-link
-  +text-block(.75rem 2.3, $muted-text center nowrap)
+  +text-block(.75rem 2.3, $semi-muted-text center nowrap)
   background-color: $background-shade
   border-radius: 20rem
   width: 7rem
   transition: all.2s ease-out
   &:hover
     background-color: shade($background-shade, 10%)
-    color: $main-text
+    color: $default-text
   &.is-active
     background-color: $accent
-    color: $main-text
+    color: $default-text

app/assets/stylesheets/blocks/thread/_thread-list-item-title.sass

@@ -7,7 +7,7 @@
     align-items: flex-start
 
 .thread-list-item-title__icon
-  +text-block(.75rem, inline-flex $muted-text nowrap)
+  +text-block(.75rem, inline-flex $semi-muted-text nowrap 400)
   margin-top: .25rem
   +padding(horizontal, .5rem)
   height: 1.125rem

app/assets/stylesheets/blocks/user/_following.sass

@@ -0,0 +1,32 @@
+.following
+  position: relative
+
+.following__dropdown
+  +position(absolute, 2)
+  width: 18.75rem
+
+.following-option
+  cursor: pointer
+  width: 100%
+  padding: .75rem
+  display: block
+  text-align: left
+  transition: all .2s ease-out
+  &:hover
+    background-color: $hover-background
+
+.following-option__inner
+  position: relative
+  padding-left: 1.5rem
+  .following-option.is-active &::before
+    +fa(fas '\f00c')
+    +position(absolute, left 0, top 0)
+
+.following-option__label
+  +text-block(.875rem 1.4, 600 $semi-muted-text)
+  .following-option.is-active &
+    color: $default-text
+
+.following-option__desciption
+  +text-block(.75rem 1.5, $muted-text)
+  margin-top: .125rem

app/assets/stylesheets/initializers/_reset.sass

@@ -50,5 +50,6 @@ hr
   border: none
 
 details,
-details *
+details *,
+summary
   box-sizing: border-box

app/assets/stylesheets/mixins/_button.sass

@@ -15,6 +15,7 @@
   &.is-block
     display: flex
     width: 100%
+    max-width: 100%
     &.is-select
       +margin(horizontal, 0)
   &:focus
@@ -30,7 +31,6 @@
     margin-right: .35em
     margin-top: .02em
     font-size: 1.07em
-    font-weight: normal
   &.is-icon
     i
       +text-block(1.3em 1)

app/assets/stylesheets/variables/_colors.sass

@@ -5,6 +5,8 @@ $background: #ececec
 $background-shade: #d6d6d6
 $background-tint: #eceeef
 $background-more-tint: #f7f7f9
+$hover-background: $background-more-tint
+
 
 $default-text: #403f47
 $reversal-text: white

app/controllers/admin/users_controller.rb

@@ -57,7 +57,7 @@ def user_params
       :adviser, :login_name, :name,
       :name_kana, :email, :course_id,
       :description, :discord_account, :github_account,
-      :twitter_account, :facebook_url, :blog_url,
+      :twitter_account, :facebook_url, :blog_url, :times_url,
       :password, :password_confirmation, :job,
       :organization, :os, :study_place,
       :experience, :prefecture_code, :company_id,

app/controllers/api/followings_controller.rb

@@ -5,13 +5,24 @@ class API::FollowingsController < API::BaseController
 
   def create
     user = User.find(params[:id])
-    if current_user.follow(user)
+    watch = params[:watch] == 'true'
+    if current_user.follow(user, watch: watch)
       render json: { id: user.id }
     else
       head :bad_request
     end
   end
 
+  def update
+    user = User.find(params[:id])
+    watch = params[:watch] == 'true'
+    if current_user.change_watching(user, watch)
+      head :no_content
+    else
+      head :bad_request
+    end
+  end
+
   def destroy
     user = User.find(params[:id])
     if current_user.unfollow(user)