diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index bfdf3ea..7dae164 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -9,7 +9,7 @@ --color-warning: rgb(255, 202, 40); --color-accept: rgb(121, 134, 203); --color-danger: rgb(239, 83, 80); - --color-table-border: rgb(203, 213, 225); + --color-table-border: rgb(130, 144, 158); /* theme */ --color-base-background: rgb(39, 44, 56); @@ -179,15 +179,15 @@ /*Base Table*/ .base-table { - @apply min-w-full divide-y divide-table-border whitespace-nowrap border border-table-border + @apply min-w-full whitespace-nowrap border border-table-border } .base-table th { - @apply bg-default px-2 py-2 text-left font-semibold text-default-slate-dark lg:table-cell + @apply bg-base-text px-2 py-2 text-left font-bold lg:table-cell } .base-table td { - @apply border-t border-table-border px-2 py-1 text-default-slate lg:table-cell whitespace-nowrap + @apply border-t border-table-border px-2 py-1 lg:table-cell whitespace-nowrap } } @@ -205,6 +205,7 @@ ::-webkit-scrollbar { width: 6px; height: 6px; + padding: 4px; } ::-webkit-scrollbar-track { diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0d95db2..bf99a64 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,12 @@ class ApplicationController < ActionController::Base # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has. allow_browser versions: :modern + + before_action :set_controllers + + private + + def set_controllers + @controllers = Controller.all + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ec6429d..642f042 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -23,22 +23,25 @@ - + <%= turbo_frame_tag :modals %> -
+
<%= render "partials/header" %> -
-
- <% if flash[:notice] %> -
- <%= raw flash[:notice] %> -
- <% elsif flash[:alert] %> -
- <%= raw flash[:alert] %> -
- <% end %> - <%= yield %> +
+ <%= render "partials/sidebar" %> +
+
+ <% if flash[:notice] %> +
+ <%= raw flash[:notice] %> +
+ <% elsif flash[:alert] %> +
+ <%= raw flash[:alert] %> +
+ <% end %> + <%= yield %> +
diff --git a/app/views/partials/_sidebar.html.erb b/app/views/partials/_sidebar.html.erb index f2f9f61..a51fa6d 100644 --- a/app/views/partials/_sidebar.html.erb +++ b/app/views/partials/_sidebar.html.erb @@ -7,30 +7,16 @@ HOME -
-
- -
-
- 메뉴 2 -
-
-
-
- -
-
- 메뉴 3 -
-
-
-
- -
-
- 메뉴 4 -
-
+ <% @controllers.each do |c| %> + <%= link_to view_schedule_path(c.id), class: "menu-group" do %> +
+ +
+
+ <%= c.name %> +
+ <% end %> + <% end %>
diff --git a/app/views/schedules/index.html.erb b/app/views/schedules/index.html.erb index 748fa05..408b2f4 100644 --- a/app/views/schedules/index.html.erb +++ b/app/views/schedules/index.html.erb @@ -1,7 +1 @@ -
-
- <% @controllers.each do |c| %> - <%= link_to c.name, view_schedule_path(c.id), class: "btn bg-primary" %> - <% end %> -
-
+
MAIN
diff --git a/app/views/schedules/schedule_edit.html.erb b/app/views/schedules/schedule_edit.html.erb index abbf621..3fc392d 100644 --- a/app/views/schedules/schedule_edit.html.erb +++ b/app/views/schedules/schedule_edit.html.erb @@ -1,57 +1,58 @@ -<%= form_with url: schedule_edit_update_schedules_path, method: :post, class: 'flex flex-col h-full divide-y divide-border-table-border' do %> - <%= hidden_field_tag :controller_id, params[:id] %> -
- <%= @controller.name %> 컨트롤러 - - - - - - - - - - - - <% @schedule.each do |s| %> - - - - - - - - <% end %> - -
시간분사용여부온도삭제
- <%= select_tag "schedule[#{s.id}][hour]", - options_for_select((0..23).map { |h| [h.to_s.rjust(2, '0'), h] }, s.hour), - class: "input-style" %> - <%= number_field_tag "schedule[#{s.id}][minute]", s.minute, min: 0, max: 59, step: 1, inputmode: "decimal", class: "input-style" %><%= check_box_tag "schedule[#{s.id}][is_active]", "1", s.is_active == true || s.is_active == 1 %><%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, step: "0.1", inputmode: "decimal", class: "input-style" %> - <%= link_to "삭제", schedule_path(s), - data: { - turbo_method: :delete, - turbo_confirm: "정말 삭제하시겠습니까?" - }, - class: "btn bg-danger text-sm" %> -
+
+
+ <%= form_with url: schedule_edit_update_schedules_path, method: :post, class: 'flex flex-col h-full divide-y divide-border-base-border p-4' do %> + <%= hidden_field_tag :controller_id, params[:id] %> +
+
+
<%= @controller.name %> 컨트롤러
+ <%= submit_tag "업데이트", class: "btn bg-primary" %> +
+ + + + + + + + + + + + <% @schedule.each do |s| %> + + + + + + + + <% end %> + +
시간분사용여부온도삭제
+ <%= select_tag "schedule[#{s.id}][hour]", + options_for_select((0..23).map { |h| [h.to_s.rjust(2, '0'), h] }, s.hour), + class: "input-style" %> + <%= number_field_tag "schedule[#{s.id}][minute]", s.minute, min: 0, max: 59, step: 1, inputmode: "decimal", class: "input-style" %><%= check_box_tag "schedule[#{s.id}][is_active]", "1", s.is_active == true || s.is_active == 1 %><%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, step: "0.1", inputmode: "decimal", class: "input-style" %> + <%= link_to "삭제", schedule_path(s), + data: { + turbo_method: :delete, + turbo_confirm: "정말 삭제하시겠습니까?" + }, + class: "btn bg-danger text-sm" %> +
+
+ <% 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" + } %> +
- -
- <%= submit_tag "업데이트", class: "btn bg-primary" %> -
-<% 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" - } %> -
+
\ No newline at end of file diff --git a/app/views/schedules/view.html.erb b/app/views/schedules/view.html.erb index 65675a8..8dd921d 100644 --- a/app/views/schedules/view.html.erb +++ b/app/views/schedules/view.html.erb @@ -1,28 +1,30 @@ -
-
- <%= @controller.name %> 컨트롤러 - - - - - - - - - - - <% @schedule.each do |s| %> +
+
+
+
+
<%= @controller.name %> 컨트롤러
+ <%= link_to "수정", schedule_edit_schedule_path(@controller.id), class: "btn bg-default-slate" %> +
+
시간분사용여부온도
+ - - - - + + + + - <% end %> - -
<%= s.hour %>시<%= s.minute %>분<%= s.is_active %><%= s.temperature %> °C시간분사용여부온도
-
-
- <%= link_to "수정", schedule_edit_schedule_path(@controller.id), class: "btn bg-default-slate" %> + + + <% @schedule.each do |s| %> + + <%= s.hour %>시 + <%= s.minute %>분 + <%= s.is_active %> + <%= s.temperature %> °C + + <% end %> + + +