diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index 7fa1d63..c93004a 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -58,7 +58,7 @@ @layer base { body { - @apply bg-base-background text-base-text font-['Pretendard-Regular'] + @apply bg-base-background text-base-text font-['Godo'] } hr { @@ -94,7 +94,7 @@ /*Form*/ .label-style { - @apply block my-1 font-bold text-default-slate-dark + @apply block my-1 text-default-slate-dark } .select-style { @@ -125,12 +125,12 @@ @layer utilities { .header { - @apply p-4 text-lg font-bold h-16 flex justify-between items-center; + @apply p-4 text-lg h-16 flex justify-between items-center; } .side-bar { - /*@apply w-[16rem] pl-4 text-lg font-bold divide-y divide-base-border;*/ - @apply w-[16rem] p-4 text-lg font-bold; + /*@apply w-[16rem] pl-4 text-lg divide-y divide-base-border;*/ + @apply w-[16rem] p-4 text-lg; } .content { @@ -138,15 +138,15 @@ } .page-title { - @apply text-xl font-bold; + @apply text-xl; } .search-title { - @apply text-base font-bold; + @apply text-base; } .form-title { - @apply text-center text-3xl font-bold tracking-tight text-default-slate-dark + @apply text-center text-3xl tracking-tight text-default-slate-dark } .field { @@ -183,7 +183,7 @@ } .menu-group-items-title { - @apply text-base font-bold + @apply text-base } .copyright { @@ -195,6 +195,10 @@ @apply rounded-md min-h-32 p-4 flex flex-col justify-between cursor-pointer shadow-xs } + .dashboard-title { + @apply text-2xl + } + /*Pagy*/ .pagy { @apply flex items-center justify-center space-x-1 font-semibold text-sm text-default-slate; @@ -234,7 +238,7 @@ } .base-table th { - @apply p-3 text-left font-bold lg:table-cell + @apply p-3 text-left lg:table-cell } .base-table tr { @@ -260,11 +264,11 @@ @media (min-width: 640px) { .page-title { - @apply text-3xl font-bold; + @apply text-3xl; } .search-title { - @apply text-lg font-bold; + @apply text-lg; } } @@ -311,4 +315,11 @@ src: url('https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff'); font-weight: 400; font-style: normal; +} + +@font-face { + font-family: 'Godo'; + font-style: normal; + font-weight: 400; + src: url('https://fastly.jsdelivr.net/korean-webfonts/1/corps/godo/Godo/GodoM.woff2') format('woff2'), url('https://fastly.jsdelivr.net/korean-webfonts/1/corps/godo/Godo/GodoM.woff') format('woff'); } \ No newline at end of file diff --git a/app/views/environment/edit_temp.html.erb b/app/views/environment/edit_temp.html.erb index 30bbabe..8b54395 100644 --- a/app/views/environment/edit_temp.html.erb +++ b/app/views/environment/edit_temp.html.erb @@ -3,82 +3,100 @@ <%= link_to environment_index_path(id: params[:id]), class: "flex items-center" do %> <% end %> -
<%= @controller.id %>동 온도 스케줄러
+
<%= @controller.id %>동 환경 스케줄러
-
+
<%= form_with url: edit_temp_environment_path, method: :post, class: 'flex flex-col h-full' do %> - <%= hidden_field_tag :controller_id, params[:id] %> -
- <%= submit_tag "업데이트", class: "btn bg-primary w-fit" %> -
-
    - <% if @schedule.present? %> - <% @schedule.each do |s| %> -
  • -
    - -
    -
    시간
    -
    - <%= 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]" %> -
    :
    - <%= number_field_tag "schedule[#{s.id}][minute]", - s.minute, min: 0, max: 59, step: 1, inputmode: "decimal", - class: "input-style min-w-[60px]" %> -
    -
    +
    +
    +
    + <%= submit_tag "업데이트", class: "btn bg-primary w-fit" %> +
    + <%= link_to "추가하기", open_modals_path(type: "add_feeder_schedule"), + class: "btn bg-default-slate", + data: { + turbo_method: :post, + turbo_frame: "modals" + } %> +
    +
    +
    +
      + +
    • +
      +
      번호
      +
      시작 시간 (시/분)
      +
      온도 (°C)
      +
      습도 (%)
      +
      CO2
      +
      +
      +
      사용 여부
      +
      작업
      +
      +
      • +
    • +
      + +
      1
      - -
      -
      온도 (°C)
      -
      - <%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, min: -99, max: 99, step: "0.1", inputmode: "decimal", class: "input-style min-w-[68px]" %> -
      -
      + +
      + +
      :
      +
      -
      - -
      -
      ON/OFF
      - -
      - - -
      -
       
      - <%= 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 %> - -
      - <% end %> -
      + +
      + +
      ~
      +
      -
      • - <% end %> - <% else %> -
    • 저장된 스케줄이 없습니다.
      • - <% end %> -
    -
    -
    - <%= 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" - } %> + + +
    + +
    ~
    + +
    + + +
    + +
    ~
    + +
    +
    + +
    + +
    + +
    + + +
    + +
    +
    +
    • + +
+
<% end %> diff --git a/app/views/environment/index.html.erb b/app/views/environment/index.html.erb index 266cefe..ab1d6d9 100644 --- a/app/views/environment/index.html.erb +++ b/app/views/environment/index.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<%= link_to edit_temp_environment_path(id: params[:id]), class: "dashboard-group bg-base-content" do %>
@@ -10,23 +10,19 @@ 온도
-
- - -
현재 온도
-
16.5 °C
+
18.5 °C
설정 온도
-
15.5 °C
+
18 °C ~ 20 °C
@@ -42,23 +38,19 @@ 습도
-
- - -
현재 습도
-
78 %
+
78 %
설정 습도
-
80 %
+
75 % ~ 80 %
@@ -78,141 +70,413 @@ CO2 -
- - -
현재 CO2
-
700 ppm
+
700 ppm
최소 CO2
-
300 ppm
+
300 ppm
최대 CO2
-
1000 ppm
+
1000 ppm
<% end %> + - -
+
- - <%= link_to rack_index_path, class: "dashboard-group bg-base-content" do %> + +
+
+
스케줄러 동작
+
+
+ +
+
+
+
+ + +
+
+
긴급 정지
+
+
+ +
+
+
+
+ + +
+
+
LED 스케줄러 설정
+
+
+ +
+
+
+
+ + +
+
+
재배용 FAN 스케줄러 설정
+
+
+ +
+
+
+
+ + +
+
+
환기용 FAN 스케줄러 설정
+
+
+ +
+
+
+
+ + +
+
+
환경 스케줄러 설정
+
+
+ +
+
+
+
+
+ +
+ +
- 랙 -
-
-
- - -
-
-
-
-
-
현재 랙 정보
-
5 라인
-
-
-
- <% end %> - - - <%= link_to edit_area_environment_path(id: params[:id]), class: "dashboard-group bg-base-content" do %> -
-
-
- -
- 센서구역 -
-
-
- - -
-
-
-
-
-
현재 센서구역 정보
-
6 구역
-
-
-
- <% end %> - - -
-
-
-
- -
- LED + 1번 랙
-
모드
-
+
LED
+
-
자동
+
ON
+
+
+
+
FAN
+
+
+
ON
- -
+ +
+
+
+
+ +
+ 2번 랙 +
+
+
+
+
+
+
LED
+
+
+
ON
+
+
+
+
FAN
+
+
+
ON
+
+
+
+
+
+ + +
+
+
+
+ +
+ 3번 랙 +
+
+
+
+
+
+
LED
+
+
+
ON
+
+
+
+
FAN
+
+
+
ON
+
+
+
+
+
+ + +
+
+
+
+ +
+ 4번 랙 +
+
+
+
+
+
+
LED
+
+
+
ON
+
+
+
+
FAN
+
+
+
ON
+
+
+
+
+
+ + +
+
+
+
+ +
+ 5번 랙 +
+
+
+
+
+
+
LED
+
+
+
ON
+
+
+
+
FAN
+
+
+
ON
+
+
+
+
+
+ + +
+
+
+
+ +
+ 벌통 Spot Light +
+
+
+
+
+
+
상태
+
+
+
ON
+
+
+
+
+
+
+ +
+ +
- FAN + 환기용 FAN
-
-
-
모드
-
-
-
수동
+
+
+
1번
+
+
+
ON
+
+
+
+
2번
+
+
+
ON
+
+
+
+
3번
+
+
+
ON
+
+
+
+
4번
+
+
+
ON
+
+
+
+
5번
+
+
+
ON
+
+
+
+
6번
+
+
+
ON
+
+
+
+
7번
+
+
+
ON
+
+
+
+
8번
+
+
+
ON
+
+
+
+
9번
+
+
+
ON
+
+
+
+
10번
+
+
+
ON
+
+
+
+
11번
+
+
+
ON
+
+
+
+
12번
+
+
+
ON
+
+
+
+
13번
+
+
+
ON
+
+
+
+
14번
+
+
+
ON
+
+
+
+
15번
+
+
+
ON
+
+
+
+
16번
+
+
+
ON
-
diff --git a/app/views/partials/_header.html.erb b/app/views/partials/_header.html.erb index 31a6995..b03b3e3 100644 --- a/app/views/partials/_header.html.erb +++ b/app/views/partials/_header.html.erb @@ -1,6 +1,6 @@
- + diff --git a/app/views/partials/_sidebar.html.erb b/app/views/partials/_sidebar.html.erb index e8f1530..bc838f4 100644 --- a/app/views/partials/_sidebar.html.erb +++ b/app/views/partials/_sidebar.html.erb @@ -3,11 +3,20 @@
<%= image_tag "svg/svg_logo.svg", class: "w-auto h-8 mr-4" %> <%= link_to root_path do %> -
FARMITRY
+
FARMITRY
<% end %>
- <%= link_to environment_index_path(id: 1), class: "menu-group #{'menu-group-active' if current_page?(environment_index_path(id: 1))}" do %> + <%= link_to "#", class: "menu-group #{'menu-group-active' if false}" do %> +
+ +
+
+ 양액부 +
+ <% end %> +
+ <%= link_to "#", class: "menu-group menu-group-active" do %>
@@ -16,16 +25,7 @@
<% end %>
- <%= link_to nutrient_index_path(id: 1), class: "menu-group #{'menu-group-active' if current_page?(nutrient_index_path(id: 1))}" do %> -
- -
-
- 1동 양액부 -
- <% end %> -
- <%= link_to environment_index_path(id: 2), class: "menu-group #{'menu-group-active' if current_page?(environment_index_path(id: 2))}" do %> + <%= link_to "#", class: "menu-group #{'menu-group-active' if false}" do %>
@@ -33,34 +33,5 @@ 2동 환경부
<% end %> -
- <%= link_to nutrient_index_path(id: 2), class: "menu-group #{'menu-group-active' if current_page?(nutrient_index_path(id: 2))}" do %> -
- -
-
- 2동 양액부 -
- <% end %> -
- <%= link_to rack_index_path, class: "menu-group #{'menu-group-active' if current_page?(rack_index_path)}" do %> -
- -
-
- 통합 랙 정보 -
- <% end %>
- <%# @controllers.each do |c| %> - <%#= link_to view_schedule_path(c.id), class: "menu-group #{'menu-group-active' if current_page?(view_schedule_path(c.id))}" do %> - - - - - <%#= c.name %> - - <%# end %> - - <%# end %>