Compare commits
No commits in common. "421539f38ccfccb5226d27c3d62a673bc47a081c" and "f3e970ab1b4699eb7ff1a8f2fcf7392dfff553c1" have entirely different histories.
421539f38c
...
f3e970ab1b
@ -8,13 +8,6 @@ body{
|
||||
padding-left: $nav-width;
|
||||
}
|
||||
|
||||
.card{
|
||||
padding: 20px 30px;
|
||||
background: white;
|
||||
border-radius: 5px;
|
||||
box-shadow: $box-shadow-2;
|
||||
}
|
||||
|
||||
#main-nav{
|
||||
position: fixed;
|
||||
top: 0;
|
||||
@ -60,31 +53,13 @@ body{
|
||||
}
|
||||
}
|
||||
|
||||
#main-actions{
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
margin-top: 0;
|
||||
margin-bottom: 25px;
|
||||
|
||||
form,
|
||||
input{
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
#main-wrapper{
|
||||
max-width: 1200px;
|
||||
margin-top: 25px;
|
||||
}
|
||||
|
||||
#main-wrapper.container.fluid{
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#site-header{
|
||||
margin-bottom: 0;
|
||||
padding: 20px 30px;
|
||||
background: white;
|
||||
border-radius: 5px;
|
||||
box-shadow: $box-shadow-2;
|
||||
}
|
||||
|
||||
#item-header,
|
||||
|
||||
@ -3,5 +3,3 @@ require_relative 'routes/index.rb'
|
||||
require_relative 'routes/item.rb'
|
||||
|
||||
require_relative 'routes/license.rb'
|
||||
|
||||
require_relative 'routes/search.rb'
|
||||
|
||||
@ -2,11 +2,9 @@ namespace '/' do
|
||||
|
||||
get '' do
|
||||
items = Item.reverse(:updated_at).limit(10).all()
|
||||
licenses = License.reverse(:updated_at).limit(10).all()
|
||||
erb :index, :locals => {
|
||||
:title => 'Dashboard',
|
||||
:items => items,
|
||||
:licenses => licenses
|
||||
:items => items
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
namespace '/search' do
|
||||
get '' do
|
||||
search_parameter = params[:query]
|
||||
items = Item.where(Sequel.ilike(:name, "%#{search_parameter}%")).all()
|
||||
licenses = License.where(Sequel.ilike(:name, "%#{search_parameter}%")).all()
|
||||
|
||||
erb :'search/list', :locals => {
|
||||
:title => 'Search Results',
|
||||
:items => items,
|
||||
:licenses => licenses,
|
||||
:query => search_parameter
|
||||
}
|
||||
end
|
||||
end
|
||||
@ -1,57 +1,11 @@
|
||||
<div class="row">
|
||||
<div class="twelve columns">
|
||||
<h1 id="site-header">Welcome to Raven</h1>
|
||||
</div>
|
||||
</div>
|
||||
<p>This is a test.</p>
|
||||
|
||||
<hr>
|
||||
|
||||
<div class="row">
|
||||
<div class="six columns">
|
||||
<h3>Recent inventory updates</h3>
|
||||
<% if items.length > 0 %>
|
||||
<table class="u-full-width">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Item name</th>
|
||||
<th>Updated at</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<ul>
|
||||
<% items.each do |item| %>
|
||||
<tr>
|
||||
<td><%= item.name %></td>
|
||||
<td><%= date_format(item.updated_at) %></td>
|
||||
</tr>
|
||||
<li><%= item.name %></li>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</ul>
|
||||
<% else %>
|
||||
<p>There are no items to display.</p>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<div class="six columns">
|
||||
<h3>Recent license updates</h3>
|
||||
<% if licenses.length > 0 %>
|
||||
<table class="u-full-width">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>License name</th>
|
||||
<th>Updated at</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% licenses.each do |license| %>
|
||||
<tr>
|
||||
<td><%= license.name %></td>
|
||||
<td><%= date_format(license.updated_at) %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% else %>
|
||||
<p>There are no licenses to display.</p>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -11,12 +11,9 @@
|
||||
</head>
|
||||
<body>
|
||||
<!-- Main navigation -->
|
||||
<%= erb :'layout/navbar', :locals => locals %>
|
||||
<%= erb :'layout/navbar' %>
|
||||
|
||||
<!-- Inventory search/actions bar -->
|
||||
<%= erb :'layout/actions', :locals => locals %>
|
||||
|
||||
<div id="main-wrapper" class="container fluid card">
|
||||
<div id="main-wrapper" class="container">
|
||||
<%= yield %>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
<div id="main-actions" class="container fluid card">
|
||||
<div class="row">
|
||||
<div class="six columns">
|
||||
<form action="/search" class="u-full-width">
|
||||
<input id="search-field" class="u-full-width" type="text" placeholder="Search your inventory..." name="query" required <%= defined?(query) ? 'value="' + query + '"' : '' %>>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -1,25 +0,0 @@
|
||||
<div class="row">
|
||||
<div class="twelve columns">
|
||||
<h4>Matching hardware:</h4>
|
||||
<% if items.length > 0 %>
|
||||
<ul class="u-full-width">
|
||||
<% items.each do |r| %>
|
||||
<li><a href="/item/<%= r.id %>"><%= r.name %></a></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% else %>
|
||||
<p>Sorry, nothing in your hardware inventory matches that search term.</p>
|
||||
<% end %>
|
||||
|
||||
<h4>Matching licenses:</h4>
|
||||
<% if licenses.length > 0 %>
|
||||
<ul class="u-full-width">
|
||||
<% licenses.each do |r| %>
|
||||
<li><a href="/item/<%= r.id %>"><%= r.name %></a></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% else %>
|
||||
<p>Sorry, nothing in your license inventory matches that search term.</p>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in New Issue
Block a user