fjordllc · komagata · Mar 2, 2026 · Mar 17, 2025 · Mar 29, 2025 · Apr 1, 2025
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -57,6 +57,8 @@
 @import "./application/blocks/page-content/_page-content-header.css";
 @import "./application/blocks/page-content/_page-content-members.css";
 @import "./application/blocks/page-content/_page-content-prev-next.css";
+@import "./application/blocks/pair-work/_pair-work-info.css";
+@import "./application/blocks/pair-work/_pair-work-schedule-dates.css";
 @import "./application/blocks/practice/_categories.css";
 @import "./application/blocks/practice/_category-practices-item.css";
 @import "./application/blocks/practice/_completion-massage.css";

diff --git a/app/assets/stylesheets/application/blocks/event/_event-main-actions.css b/app/assets/stylesheets/application/blocks/event/_event-main-actions.css
@@ -2,21 +2,23 @@
 .event-main-actions {
   position: relative;
   z-index: 1;
-  padding-block: .75rem;
   margin-inline: 1rem;
   border-radius: 4px;
 }
 
+.event-main-actions:first-child {
+  margin-top: 1rem;
+  margin-bottom: 0;
+}
+
 @media (min-width: 48em) {
   .event-main-actions {
-    padding-inline: 2rem;
     margin-bottom: 1.5rem;
   }
 }
 
 @media (max-width: 47.9375em) {
   .event-main-actions {
-    padding-inline: .75rem;
     margin-bottom: 1rem;
   }
 }
@@ -45,6 +47,72 @@
   color: var(--danger);
 }
 
+.event-main-actions__header {
+  padding-block: .75rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.event-main-actions__header .a-button {
+  margin-block: -.5rem;
+}
+
+@media (min-width: 48em) {
+  .event-main-actions__header {
+    padding-inline: 1rem;
+  }
+}
+
+@media (max-width: 47.9375em) {
+  .event-main-actions__header {
+    padding-inline: .75rem;
+  }
+}
+
+.is-participationed .event-main-actions__header {
+  border-bottom: 1px solid var(--success);
+  color: #4e732e;
+}
+
+.is-unparticipationed.is-available .event-main-actions__header {
+  border-bottom: 1px solid var(--primary);
+  color: #28248c;
+}
+
+.is-unparticipationed.is-capacity-over .event-main-actions__header {
+  border-bottom: 1px solid var(--warning);
+  color: #6f5819;
+}
+
+.is-non-participationed .event-main-actions__header {
+  border-bottom: 1px solid var(--danger);
+  color: var(--danger);
+}
+
+.event-main-actions__title {
+  font-size: .875rem;
+  line-height: 1.4;
+  font-weight: 700;
+  text-align: center;
+}
+
+.event-main-actions__body {
+  padding-block: .75rem;
+}
+
+@media (min-width: 48em) {
+  .event-main-actions__body {
+    padding-inline: 1rem;
+  }
+}
+
+@media (max-width: 47.9375em) {
+  .event-main-actions__body {
+    padding-inline: .75rem;
+  }
+}
+
 .event-main-actions__description {
   font-size: .875rem;
   line-height: 1.4;

diff --git a/app/assets/stylesheets/application/blocks/page/_page-body-header.css b/app/assets/stylesheets/application/blocks/page/_page-body-header.css
@@ -0,0 +1,13 @@
+.page-body-header__inner {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  margin-bottom: 1rem;
+}
+
+.page-body-header__title {
+  font-size: 1rem;
+  line-height: 1.4;
+  font-weight: 700;
+  color: var(--main);
+}
diff --git a/app/assets/stylesheets/application/blocks/pair-work/_pair-work-info.css b/app/assets/stylesheets/application/blocks/pair-work/_pair-work-info.css
@@ -0,0 +1,48 @@
+.pair-work-info {
+  display: flex;
+  gap: 0.75rem;
+}
+
+.pair-work-info__user-icon {
+  width: 3.5rem;
+  height: 3.5rem;
+}
+
+.pair-work-info__end {
+  flex: 1;
+}
+
+.pair-badge {
+  font-family: serif;
+  border: double 0.1875rem var(--stamp-color);
+  border-radius: 0.75rem;
+  width: 4rem;
+  height: 3.5rem;
+  padding: 0.125rem;
+  position: absolute;
+  z-index: 1;
+  transform: rotate(25deg);
+  font-size: 1.125rem;
+  line-height: 1.1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: 800;
+  color: var(--stamp-color);
+  flex-direction: column;
+  pointer-events: none;
+}
+
+@media (min-width: 48em) {
+  .pair-badge {
+    right: 0;
+    top: -0.125rem;
+  }
+}
+
+@media (max-width: 47.9375em) {
+  .pair-badge {
+    left: 80%;
+    top: 0;
+  }
+}
diff --git a/app/assets/stylesheets/application/blocks/pair-work/_pair-work-schedule-dates.css b/app/assets/stylesheets/application/blocks/pair-work/_pair-work-schedule-dates.css
@@ -0,0 +1,44 @@
+.pair-work-schedule-dates.is-solved .pair-work-schedule-dates__table {
+  display: none;
+}
+
+.pair-work-schedule-dates.is-solved input:checked + .pair-work-schedule-dates__table {
+  display: block;
+}
+
+.pair-work-schedule-dates__action-items {
+  display: flex;
+  justify-content: center;
+}
+
+.pair-work-schedule-dates__action-item {
+  min-width: 20rem;
+}
+
+.pair-work-schedule-dates__action-item-description {
+  margin-top: 0.25rem;
+  font-size: 0.75rem;
+  line-height: 1.4;
+  text-align: center;
+}
+
+.pair-work-schedule-dates__title {
+  font-size: 1rem;
+  line-height: 1.4;
+  font-weight: 600;
+  margin-bottom: 1rem;
+}
+
+.pair-work-schedule-dates__action + .pair-work-schedule-dates__table-container .pair-work-schedule-dates__table {
+  margin-top: 1rem;
+}
+
+.pair-work-schedule-dates__cancel {
+  display: flex;
+  justify-content: center;
+  margin-bottom: 1rem;
+}
+
+.pair-work-schedule-dates__cancel-action {
+  min-width: 20rem;
+}
diff --git a/app/assets/stylesheets/atoms/_a-card.css b/app/assets/stylesheets/atoms/_a-card.css
@@ -65,15 +65,6 @@
   overflow-y: auto;
 }
 
-.a-card:has(.a-table) {
-  border: none;
-}
-
-.a-card:has(.a-table) .card-header {
-  border: solid 1px var(--border);
-  border-bottom: none;
-}
-
 .a-card.is-danger {
   border: solid 0.25rem var(--danger);
 }

diff --git a/app/assets/stylesheets/atoms/_a-form-help.css b/app/assets/stylesheets/atoms/_a-form-help.css
@@ -6,7 +6,7 @@
   margin-top: 0.5rem;
 }
 label + .a-form-help:not(:first-child) {
-  margin-top: 0;
+  margin-top: -0.5rem;
 }
 .a-form-help + input, .a-form-help + textarea {
   margin-top: 0.5rem;

diff --git a/app/assets/stylesheets/config/variables/_css-variables.css b/app/assets/stylesheets/config/variables/_css-variables.css
diff --git a/app/assets/stylesheets/shared/blocks/_global-nav.css b/app/assets/stylesheets/shared/blocks/_global-nav.css
@@ -51,8 +51,8 @@ input:checked + .global-nav .global-nav__background.a-overlay {
 @media (min-width: 48em) {
   .global-nav-links__link {
     flex-direction: column;
-    height: 4.125rem;
-    gap: 0.25rem;
+    height: 4.5rem;
+    gap: 0.375rem;
     padding-inline: 0;
     justify-content: center;
   }
@@ -73,29 +73,26 @@ input:checked + .global-nav .global-nav__background.a-overlay {
 }
 @media (min-width: 48em) {
   .global-nav-links__link-icon {
-    font-size: 1.125rem;
+    font-size: 1.25rem;
     margin-right: 0;
-    margin-bottom: 0.25rem;
+    display: flex;
+    align-items: center;
   }
 }
-.global-nav-links__link-icon .fa-rocket {
-  font-size: 1.15em;
-}
 
 .global-nav-links__link-label {
-  font-size: 0.625rem;
   line-height: 1.2;
-  text-align: center;
 }
 @media (max-width: 47.9375em) {
   .global-nav-links__link-label {
     font-size: 0.875rem;
   }
 }
 @media (min-width: 48em) {
-  .global-nav-links__link-label.is-sm {
-    transform: scale(0.875);
-    margin-top: -0.125rem;
+  .global-nav-links__link-label {
+    font-size: 0.625rem;
+    line-height: 1.4;
+    text-align: center;
   }
 }
 

diff --git a/app/components/page_tabs_component.html.slim b/app/components/page_tabs_component.html.slim
@@ -1,4 +1,4 @@
-.page-tabs
+nav.page-tabs
   .container
     ul.page-tabs__items
       - tabs.each do |tab|

diff --git a/app/components/sub_tab_component.html.slim b/app/components/sub_tab_component.html.slim
@@ -1,3 +1,9 @@
 li.tab-nav__item
   = link_to link, class: "tab-nav__item-link #{active ? 'is-active' : ''}" do
     = name
+    - if count.present?
+      = " （#{count}）"
+    - if badge&.positive?
+      .page-tabs__item-count.a-notification-count
+        .not-solved-count
+          = badge
diff --git a/app/components/sub_tab_component.rb b/app/components/sub_tab_component.rb
@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 class SubTabComponent < ViewComponent::Base
-  def initialize(name:, link:, active: false)
+  def initialize(name:, link:, active: false, count: nil, badge: nil)
     @name = name
     @link = link
     @active = active
+    @count = count
+    @badge = badge
   end
 
   private
 
-  attr_reader :name, :link, :active
+  attr_reader :name, :link, :active, :count, :badge
 end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -7,6 +7,7 @@ def index
     if current_user
       display_dashboard
       display_events_on_dashboard
+      display_pair_works_on_dashboard
       display_welcome_message_for_adviser
       set_required_fields
       display_products_for_mentor
@@ -57,6 +58,10 @@ def display_events_on_dashboard
     @upcoming_events_groups = UpcomingEvent.upcoming_events_groups
   end
 
+  def display_pair_works_on_dashboard
+    @upcoming_pair_works = PairWork.upcoming_pair_works(current_user)
+  end
+
   def display_welcome_message_for_adviser
     @welcome_message_first_time = cookies[:confirmed_welcome_message]
   end

diff --git a/app/controllers/pair_works/reservations_controller.rb b/app/controllers/pair_works/reservations_controller.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class PairWorks::ReservationsController < ApplicationController
+  before_action :require_mentor_login, only: %i[create]
+
+  def create
+    @pair_work = PairWork.find(params[:pair_work_id])
+    if @pair_work.reserve(pair_work_reservation_params)
+      ActiveSupport::Notifications.instrument('pair_work.reserve', pair_work: @pair_work)
+      redirect_to Redirection.determin_url(self, @pair_work), notice: @pair_work.generate_notice_message(:reserve)
+    else
+      @comments = @pair_work.comments.order(:created_at)
+      render 'pair_works/show'
+    end
+  end
+
+  def destroy; end
+
+  private
+
+  def pair_work_reservation_params
+    params.require(:pair_work).permit(:reserved_at).merge(buddy_id: current_user.id)
+  end
+end