Metaunix/raven
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Metaunix:421539f38ccfccb5226d27c3d62a673bc47a081c
Branches Tags
Metaunix:main
Metaunix:go
Metaunix:ruby
Metaunix:v0.2.2
Metaunix:v0.2.1
Metaunix:v0.2.0
Metaunix:v0.1.3
Metaunix:v0.1.2
Metaunix:v0.1.1
Metaunix:v0.1.0
..
compare: Metaunix:f3e970ab1b4699eb7ff1a8f2fcf7392dfff553c1
Branches Tags
Metaunix:main
Metaunix:go
Metaunix:ruby
Metaunix:v0.2.2
Metaunix:v0.2.1
Metaunix:v0.2.0
Metaunix:v0.1.3
Metaunix:v0.1.2
Metaunix:v0.1.1
Metaunix:v0.1.0

No commits in common. "421539f38ccfccb5226d27c3d62a673bc47a081c" and "f3e970ab1b4699eb7ff1a8f2fcf7392dfff553c1" have entirely different histories.
421539f38c ... f3e970ab1b

8 changed files with 17 additions and 143 deletions
Show Stats Expand all files Collapse all files

33
assets/styles/kraken.scss
View File

@ -8,13 +8,6 @@ body{
padding-left: $nav-width; padding-left: $nav-width;
} }
.card{
padding: 20px 30px;
background: white;
border-radius: 5px;
box-shadow: $box-shadow-2;
}
#main-nav{ #main-nav{
position: fixed; position: fixed;
top: 0; 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{ #main-wrapper{
max-width: 1200px; max-width: 1200px;
margin-top: 25px; margin-top: 25px;
} padding: 20px 30px;
background: white;
#main-wrapper.container.fluid{ border-radius: 5px;
width: 100%; box-shadow: $box-shadow-2;
max-width: 100%;
margin: 0;
}
#site-header{
margin-bottom: 0;
} }
#item-header, #item-header,

2
lib/routes.rb
View File

@ -3,5 +3,3 @@ require_relative 'routes/index.rb'
require_relative 'routes/item.rb' require_relative 'routes/item.rb'
require_relative 'routes/license.rb' require_relative 'routes/license.rb'
require_relative 'routes/search.rb'

4
lib/routes/index.rb
View File

@ -2,11 +2,9 @@ namespace '/' do
get '' do get '' do
items = Item.reverse(:updated_at).limit(10).all() items = Item.reverse(:updated_at).limit(10).all()
licenses = License.reverse(:updated_at).limit(10).all()
erb :index, :locals => { erb :index, :locals => {
:title => 'Dashboard', :title => 'Dashboard',
:items => items, :items => items
:licenses => licenses
} }
end end

14
lib/routes/search.rb
View File

@ -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

54
views/index.erb
View File

@ -1,57 +1,11 @@
<div class="row"> <p>This is a test.</p>
<div class="twelve columns">
<h1 id="site-header">Welcome to Raven</h1>
</div>
</div>
<hr>
<div class="row">
<div class="six columns">
<h3>Recent inventory updates</h3>
<% if items.length > 0 %> <% if items.length > 0 %>
<table class="u-full-width"> <ul>
<thead>
<tr>
<th>Item name</th>
<th>Updated at</th>
</tr>
</thead>
<tbody>
<% items.each do |item| %> <% items.each do |item| %>
<tr> <li><%= item.name %></li>
<td><%= item.name %></td>
<td><%= date_format(item.updated_at) %></td>
</tr>
<% end %> <% end %>
</tbody> </ul>
</table>
<% else %> <% else %>
<p>There are no items to display.</p> <p>There are no items to display.</p>
<% end %> <% 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>

7
views/layout.erb
View File

@ -11,12 +11,9 @@
</head> </head>
<body> <body>
<!-- Main navigation --> <!-- Main navigation -->
<%= erb :'layout/navbar', :locals => locals %> <%= erb :'layout/navbar' %>
<!-- Inventory search/actions bar --> <div id="main-wrapper" class="container">
<%= erb :'layout/actions', :locals => locals %>
<div id="main-wrapper" class="container fluid card">
<%= yield %> <%= yield %>
</div> </div>
</body> </body>

9
views/layout/actions.erb
View File

@ -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>

25
views/search/list.erb
View File

@ -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>