diff --git a/Gemfile.lock b/Gemfile.lock index 61ec0e2..e09d5ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,6 +130,7 @@ GEM tzinfo ffi (1.17.2-aarch64-linux-gnu) ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86_64-linux-gnu) foreman (0.88.1) fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) @@ -195,6 +196,8 @@ GEM racc (~> 1.4) nokogiri (1.18.7-arm64-darwin) racc (~> 1.4) + nokogiri (1.18.7-x86_64-linux-gnu) + racc (~> 1.4) ostruct (0.6.1) parallel (1.27.0) parser (3.3.8.0) @@ -322,6 +325,7 @@ GEM thor (~> 1.3.1) sqlite3 (2.6.0-aarch64-linux-gnu) sqlite3 (2.6.0-arm64-darwin) + sqlite3 (2.6.0-x86_64-linux-gnu) sshkit (1.24.0) base64 logger @@ -336,6 +340,7 @@ GEM thruster (0.1.12) thruster (0.1.12-aarch64-linux) thruster (0.1.12-arm64-darwin) + thruster (0.1.12-x86_64-linux) timeout (0.4.3) turbo-rails (2.0.13) actionpack (>= 7.1.0) @@ -365,6 +370,7 @@ PLATFORMS aarch64-linux aarch64-linux-gnu arm64-darwin-24 + x86_64-linux DEPENDENCIES amazing_print diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index c8fcea5..bfdf3ea 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -11,6 +11,12 @@ --color-danger: rgb(239, 83, 80); --color-table-border: rgb(203, 213, 225); + /* theme */ + --color-base-background: rgb(39, 44, 56); + --color-base-secondary: rgb(55, 61, 71); + --color-base-text: rgb(152, 158, 172); + --color-base-border: rgb(77, 84, 102); + --base-font-size: 0.85rem; --text-xs: calc(var(--base-font-size) * 0.75); --text-xs--line-height: calc(1 / var(--text-xs)); @@ -90,7 +96,11 @@ } .side-bar { - @apply w-64 px-4 text-lg font-bold divide-y divide-default-slate-dark; + @apply w-[16rem] px-4 text-lg font-bold divide-y divide-base-border; + } + + .content { + @apply rounded-lg bg-base-secondary; } .page-title { @@ -119,7 +129,7 @@ } .menu-group-icon { - @apply py-1 text-sm text-default-slate-dark font-medium justify-center + @apply py-1 text-sm font-medium justify-center } .menu-group-name { @@ -190,3 +200,23 @@ @apply text-lg font-bold; } } + +/* 기본 스크롤바 스타일 */ +::-webkit-scrollbar { + width: 6px; + height: 6px; +} + +::-webkit-scrollbar-track { + background: transparent; +} + +::-webkit-scrollbar-thumb { + background-color: rgba(21, 21, 21, 0.4); + border-radius: 4px; + transition: background-color 0.2s; +} + +::-webkit-scrollbar-thumb:hover { + background-color: rgba(100, 100, 100, 0.6); +} diff --git a/app/controllers/device_controller.rb b/app/controllers/device_controller.rb new file mode 100644 index 0000000..65207d3 --- /dev/null +++ b/app/controllers/device_controller.rb @@ -0,0 +1,2 @@ +class DeviceController < ApplicationController +end diff --git a/app/controllers/web_controller.rb b/app/controllers/web_controller.rb new file mode 100644 index 0000000..00168a4 --- /dev/null +++ b/app/controllers/web_controller.rb @@ -0,0 +1,2 @@ +class WebController < ApplicationController +end diff --git a/app/helpers/device_helper.rb b/app/helpers/device_helper.rb new file mode 100644 index 0000000..16e2118 --- /dev/null +++ b/app/helpers/device_helper.rb @@ -0,0 +1,2 @@ +module DeviceHelper +end diff --git a/app/helpers/web_helper.rb b/app/helpers/web_helper.rb new file mode 100644 index 0000000..55cd56a --- /dev/null +++ b/app/helpers/web_helper.rb @@ -0,0 +1,2 @@ +module WebHelper +end diff --git a/app/views/device/index.html.erb b/app/views/device/index.html.erb new file mode 100644 index 0000000..3fa7838 --- /dev/null +++ b/app/views/device/index.html.erb @@ -0,0 +1 @@ +
DEVICE
\ No newline at end of file diff --git a/app/views/layouts/device.html.erb b/app/views/layouts/device.html.erb new file mode 100644 index 0000000..1e05439 --- /dev/null +++ b/app/views/layouts/device.html.erb @@ -0,0 +1,50 @@ + + + + <%= content_for(:title) || "Farmitry Hvac" %> + + + + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= yield :head %> + + <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %> + <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %> + + + + + + <%# Includes all stylesheet files in app/assets/stylesheets %> + <%= stylesheet_link_tag :app, "data-turbo-track": "reload" %> + <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %> + + + + +<%= turbo_frame_tag :modals %> +
+ <%= render "partials/header" %> +
+ <%= render "partials/sidebar" %> +
+
+ <% if flash[:notice] %> +
+ <%= raw flash[:notice] %> +
+ <% elsif flash[:alert] %> +
+ <%= raw flash[:alert] %> +
+ <% end %> + <%= yield %> +
+
+
+
+ + + \ No newline at end of file diff --git a/app/views/layouts/web.html.erb b/app/views/layouts/web.html.erb new file mode 100644 index 0000000..ec6429d --- /dev/null +++ b/app/views/layouts/web.html.erb @@ -0,0 +1,47 @@ + + + + <%= content_for(:title) || "Farmitry Hvac" %> + + + + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= yield :head %> + + <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %> + <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %> + + + + + + <%# Includes all stylesheet files in app/assets/stylesheets %> + <%= stylesheet_link_tag :app, "data-turbo-track": "reload" %> + <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %> + + + + +<%= turbo_frame_tag :modals %> +
+ <%= render "partials/header" %> +
+
+ <% if flash[:notice] %> +
+ <%= raw flash[:notice] %> +
+ <% elsif flash[:alert] %> +
+ <%= raw flash[:alert] %> +
+ <% end %> + <%= yield %> +
+
+
+ + + diff --git a/app/views/partials/_header.html.erb b/app/views/partials/_header.html.erb index 6ae5205..0d533ca 100644 --- a/app/views/partials/_header.html.erb +++ b/app/views/partials/_header.html.erb @@ -1,9 +1,9 @@
- <%= image_tag "svg/svg_logo.svg", class: "w-16 h-auto" %> + <%= image_tag "svg/svg_logo.svg", class: "w-fit h-auto mr-4" %> <%= link_to root_path do %>
FARMITRY
<% end %>
-
+
diff --git a/app/views/partials/_sidebar.html.erb b/app/views/partials/_sidebar.html.erb new file mode 100644 index 0000000..29cc445 --- /dev/null +++ b/app/views/partials/_sidebar.html.erb @@ -0,0 +1,42 @@ + \ No newline at end of file diff --git a/app/views/web/index.html.erb b/app/views/web/index.html.erb new file mode 100644 index 0000000..823ff91 --- /dev/null +++ b/app/views/web/index.html.erb @@ -0,0 +1 @@ +
WEB
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index afeff1f..1df9955 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -33,4 +33,7 @@ Rails.application.routes.draw do post :open end end + + resources :device + resources :web end diff --git a/test/controllers/device_controller_test.rb b/test/controllers/device_controller_test.rb new file mode 100644 index 0000000..2abb94f --- /dev/null +++ b/test/controllers/device_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +class DeviceControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/web_controller_test.rb b/test/controllers/web_controller_test.rb new file mode 100644 index 0000000..97f91db --- /dev/null +++ b/test/controllers/web_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +class WebControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end