Release 2023-03-01 13:03:21

Gemfile

@@ -41,8 +41,8 @@ gem 'net-pop', require: false
 gem 'net-smtp', require: false # TODO: Remove it if you use rails 7.0.1
 gem 'newspaper'
 gem 'oauth2'
-gem 'omniauth', '~> 1.9.2'
-gem 'omniauth-github', '~> 1.4.0'
+gem 'omniauth', '~> 2.1.1'
+gem 'omniauth-github', '~> 2.0.1'
 gem 'pg'
 gem 'postmark-rails'
 gem 'rack-cors', require: 'rack/cors'

Gemfile.lock

@@ -147,10 +147,10 @@ GEM
     discord-notifier (1.0.3)
     erubi (1.11.0)
     execjs (2.8.1)
-    faraday (2.6.0)
+    faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.1)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     globalid (1.0.1)
       activesupport (>= 5.0)
@@ -206,7 +206,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.6.2)
-    jwt (2.5.0)
+    jwt (2.7.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -281,15 +281,16 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (1.9.2)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-github (1.4.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-oauth2 (1.7.3)
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-github (2.0.1)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8)
+    omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
-      omniauth (>= 1.9, < 3)
+      omniauth (~> 2.0)
     os (1.1.4)
     parallel (1.22.1)
     parser (3.1.2.1)
@@ -321,6 +322,8 @@ GEM
       rack (>= 1.1, < 2.3)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
+    rack-protection (3.0.5)
+      rack
     rack-proxy (0.7.4)
       rack
     rack-test (2.0.2)
@@ -566,8 +569,8 @@ DEPENDENCIES
   net-smtp
   newspaper
   oauth2
-  omniauth (~> 1.9.2)
-  omniauth-github (~> 1.4.0)
+  omniauth (~> 2.1.1)
+  omniauth-github (~> 2.0.1)
   pg
   postmark-rails
   pry-byebug

app/assets/stylesheets/application/blocks/page/_page-notices.sass

@@ -3,5 +3,7 @@
   background-color: $success
 
 .page-notices__item
+  .a-badge
+    min-width: 5rem
   &:not(:first-child)
     border-top: dashed 1px rgba(white, .2)

app/assets/stylesheets/atoms/_a-page-notice.sass

@@ -22,6 +22,7 @@
   &.has-close
     position: relative
     display: flex
+    text-align: left
   p
     +text-block(1em 1.5, $reversal-text)
     +media-breakpoint-up(md)
@@ -35,16 +36,20 @@
       text-decoration: none
       +media-breakpoint-down(sm)
         display: block
-        position: relative
-        padding-left: 4rem
       .a-badge
         margin-right: .75rem
         background-color: rgba(black, .4)
         border: none
         +media-breakpoint-down(sm)
-          +position(absolute, left 0, top 0)
       .a-page-notice__label
         +hover-link-reversal
+        +media-breakpoint-up(md)
+          max-width: 17.5rem
+          overflow: hidden
+          text-overflow: ellipsis
+          display: inline-block
+          white-space: nowrap
+          vertical-align: bottom
 
 .a-page-notice__inner-start
   flex: 1
@@ -58,7 +63,6 @@
   font-size: 1.5rem
   opacity: .6
   transition: all .2s ease-out
-  margin-left: .5rem
   transform: translateX(1rem)
   +margin(vertical,  -.75rem)
   &:hover

app/controllers/admin/campaigns_controller.rb

@@ -23,7 +23,8 @@ def create
 
   def index
     @campaigns = Campaign.order(end_at: :desc)
-    @retired_students = User.retired_students
+    @normal_students = User.where(admin: false, mentor: false, adviser: false, trainee: false)
+    @continued_students = User.where(admin: false, mentor: false, adviser: false, trainee: false, retired_on: nil)
   end
 
   def edit; end

app/controllers/api/questions_controller.rb

@@ -31,6 +31,7 @@ def show
   def update
     question = Question.find(params[:id])
     if question.update(question_params)
+      Newspaper.publish(:question_update, question)
       head :ok
     else
       head :bad_request

app/controllers/home_controller.rb

@@ -7,6 +7,7 @@ def index
     if current_user
       display_dashboard
       display_events_on_dashboard
+      display_regular_events_on_dashboard
       display_welcome_message_for_adviser
       set_required_fields
       render aciton: :index
@@ -61,6 +62,18 @@ def display_events_on_dashboard
     @events_coming_soon_except_job_hunting = @events_coming_soon.where.not(job_hunting: true)
   end
 
+  def display_regular_events_on_dashboard
+    cookies_ids = JSON.parse(cookies[:confirmed_regular_event_ids]) if cookies[:confirmed_regular_event_ids]
+    regular_events_comming_soon = RegularEvent.today_events + RegularEvent.tomorrow_events
+    @regular_events_comming_soon_for_current_user = regular_events_comming_soon.select { |event| event.participated_by?(current_user) }
+
+    cookies_ids&.each do |id|
+      @regular_events_comming_soon_for_current_user.delete_if do |event|
+        event.id == id.to_i
+      end
+    end
+  end
+
   def display_welcome_message_for_adviser
     @welcome_message_first_time = cookies[:confirmed_welcome_message]
   end

app/controllers/products_controller.rb

@@ -54,6 +54,7 @@ def update
     set_wip
     update_published_at
     if @product.update(product_params)
+      Newspaper.publish(:product_update, @product)
       redirect_to @product, notice: notice_message(@product, :update)
       notice_another_mentor_assined_as_checker
       notice_product_update if @product.checker_id.present?

app/controllers/questions_controller.rb

@@ -55,6 +55,7 @@ def create
     @question.user = current_user
     @question.wip = params[:commit] == 'WIP'
     if @question.save
+      Newspaper.publish(:question_create, @question)
       redirect_to @question, notice: notice_message(@question)
     else
       render :new

app/decorators/regular_event_decorator.rb

@@ -12,7 +12,7 @@ def holding_cycles
   def next_holding_date
     if finished
       '開催終了'
-    elsif event_day?
+    elsif holding_today?
       '本日開催'
     else
       "次回の開催日は #{l next_event_date} です"

app/decorators/user_decorator.rb

@@ -6,14 +6,17 @@ def twitter_url
   end
 
   def roles
-    roles = []
-
-    roles << :retired if retired_on?
-    roles << :admin if admin?
-    roles << :mentor if mentor?
-    roles << :adviser if adviser?
-    roles << :graduate if graduated_on?
-    roles << :trainee if trainee?
+    role_list = [
+      { role: 'retired', value: retired? },
+      { role: 'hibernationed', value: hibernated? },
+      { role: 'admin', value: admin? },
+      { role: 'mentor', value: mentor? },
+      { role: 'adviser', value: adviser? },
+      { role: 'graduate', value: graduated? },
+      { role: 'trainee', value: trainee? }
+    ]
+    roles = role_list.find_all { |v| v[:value] }
+                     .map { |v| v[:role] }
     roles << :student if roles.empty?
 
     roles
@@ -25,9 +28,9 @@ def primary_role
 
   def staff_roles
     staff_roles = [
-      { role: '管理者', value: admin },
-      { role: 'メンター', value: mentor },
-      { role: 'アドバイザー', value: adviser }
+      { role: '管理者', value: admin? },
+      { role: 'メンター', value: mentor? },
+      { role: 'アドバイザー', value: adviser? }
     ]
     staff_roles.find_all { |v| v[:value] }
                .map { |v| v[:role] }
@@ -38,12 +41,13 @@ def roles_to_s
     return '' if roles.empty?
 
     roles = [
-      { role: '退会ユーザー', value: retired_on? },
-      { role: '管理者', value: admin },
-      { role: 'メンター', value: mentor },
-      { role: 'アドバイザー', value: adviser },
-      { role: '卒業生', value: graduated_on? },
-      { role: '研修生', value: trainee }
+      { role: '退会ユーザー', value: retired? },
+      { role: '休会ユーザー', value: hibernated? },
+      { role: '管理者', value: admin? },
+      { role: 'メンター', value: mentor? },
+      { role: 'アドバイザー', value: adviser? },
+      { role: '卒業生', value: graduated? },
+      { role: '研修生', value: trainee? }
     ]
     roles.find_all { |v| v[:value] }
          .map { |v| v[:role] }
@@ -83,7 +87,7 @@ def title
   end
 
   def long_name
-    "#{login_name} (#{name})"
+    "#{name} (#{name_kana})"
   end
 
   def enrollment_period

app/helpers/home_helper.rb

@@ -2,13 +2,21 @@
 
 module HomeHelper
   def today_or_tommorow(event)
-    if event.start_at.to_date.today?
+    if event.holding_today?
       '今日'
-    elsif event.start_at.to_date == Date.tomorrow
+    elsif event.holding_tomorrow?
       '明日'
     end
   end
 
+  def event_date(event)
+    if event.holding_today?
+      Date.current
+    elsif event.holding_tomorrow?
+      Date.tomorrow
+    end
+  end
+
   def anchor_to_required_field(attribute)
     {
       avatar_attached: 'form-user-avatar',

app/javascript/components/AdminCompanies.jsx

@@ -7,14 +7,17 @@ import Pagination from './Pagination'
 export default function AdminCompanies() {
   const per = 20
   const neighbours = 4
-  const defaultPage = parseInt(queryString.parse(location.search)['page']) || 1
+  const defaultPage = parseInt(queryString.parse(location.search).page) || 1
   const [page, setPage] = useState(defaultPage)
 
   useEffect(() => {
     setPage(page)
   }, [page])
 
-  const { data, error } = useSWR(`/api/admin/companies.json?page=${page}&per=${per}`, fetcher)
+  const { data, error } = useSWR(
+    `/api/admin/companies.json?page=${page}&per=${per}`,
+    fetcher
+  )
   if (error) return <>An error has occurred.</>
   if (!data) return <>Loading...</>
 
@@ -30,7 +33,7 @@ export default function AdminCompanies() {
         per={per}
         neighbours={neighbours}
         page={page}
-        onChange={e => handlePaginate(e.page)}
+        onChange={(e) => handlePaginate(e.page)}
       />
       <div className="admin-table">
         <table className="admin-table__table">
@@ -56,13 +59,13 @@ export default function AdminCompanies() {
         per={per}
         neighbours={neighbours}
         page={page}
-        onChange={e => handlePaginate(e.page)}
+        onChange={(e) => handlePaginate(e.page)}
       />
     </>
   )
 }
 
-const AdminCompany = ({company}) => {
+const AdminCompany = ({ company }) => {
   const url = `/companies/${company.id}`
   const editUrl = `/admin/companies/${company.id}/edit`
 
@@ -75,18 +78,27 @@ const AdminCompany = ({company}) => {
         <img className="admin-table__item-logo-image" src={company.logo_url} />
       </td>
       <td className="admin-table__item-value">{company.website}</td>
-      <td className="admin-table__item-value admin-table__item-value is-text-align-center">
-        <a title="アドバイザーサインアップURL" href={company.adviser_sign_up_url} className="a-button is-sm is-secondary is-icon">
+      <td className="admin-table__item-value is-text-align-center">
+        <a
+          title="アドバイザーサインアップURL"
+          href={company.adviser_sign_up_url}
+          className="a-button is-sm is-secondary is-icon">
           <i className="fa-solid fa-user-plus"></i>
         </a>
       </td>
-      <td className="admin-table__item-value admin-table__item-value is-text-align-center">
-        <a title="アドバイザーサインアップURL" href={company.trainee_sign_up_url} className="a-button is-sm is-secondary is-icon">
+      <td className="admin-table__item-value is-text-align-center">
+        <a
+          title="アドバイザーサインアップURL"
+          href={company.trainee_sign_up_url}
+          className="a-button is-sm is-secondary is-icon">
           <i className="fa-solid fa-user-plus"></i>
         </a>
       </td>
-      <td className="admin-table__item-value admin-table__item-value is-text-align-center">
-        <a title="アドバイザーサインアップURL" href={editUrl} className="a-button is-sm is-secondary is-icon">
+      <td className="admin-table__item-value is-text-align-center">
+        <a
+          title="アドバイザーサインアップURL"
+          href={editUrl}
+          className="a-button is-sm is-secondary is-icon">
           <i className="fa-solid fa-pen"></i>
         </a>
       </td>

app/javascript/components/AdminCourses.jsx

@@ -51,16 +51,14 @@ function AdminCourse(props) {
           <li>
             <a
               href={editUrl}
-              className="a-button is-sm is-secondary is-icon is-block"
-            >
+              className="a-button is-sm is-secondary is-icon is-block">
               <i className="fa fa-solid fa-pen" />
             </a>
           </li>
           <li>
             <a
               href={sortUrl}
-              className="a-button is-sm is-secondary is-icon is-block"
-            >
+              className="a-button is-sm is-secondary is-icon is-block">
               <i className="fa-solid fa-align-justify" />
             </a>
           </li>