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

Compare commits

base: rubyon:8041453c5ec0b4c7838d8a76a88e5a3c1ed222be
Branches Tags
rubyon:main
rubyon:develop_mh_new
rubyon:develop_mh
..
compare: rubyon:09068d9f707f44bd21be7069d190f1501fd249f7
Branches Tags
rubyon:develop_mh_new
rubyon:develop_mh
rubyon:main

No commits in common. "8041453c5ec0b4c7838d8a76a88e5a3c1ed222be" and "09068d9f707f44bd21be7069d190f1501fd249f7" have entirely different histories.
8041453c5e ... 09068d9f70

5 changed files with 15 additions and 15 deletions
Show Stats Expand all files Collapse all files

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

@ -23,11 +23,11 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
</head> </head>
<body class="h-screen"> <body class="h-screen overflow-hidden">
<main class="flex flex-col h-full divide-y divide-border-table-border"> <main class="flex flex-col h-full divide-y divide-border-table-border">
<%= render "partials/header" %> <%= render "partials/header" %>
<div class="flex flex-row flex-1 w-full divide-x divide-border-table-border"> <div class="flex flex-row flex-1 w-full divide-x divide-border-table-border overflow-hidden">
<%#= render "partials/sidebar" %> <%= render "partials/sidebar" %>
<div class="w-full h-full"> <div class="w-full h-full">
<%= yield %> <%= yield %>
</div> </div>

6
app/views/modbus/index.html.erb
View File

@ -1,14 +1,14 @@
<% if flash[:notice] %> <% if flash[:notice] %>
<div class="m-4 rounded px-4 py-2 bg-accept text-white"> <div class="mb-4 rounded bg-green-100 px-4 py-2 text-green-800 border border-green-300">
<%= flash[:notice] %> <%= flash[:notice] %>
</div> </div>
<% elsif flash[:alert] %> <% elsif flash[:alert] %>
<div class="m-4 rounded px-4 py-2 bg-danger text-white"> <div class="mb-4 rounded bg-red-100 px-4 py-2 text-red-800 border border-red-300">
<%= flash[:alert] %> <%= flash[:alert] %>
</div> </div>
<% end %> <% end %>
<div class="flex flex-col h-full divide-y divide-border-table-border"> <div class="flex flex-col h-full divide-y divide-border-table-border">
<div class="flex flex-col flex-1 p-4 space-y-4"> <div class="flex-1 overflow-y-auto p-4 space-y-4">
<table class="base-table"> <table class="base-table">
<thead> <thead>
<tr> <tr>

2
app/views/modbus/schedule_edit.html.erb
View File

@ -1,5 +1,5 @@
<%= form_with url: schedule_edit_update_modbus_index_path, method: :post, class: 'flex flex-col h-full divide-y divide-border-table-border' do %> <%= form_with url: schedule_edit_update_modbus_index_path, method: :post, class: 'flex flex-col h-full divide-y divide-border-table-border' do %>
<div class="flex-1 p-4"> <div class="flex-1 overflow-y-auto p-4">
<table class="base-table"> <table class="base-table">
<thead> <thead>
<tr> <tr>

8
app/views/partials/_header.html.erb
View File

@ -4,8 +4,8 @@
<div class="flex h-full items-center tracking-[0.5rem]">FARMITRY</div> <div class="flex h-full items-center tracking-[0.5rem]">FARMITRY</div>
</div> </div>
<div data-timer-target="output" class="text-gray-600"></div> <div data-timer-target="output" class="text-gray-600"></div>
<!-- <div class="flex flex-row items-center gap-x-4">--> <div class="flex flex-row items-center gap-x-4">
<!-- <i class="fa-solid fa-circle-user text-4xl text-default-slate-dark leading-10"></i>--> <i class="fa-solid fa-circle-user text-4xl text-default-slate-dark"></i>
<%#= link_to "로그아웃", '', class: "btn" %> <%= link_to "로그아웃", '', class: "btn" %>
<!-- </div>--> </div>
</header> </header>