rubyon
/
farmitry_hvac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rubyon:90f89e08b8c39adc89b2006041a6af5a0295fb84
Branches Tags
rubyon:main
rubyon:develop_mh_new
rubyon:develop_mh
..
compare: rubyon:9badb4dcd1072a56baf2e3e731f5cc5d576a9000
Branches Tags
rubyon:develop_mh_new
rubyon:develop_mh
rubyon:main

No commits in common. "90f89e08b8c39adc89b2006041a6af5a0295fb84" and "9badb4dcd1072a56baf2e3e731f5cc5d576a9000" have entirely different histories.
90f89e08b8 ... 9badb4dcd1

4 changed files with 22 additions and 53 deletions
Show Stats Expand all files Collapse all files

33
app/assets/stylesheets/application.tailwind.css
View File

@ -49,23 +49,13 @@
@layer base {
body {
@apply bg-base-background text-base-text
@apply text-sm text-default-slate-dark
}
hr {
@apply border-table-border
}
.background-pattern {
background-image: repeating-linear-gradient(
-45deg,
rgba(255, 255, 255, 0.01) 0,
rgba(255, 255, 255, 0.01) 24px,
transparent 1px,
transparent 36px
);
}
a.disabled {
@apply pointer-events-none cursor-not-allowed opacity-50
}
@ -120,8 +110,7 @@
}
.side-bar {
/*@apply w-[16rem] pl-4 text-lg font-bold divide-y divide-base-border;*/
@apply w-[16rem] pl-4 pr-4 lg:pr-0 text-lg font-bold;
@apply w-[16rem] pl-4 text-lg font-bold divide-y divide-base-border;
}
.content {
@ -150,15 +139,7 @@
/*Menu*/
.menu-group {
@apply flex flex-row py-2 px-4 my-4 gap-x-4 justify-between items-center w-full
}
.menu-group-active {
@apply bg-base-secondary text-white rounded-md;
}
.menu-group:hover {
@apply bg-base-secondary text-white transition-colors rounded-md;
@apply flex flex-row py-6 px-4 gap-x-4 justify-between items-center w-full
}
.menu-group-icon {
@ -269,11 +250,3 @@
.input-style[type="number"] {
-moz-appearance: textfield;
}
/*Fonts*/
@font-face {
font-family: 'GongGothicMedium';
src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10@1.0/GongGothicLight.woff') format('woff');
font-weight: normal;
font-style: normal;
}

2
app/views/layouts/application.html.erb
View File

@ -23,7 +23,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
</head>
<body class="background-pattern min-h-screen min-w-full overflow-x-auto h-full whitespace-nowrap">
<body class="min-h-screen bg-base-background text-base-text min-w-full overflow-x-auto h-full whitespace-nowrap">
<%= turbo_frame_tag :modals %>
<main class="flex flex-col h-full" data-controller="sidebar">
<%= render "partials/header" %>

18
app/views/partials/_sidebar.html.erb
View File

@ -1,28 +1,26 @@
<div data-sidebar-target="overlay" data-action="click->sidebar#close" class="fixed inset-0 bg-black/50 z-40 hidden lg:hidden"></div>
<nav class="side-bar overflow-y-auto transition-transform lg:translate-x-0 -translate-x-full bg-base-background lg:bg-transparent fixed lg:relative top-0 left-0 h-full z-40" data-sidebar-target="menu">
<%= link_to root_path, class: "menu-group #{'menu-group-active' if current_page?(root_path)}" do %>
<nav class="side-bar overflow-y-auto transition-transform lg:translate-x-0 -translate-x-full fixed lg:relative top-0 left-0 h-full bg-base-background z-40" data-sidebar-target="menu">
<div class="menu-group">
<div class="menu-group-icon">
<i class="fa-solid fa-chart-line text-base-text text-4xl"></i>
<i class="fa-solid fa-house text-base-text/30 text-4xl"></i>
</div>
<div class="menu-group-name">
현황
HOME
</div>
<% end %>
<hr >
</div>
<% @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 %>
<%= link_to view_schedule_path(c.id), class: "menu-group" do %>
<div class="menu-group-icon">
<i class="fa-solid fa-temperature-high text-base-text text-4xl"></i>
<i class="fa-solid fa-temperature-high text-base-text/30 text-4xl"></i>
</div>
<div class="menu-group-name">
<%= c.name %>
</div>
<% end %>
<hr >
<% end %>
<div class="menu-group">
<div class="menu-group-icon">
<i class="fa-solid fa-gear text-base-text text-4xl"></i>
<i class="fa-solid fa-gear text-base-text/30 text-4xl"></i>
</div>
<div class="menu-group-name">
설청

22
app/views/schedules/index.html.erb
View File

@ -5,10 +5,8 @@
<div class="text-xl">실내온도</div>
<div class="flex flex-row justify-between items-baseline w-full">
<i class="fa-solid fa-temperature-quarter text-base-text/80 text-4xl text-left w-full"></i>
<div class="items-baseline text-right w-full">
<span class="text-4xl font-['GongGothicMedium'] font-light">15.5</span>
<span class="text-2xl">°C</span>
</div>
<div class="items-baseline text-right w-full"><span class="text-4xl">15.5</span>
<span class="text-2xl">°C</span></div>
</div>
</div>
</div>
@ -19,7 +17,7 @@
<div class="text-xl">실내습도</div>
<div class="flex flex-row justify-between items-baseline w-full">
<i class="fa-solid fa-droplet text-base-text/80 text-4xl text-left w-full"></i>
<div class="items-baseline text-right w-full"><span class="text-4xl font-['GongGothicMedium']">60</span> <span class="text-2xl">%</span>
<div class="items-baseline text-right w-full"><span class="text-4xl">60</span> <span class="text-2xl">%</span>
</div>
</div>
</div>
@ -35,7 +33,7 @@
<span class="text-xl">CO</span><span class="text-sm">2</span>
</div>
</div>
<div class="items-baseline text-right"><span class="text-4xl font-['GongGothicMedium']">60</span> <span class="text-2xl">%</span></div>
<div class="items-baseline text-right"><span class="text-4xl">60</span> <span class="text-2xl">%</span></div>
</div>
</div>
</div>
@ -49,7 +47,7 @@
<div class="text-xl">FAN</div>
<div class="flex flex-row justify-between items-baseline w-full">
<i class="fa-solid fa-fan text-base-text/80 text-4xl text-left w-full"></i>
<div class="items-baseline text-right w-full"><span class="text-4xl font-['GongGothicMedium']">60</span> <span class="text-2xl">%</span>
<div class="items-baseline text-right w-full"><span class="text-4xl">60</span> <span class="text-2xl">%</span>
</div>
</div>
</div>
@ -61,7 +59,7 @@
<div class="text-xl">공조기</div>
<div class="flex flex-row justify-between items-baseline w-full">
<i class="fa-solid fa-temperature-quarter text-base-text/80 text-4xl text-left w-full"></i>
<div class="items-baseline text-right w-full"><span class="text-4xl font-['GongGothicMedium']">15.5</span>
<div class="items-baseline text-right w-full"><span class="text-4xl">15.5</span>
<span class="text-2xl">°C</span></div>
</div>
</div>
@ -73,7 +71,7 @@
<div class="text-xl">LED</div>
<div class="flex flex-row justify-between items-baseline w-full">
<i class="fa-solid fa-lightbulb text-base-text/80 text-4xl text-left w-full"></i>
<div class="items-baseline text-right w-full"><span class="text-4xl font-['GongGothicMedium']">60</span> <span class="text-2xl">%</span>
<div class="items-baseline text-right w-full"><span class="text-4xl">60</span> <span class="text-2xl">%</span>
</div>
</div>
</div>
@ -85,7 +83,7 @@
<!-- pH -->
<div class="dashboard-group">
<div class="flex justify-between items-baseline">
<div class="text-4xl font-['GongGothicMedium']">pH</div>
<div class="text-4xl">pH</div>
<div class="text-3xl">7.1</div>
</div>
<div class="flex justify-between items-baseline">
@ -99,7 +97,7 @@
<!-- EC -->
<div class="dashboard-group">
<div class="flex justify-between items-baseline">
<div class="text-4xl font-['GongGothicMedium']">EC</div>
<div class="text-4xl">EC</div>
<div class="text-3xl">0.1</div>
</div>
<div class="flex justify-between items-baseline">
@ -116,7 +114,7 @@
<div class="text-xl">양액온도</div>
<div class="flex flex-row justify-between items-baseline w-full">
<!-- <i class="fa-solid fa-temperature-quarter text-base-text/80 text-4xl text-left w-full"></i>-->
<div class="items-baseline text-right w-full"><span class="text-4xl font-['GongGothicMedium']">20.96</span>
<div class="items-baseline text-right w-full"><span class="text-4xl">20.96</span>
<span class="text-2xl">°C</span></div>
</div>
</div>