대시보드 카드 스타일 수정 / 스케줄러 view 페이지 스킵

app/assets/stylesheets/application.tailwind.css

@@ -132,7 +132,7 @@
     }
 
     .content {
-        @apply lg:rounded-lg bg-base-content p-0 lg:p-4
+        @apply lg:rounded-lg bg-base-background
     }
 
     .page-title {
@@ -190,7 +190,7 @@
 
     /*Dashboard*/
     .dashboard-group {
-        @apply rounded-md bg-base-background min-h-32 p-4 flex flex-col justify-between cursor-pointer
+        @apply rounded-md bg-base-content min-h-32 p-4 flex flex-col justify-between cursor-pointer shadow-xs
     }
 
     /*Pagy*/

app/views/environment/edit_co2.html.erb

@@ -0,0 +1,86 @@
+<div class="flex flex-col h-full lg:rounded-lg">
+  <div class="flex flex-row items-center space-x-4 p-2">
+    <%= link_to environment_index_path(id: params[:id]), class: "flex items-center" do %>
+      <i class="fa-solid fa-angle-left text-2xl"></i>
+    <% end %>
+    <div class="text-2xl font-bold leading-10"><%= @controller.id %>동 온도 스케줄러</div>
+  </div>
+  <div class="space-y-4 overflow-y-hidden divide-y divide-base-border bg-base-content rounded-lg p-4">
+    <%= form_with url: edit_temp_environment_path, method: :post, class: 'flex flex-col h-full' do %>
+      <%= hidden_field_tag :controller_id, params[:id] %>
+      <div class="flex flex-col divide-y divide-base-border overflow-y-hidden flex-1 space-y-4">
+        <%= submit_tag "업데이트", class: "btn bg-primary w-fit" %>
+        <div class="overflow-y-auto flex-1 min-h-0 border border-base-border rounded-lg">
+          <ul class="divide-y divide-base-border whitespace-nowrap relative">
+            <% if @schedule.present? %>
+              <% @schedule.each do |s| %>
+                <li class="flex justify-between items-center px-4 py-2 space-x-4 h-full relative">
+                  <div class="flex items-center space-x-4 basis-3/5 h-full">
+                    <!-- 시간 -->
+                    <div class="flex flex-col lg:flex-row h-full items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0">
+                      <div class=" text-left w-full lg:w-auto">시간</div>
+                      <div class="text-xl flex items-center space-x-1 w-full h-full">
+                        <%= select_tag "schedule[#{s.id}][hour]",
+                                       options_for_select((0..23).map { |h| [h.to_s.rjust(2, '0'), h] }, s.hour),
+                                       class: "select-style  min-w-[60px]" %>
+                        <div>:</div>
+                        <%= number_field_tag "schedule[#{s.id}][minute]",
+                                             s.minute, min: 0, max: 59, step: 1, inputmode: "decimal",
+                                             class: "input-style min-w-[60px]" %>
+                      </div>
+                    </div>
+
+                    <!-- 온도 -->
+                    <div class="flex flex-col lg:flex-row h-full items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0">
+                      <div class=" text-left w-full lg:w-auto">온도 (°C)</div>
+                      <div class="text-xl flex items-center">
+                        <%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, min: -99, max: 99, step: "0.1", inputmode: "decimal", class: "input-style min-w-[68px]" %>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="flex items-center space-x-4 basis-2/5 justify-end h-full">
+                    <!-- 사용 여부 -->
+                    <div class="flex flex-col lg:flex-row items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0 h-full">
+                      <div class="">ON/OFF</div>
+                      <label class="relative inline-flex items-center cursor-pointer h-full">
+                        <%= check_box_tag "schedule[#{s.id}][is_active]", "1", s.is_active == true || s.is_active == 1, class: "sr-only peer" %>
+                        <div class="toggle_style"></div>
+                        <div class="btn-toggle-round"></div>
+                      </label>
+                    </div>
+
+                    <!-- 삭제 -->
+                    <div class="flex flex-col lg:flex-row items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0 h-full relative">
+                      <div class="">&nbsp;</div>
+                      <%= link_to schedule_path(s),
+                                  data: { turbo_method: :delete, turbo_confirm: "정말 삭제하시겠습니까?" },
+                                  class: "btn bg-danger text-sm flex items-center px-2 py-0 my-1.5 lg:px-4 lg:py-1.5 lg:my-0" do %>
+                        <div class="hidden lg:block">삭제</div>
+                        <div class="block lg:hidden"><i class="fa-solid fa-xmark"></i></div>
+                      <% end %>
+                    </div>
+                  </div>
+                </li>
+              <% end %>
+            <% else %>
+              <li class="text-center p-4 w-full">저장된 스케줄이 없습니다.</li>
+            <% end %>
+          </ul>
+        </div>
+        <div class="flex space-x-4">
+          <%= button_to "초기화", reset_schedule_path(params[:id]),
+                        method: :post,
+                        data: { turbo_confirm: "정말 초기화하시겠습니까? 모든 스케줄 데이터가 삭제됩니다." },
+                        class: "btn bg-danger" %>
+          <%= button_to "추가하기", open_modals_path(type: "add_schedule", id: params[:id]),
+                        class: "btn bg-default-slate",
+                        data: {
+                          turbo_method: :post,
+                          turbo_frame: "modals"
+                        } %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

app/views/environment/edit_humidity.html.erb

@@ -0,0 +1,86 @@
+<div class="flex flex-col h-full lg:rounded-lg">
+  <div class="flex flex-row items-center space-x-4 p-2">
+    <%= link_to environment_index_path(id: params[:id]), class: "flex items-center" do %>
+      <i class="fa-solid fa-angle-left text-2xl"></i>
+    <% end %>
+    <div class="text-2xl font-bold leading-10"><%= @controller.id %>동 온도 스케줄러</div>
+  </div>
+  <div class="space-y-4 overflow-y-hidden divide-y divide-base-border bg-base-content rounded-lg p-4">
+    <%= form_with url: edit_temp_environment_path, method: :post, class: 'flex flex-col h-full' do %>
+      <%= hidden_field_tag :controller_id, params[:id] %>
+      <div class="flex flex-col divide-y divide-base-border overflow-y-hidden flex-1 space-y-4">
+        <%= submit_tag "업데이트", class: "btn bg-primary w-fit" %>
+        <div class="overflow-y-auto flex-1 min-h-0 border border-base-border rounded-lg">
+          <ul class="divide-y divide-base-border whitespace-nowrap relative">
+            <% if @schedule.present? %>
+              <% @schedule.each do |s| %>
+                <li class="flex justify-between items-center px-4 py-2 space-x-4 h-full relative">
+                  <div class="flex items-center space-x-4 basis-3/5 h-full">
+                    <!-- 시간 -->
+                    <div class="flex flex-col lg:flex-row h-full items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0">
+                      <div class=" text-left w-full lg:w-auto">시간</div>
+                      <div class="text-xl flex items-center space-x-1 w-full h-full">
+                        <%= select_tag "schedule[#{s.id}][hour]",
+                                       options_for_select((0..23).map { |h| [h.to_s.rjust(2, '0'), h] }, s.hour),
+                                       class: "select-style  min-w-[60px]" %>
+                        <div>:</div>
+                        <%= number_field_tag "schedule[#{s.id}][minute]",
+                                             s.minute, min: 0, max: 59, step: 1, inputmode: "decimal",
+                                             class: "input-style min-w-[60px]" %>
+                      </div>
+                    </div>
+
+                    <!-- 온도 -->
+                    <div class="flex flex-col lg:flex-row h-full items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0">
+                      <div class=" text-left w-full lg:w-auto">온도 (°C)</div>
+                      <div class="text-xl flex items-center">
+                        <%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, min: -99, max: 99, step: "0.1", inputmode: "decimal", class: "input-style min-w-[68px]" %>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="flex items-center space-x-4 basis-2/5 justify-end h-full">
+                    <!-- 사용 여부 -->
+                    <div class="flex flex-col lg:flex-row items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0 h-full">
+                      <div class="">ON/OFF</div>
+                      <label class="relative inline-flex items-center cursor-pointer h-full">
+                        <%= check_box_tag "schedule[#{s.id}][is_active]", "1", s.is_active == true || s.is_active == 1, class: "sr-only peer" %>
+                        <div class="toggle_style"></div>
+                        <div class="btn-toggle-round"></div>
+                      </label>
+                    </div>
+
+                    <!-- 삭제 -->
+                    <div class="flex flex-col lg:flex-row items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0 h-full relative">
+                      <div class="">&nbsp;</div>
+                      <%= link_to schedule_path(s),
+                                  data: { turbo_method: :delete, turbo_confirm: "정말 삭제하시겠습니까?" },
+                                  class: "btn bg-danger text-sm flex items-center px-2 py-0 my-1.5 lg:px-4 lg:py-1.5 lg:my-0" do %>
+                        <div class="hidden lg:block">삭제</div>
+                        <div class="block lg:hidden"><i class="fa-solid fa-xmark"></i></div>
+                      <% end %>
+                    </div>
+                  </div>
+                </li>
+              <% end %>
+            <% else %>
+              <li class="text-center p-4 w-full">저장된 스케줄이 없습니다.</li>
+            <% end %>
+          </ul>
+        </div>
+        <div class="flex space-x-4">
+          <%= button_to "초기화", reset_schedule_path(params[:id]),
+                        method: :post,
+                        data: { turbo_confirm: "정말 초기화하시겠습니까? 모든 스케줄 데이터가 삭제됩니다." },
+                        class: "btn bg-danger" %>
+          <%= button_to "추가하기", open_modals_path(type: "add_schedule", id: params[:id]),
+                        class: "btn bg-default-slate",
+                        data: {
+                          turbo_method: :post,
+                          turbo_frame: "modals"
+                        } %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

app/views/environment/edit_temp.html.erb

@@ -5,8 +5,8 @@
     <% end %>
     <div class="text-2xl font-bold leading-10"><%= @controller.id %>동 온도 스케줄러</div>
   </div>
-  <div class="space-y-4 content overflow-y-hidden divide-y divide-base-border">
+  <div class="space-y-4 overflow-y-hidden divide-y divide-base-border bg-base-content rounded-lg p-4">
-    <%= form_with url: schedule_edit_update_schedules_path, method: :post, class: 'flex flex-col h-full' do %>
+    <%= form_with url: edit_temp_environment_path, method: :post, class: 'flex flex-col h-full' do %>
       <%= hidden_field_tag :controller_id, params[:id] %>
       <div class="flex flex-col divide-y divide-base-border overflow-y-hidden flex-1 space-y-4">
         <%= submit_tag "업데이트", class: "btn bg-primary w-fit" %>

app/views/environment/index.html.erb

@@ -1,7 +1,7 @@
 <div class="w-full h-full content overflow-y-auto">
   <div class="flex-1 grid grid-cols-2 xl:grid-cols-4 gap-4">
     <!-- 실내온도 -->
-    <%= link_to view_temp_environment_path(id: params[:id]), class: "dashboard-group" do %>
+    <%= link_to edit_temp_environment_path(id: params[:id]), class: "dashboard-group" do %>
       <div class="flex flex-col justify-between h-full space-y-2">
         <div class="flex flex-row justify-between w-full">
           <div class="flex flex-row space-x-4 items-center">
@@ -33,7 +33,7 @@
     <% end %>
 
     <!-- 실내습도 -->
-    <%= link_to view_humidity_environment_path(id: params[:id]), class: "dashboard-group" do %>
+    <%= link_to edit_humidity_environment_path(id: params[:id]), class: "dashboard-group" do %>
       <div class="flex flex-col justify-between h-full space-y-2">
         <div class="flex flex-row justify-between w-full">
           <div class="flex flex-row space-x-4 items-center">
@@ -65,7 +65,7 @@
     <% end %>
 
     <!-- CO2 -->
-    <%= link_to view_co2_environment_path(id: params[:id]), class: "dashboard-group" do %>
+    <%= link_to edit_co2_environment_path(id: params[:id]), class: "dashboard-group" do %>
       <div class="flex flex-col justify-between h-full space-y-2">
         <div class="flex flex-row justify-between w-full">
           <div class="flex flex-row space-x-4 items-center">
@@ -133,7 +133,7 @@
     <% end %>
 
     <!-- 센서 구역 -->
-    <%= link_to view_area_environment_path(id: params[:id]), class: "dashboard-group" do %>
+    <%= link_to edit_area_environment_path(id: params[:id]), class: "dashboard-group" do %>
       <div class="flex flex-col justify-between h-full space-y-2">
         <div class="flex flex-row justify-between w-full">
           <div class="flex flex-row space-x-4 items-center">

app/views/environment/view_temp.html.erb

@@ -5,7 +5,7 @@
     <% end %>
     <div class="text-2xl font-bold leading-10"><%= @controller.id %>동 온도 스케줄러</div>
   </div>
-  <div class="flex flex-col flex-1 space-y-4 overflow-y-hidden content">
+  <div class="flex flex-col flex-1 space-y-4 overflow-y-hidden lg:p-4 bg-base-content rounded-lg">
     <div class="flex justify-between">
       <%= link_to "수정", edit_temp_environment_path(@controller.id), class: "btn bg-default-slate" %>
     </div>

app/views/nutrient/index.html.erb

@@ -1,7 +1,7 @@
 <div class="w-full h-full content overflow-y-auto">
   <div class="flex-1 grid grid-cols-2 xl:grid-cols-4 gap-4">
     <!-- pH -->
-    <%= link_to view_temp_environment_path(id: params[:id]), class: "dashboard-group" do %>
+    <%= link_to edit_temp_environment_path(id: params[:id]), class: "dashboard-group" do %>
       <div class="flex flex-col justify-between h-full space-y-2">
         <div class="flex flex-row justify-between w-full">
           <div class="flex flex-row space-x-4 items-center">
@@ -34,7 +34,7 @@
     <% end %>
 
     <!-- EC -->
-    <%= link_to view_temp_environment_path(id: params[:id]), class: "dashboard-group" do %>
+    <%= link_to edit_temp_environment_path(id: params[:id]), class: "dashboard-group" do %>
       <div class="flex flex-col justify-between h-full space-y-2">
         <div class="flex flex-row justify-between w-full">
           <div class="flex flex-row space-x-4 items-center">

app/views/schedules/schedule_edit.html.erb

@@ -1,14 +1,17 @@
-<div class="flex flex-col h-full divide-y divide-base-border lg:rounded-lg bg-base-third border border-table-border">
+<div class="flex flex-col h-full lg:rounded-lg">
-  <div class="flex flex-col flex-1 space-y-4 overflow-y-hidden">
+  <div class="flex flex-row items-center space-x-4 p-2">
-    <div class="overflow-y-auto divide-y divide-base-border">
+    <%= link_to environment_index_path(id: params[:id]), class: "flex items-center" do %>
-      <%= form_with url: schedule_edit_update_schedules_path, method: :post, class: 'flex flex-col' do %>
+      <i class="fa-solid fa-angle-left text-2xl"></i>
-        <%= hidden_field_tag :controller_id, params[:id] %>
+    <% end %>
-        <div class="divide-y divide-base-border">
+    <div class="text-2xl font-bold leading-10"><%= @controller.id %>동 온도 스케줄러</div>
-          <div class="flex justify-between p-4">
+  </div>
-            <div class="text-2xl font-bold leading-10"><%= @controller.name %> 컨트롤러</div>
+  <div class="space-y-4 overflow-y-hidden divide-y divide-base-border bg-base-content rounded-lg p-4">
-            <%= submit_tag "업데이트", class: "btn bg-primary" %>
+    <%= form_with url: edit_temp_environment_path, method: :post, class: 'flex flex-col h-full' do %>
-          </div>
+      <%= hidden_field_tag :controller_id, params[:id] %>
-          <ul class="divide-y divide-table-border bg-table-background whitespace-nowrap h-full relative">
+      <div class="flex flex-col divide-y divide-base-border overflow-y-hidden flex-1 space-y-4">
+        <%= submit_tag "업데이트", class: "btn bg-primary w-fit" %>
+        <div class="overflow-y-auto flex-1 min-h-0 border border-base-border rounded-lg">
+          <ul class="divide-y divide-base-border whitespace-nowrap relative">
             <% if @schedule.present? %>
               <% @schedule.each do |s| %>
                 <li class="flex justify-between items-center px-4 py-2 space-x-4 h-full relative">
@@ -65,19 +68,19 @@
             <% end %>
           </ul>
         </div>
-      <% end %>
+        <div class="flex space-x-4">
-      <div class="flex p-4 space-x-4">
+          <%= button_to "초기화", reset_schedule_path(params[:id]),
-        <%= button_to "초기화", reset_schedule_path(params[:id]),
+                        method: :post,
-                      method: :post,
+                        data: { turbo_confirm: "정말 초기화하시겠습니까? 모든 스케줄 데이터가 삭제됩니다." },
-                      data: { turbo_confirm: "정말 초기화하시겠습니까? 모든 스케줄 데이터가 삭제됩니다." },
+                        class: "btn bg-danger" %>
-                      class: "btn bg-danger" %>
+          <%= button_to "추가하기", open_modals_path(type: "add_schedule", id: params[:id]),
-        <%= button_to "추가하기", open_modals_path(type: "add_schedule", id: params[:id]),
+                        class: "btn bg-default-slate",
-                      class: "btn bg-default-slate",
+                        data: {
-                      data: {
+                          turbo_method: :post,
-                        turbo_method: :post,
+                          turbo_frame: "modals"
-                        turbo_frame: "modals"
+                        } %>
-                      } %>
+        </div>
       </div>
-    </div>
+    <% end %>
   </div>
 </div>

config/routes.rb

@@ -32,11 +32,13 @@ Rails.application.routes.draw do
 
   resources :environment do
     member do
-      get "view_temp"
-      get "view_humidity"
-      get "view_co2"
-      get "view_area"
       get "edit_temp"
+      get "edit_humidity"
+      get "edit_co2"
+      get "edit_area"
+    end
+    collection do
+      post "edit_temp_update"
     end
   end
   resources :nutrient