Fixed some migrations that were mistyped; updated the Rakefile to include bundler setup for gems

Rakefile

@@ -0,0 +1,20 @@
+require 'bundler/setup'
+
+require 'sequel'
+require 'sqlite3'
+
+namespace :db do
+  task :migrate do
+    %x{sequel -m 'db/migrations/' 'sqlite://data/raven.db'}
+  end
+end
+
+namespace :server do
+  task :dev do
+    %x{ruby raven.rb}
+  end
+
+  task :reload do
+    %x{rerun --no-notify 'ruby raven.rb'}
+  end
+end

assets/styles/kraken.scss

@@ -5,6 +5,7 @@ $box-shadow-2: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
 
 body{
   background: lightgrey;
+  padding-left: $nav-width;
 }
 
 #main-nav{
@@ -60,3 +61,20 @@ body{
   border-radius: 5px;
   box-shadow: $box-shadow-2;
 }
+
+#item-header,
+#license-header{
+  .item-name,
+  .license-name{
+    margin-bottom: 5px;
+  }
+
+  .item-created,
+  .item-updated,
+  .license-created,
+  .license-updated{
+    color: #666;
+    font-size: 1.75rem;
+    font-style: italic;
+  }
+}

db/migrations/0001_add_items_table.rb

@@ -10,8 +10,8 @@ Sequel.migration do
       String :type
       String :purchased_from
       DateTime :purchased_at
-      DateTime :created_at
+      DateTime :created_at, default: Sequel::CURRENT_TIMESTAMP
-      DateTime :updated_at
+      DateTime :updated_at, default: Sequel::CURRENT_TIMESTAMP
     end
   end
 

db/migrations/0002_add_item_comments_table.rb

@@ -0,0 +1,20 @@
+Sequel.migration do
+
+  up do
+    create_table(:item_comments) do
+      primary_key :id
+      String :body, null: false
+      DateTime :created_at, default: Sequel::CURRENT_TIMESTAMP
+      DateTime :updated_at, default: Sequel::CURRENT_TIMESTAMP
+    end
+
+    alter_table(:item_comments) do
+      add_foreign_key :item_id, :items
+    end
+  end
+
+  down do
+    drop_table(:item_comments)
+  end
+
+end

db/migrations/0003_add_licenses_table.rb

@@ -0,0 +1,22 @@
+Sequel.migration do
+
+  up do
+    create_table(:licenses) do
+      primary_key :id
+      String :name, null: false
+      String :key, null: false
+      String :manufacturer
+      Integer :seats_used, default: 0
+      Integer :seats_total, default: 1
+      String :purchased_from
+      DateTime :purchased_at
+      DateTime :created_at, default: Sequel::CURRENT_TIMESTAMP
+      DateTime :updated_at, default: Sequel::CURRENT_TIMESTAMP
+    end
+  end
+
+  down do
+    drop_table(:licenses)
+  end
+
+end

db/migrations/0004_add_license_comments_table.rb

@@ -0,0 +1,20 @@
+Sequel.migration do
+
+  up do
+    create_table(:license_comments) do
+      primary_key :id
+      String :body, null: false
+      DateTime :created_at, default: Sequel::CURRENT_TIMESTAMP
+      DateTime :updated_at, default: Sequel::CURRENT_TIMESTAMP
+    end
+
+    alter_table(:license_comments) do
+      add_foreign_key :license_id, :licenses
+    end
+  end
+
+  down do
+    drop_table(:license_comments)
+  end
+
+end

lib/helpers.rb

@@ -0,0 +1,21 @@
+helpers do
+
+  def nullable(value)
+    if (value) and (value != '')
+      return value
+    else
+      return 'N/a'
+    end
+  end
+
+  def date_format(date)
+    dt = date.to_datetime
+    return dt.strftime('%B %d, %Y @ %I:%M:%S %p %Z')
+  end
+
+  def date_format_input(date)
+    dt = date.to_datetime
+    return dt.strftime('%Y-%m-%dT%H:%M:%S')
+  end
+
+end

lib/models/item.rb

@@ -1,5 +1,13 @@
 class Item < Sequel::Model
 
+  one_to_many :item_comments
 
+  def type_selected?(option)
+    if self.type == option
+      return 'selected'
+    else
+      return ''
+    end
+  end
 
 end

lib/models/item_comment.rb

@@ -0,0 +1,5 @@
+class ItemComment < Sequel::Model
+
+  many_to_one :items
+
+end

lib/models/license.rb

@@ -0,0 +1,5 @@
+class License < Sequel::Model
+
+  one_to_many :license_comments
+
+end

lib/models/license_comment.rb

@@ -0,0 +1,5 @@
+class LicenseComment < Sequel::Model
+
+  many_to_one :licenses
+
+end

lib/routes.rb

@@ -1,5 +1,5 @@
 get '/' do
-  items = Item.all
+  items = Item.reverse(:updated_at).limit(10).all()
   erb :index, :locals => {
     :title => 'Dashboard',
     :items => items
@@ -10,7 +10,7 @@ get '/item' do
   redirect '/item/list'
 end
 get '/item/list' do
-  items = Item.all
+  items = Item.reverse(:updated_at).all()
   erb :'item/list', :locals => {
     :title => 'List of Items',
     :items => items
@@ -35,3 +35,129 @@ post '/item/create' do
 
   redirect "/item/#{item.id}"
 end
+
+get '/item/:item_id' do
+  item = Item.where(id: params[:item_id]).first()
+  puts "#{item.name}"
+  erb :'item/view', :locals => {
+    :title => item.name,
+    :item => item
+  }
+end
+
+get '/item/:item_id/edit' do
+  item = Item.where(id: params[:item_id]).first()
+  puts "#{item.name}"
+  erb :'item/edit', :locals => {
+    :title => "Editing: #{item.name}",
+    :item => item
+  }
+end
+post '/item/:item_id/edit' do
+  item = Item.where(id: params[:item_id]).first()
+
+  item.name = params[:item_name]
+  item.serial_number = params[:item_serial]
+  item.sku_number = params[:item_sku]
+  item.purchased_from = params[:item_purchase_from]
+  item.purchased_at = params[:item_purchase_date]
+  item.manufacturer = params[:item_manufacturer]
+  item.type = params[:item_type]
+  item.save()
+
+  redirect "/item/#{item.id}"
+end
+
+get '/item/:item_id/delete' do
+  item = Item.where(id: params[:item_id]).first()
+  item.delete()
+
+  redirect '/item/list'
+end
+
+post '/item/:item_id/comment' do
+  item = Item.first(id: params[:item_id])
+
+  comment = ItemComment.create(body: params[:comment_body])
+  item.add_item_comment(comment)
+
+  redirect "/item/#{item.id}"
+end
+
+get '/license' do
+  redirect '/license/list'
+end
+get '/license/list' do
+  licenses = License.reverse(:updated_at).all()
+  erb :'license/list', :locals => {
+    :title => 'List of Licenses',
+    :licenses => licenses
+  }
+end
+
+get '/license/create' do
+  erb :'license/create', :locals => {
+    :title => 'Create New License'
+  }
+end
+post '/license/create' do
+  license = License.create(
+    name: params[:license_name],
+    key: params[:license_key],
+    manufacturer: params[:license_manufacturer],
+    seats_used: params[:license_seats_used],
+    seats_total: params[:license_seats_total],
+    purchased_from: params[:license_purchase_from],
+    purchased_at: params[:license_purchase_date]
+  )
+
+  redirect "/license/#{license.id}"
+end
+
+get '/license/:license_id' do
+  license = License.where(id: params[:license_id]).first()
+  puts "#{license.name}"
+  erb :'license/view', :locals => {
+    :title => license.name,
+    :license => license
+  }
+end
+
+get '/license/:license_id/edit' do
+  license = License.where(id: params[:license_id]).first()
+  puts "#{license.name}"
+  erb :'license/edit', :locals => {
+    :title => "Editing: #{license.name}",
+    :license => license
+  }
+end
+post '/license/:license_id/edit' do
+  license = License.where(id: params[:license_id]).first()
+
+  license.name = params[:license_name]
+  license.key = params[:license_key]
+  license.manufacturer = params[:license_manufacturer]
+  license.seats_used = params[:license_seats_used]
+  license.seats_total = params[:license_seats_total]
+  license.purchased_from = params[:license_purchase_from]
+  license.purchased_at = params[:license_purchase_date]
+  license.save()
+
+  redirect "/license/#{license.id}"
+end
+
+get '/license/:license_id/delete' do
+  license = License.where(id: params[:license_id]).first()
+  license.delete()
+
+  redirect '/license/list'
+end
+
+post '/license/:license_id/comment' do
+  license = License.first(id: params[:license_id])
+
+  comment = LicenseComment.create(body: params[:comment_body])
+  license.add_license_comment(comment)
+
+  redirect "/license/#{license.id}"
+end

raven.rb

@@ -22,6 +22,12 @@ Sequel::Model.plugin :timestamps
 DB = Sequel.connect(adapter: conf.get('database.adapter'), database: conf.get('database.database'))
 # Load models
 require_relative 'lib/models/item.rb'
+require_relative 'lib/models/item_comment.rb'
+require_relative 'lib/models/license.rb'
+require_relative 'lib/models/license_comment.rb'
+
+# Load helper functions
+require_relative 'lib/helpers.rb'
 
 # Register route handlers
 require_relative 'lib/routes.rb'

views/item/edit.erb

@@ -0,0 +1,64 @@
+<div class="row">
+  <div class="twelve columns">
+    <h1>Editing item: <%= item.name %></h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <form action="/item/<%= item.id %>/edit" method="POST" class="u-full-width">
+      <div class="row">
+        <div class="columns twelve">
+          <label for="item_name">Item name:</label>
+          <input class="u-full-width" type="text" placeholder="My new item" id="item_name" name="item_name" required value="<%= item.name %>">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="item_serial">Serial number:</label>
+          <input class="u-full-width" type="text" placeholder="0123456789" id="item_serial" name="item_serial" value="<%= item.serial_number %>">
+        </div>
+
+        <div class="six columns">
+          <label for="item_sku">SKU number:</label>
+          <input class="u-full-width" type="text" placeholder="ABC12345678" id="item_sku" name="item_sku" value="<%= item.sku_number %>">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="item_purchase_from">Purchased from:</label>
+          <input class="u-full-width" type="text" placeholder="Newegg" id="item_purchase_from" name="item_purchase_from" value="<%= item.purchased_from %>">
+        </div>
+
+        <div class="six columns">
+          <label for="item_purchase_date">Purchased at:</label>
+          <input class="u-full-width" type="datetime-local" id="item_purchase_date" name="item_purchase_date" value="<%= date_format_input(item.purchased_at) %>">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="item_manufacturer">Manufacturer:</label>
+          <input class="u-full-width" type="text" placeholder="Manufacturer" id="item_manufacturer" name="item_manufacturer" value="<%= item.manufacturer %>">
+        </div>
+
+        <div class="six columns">
+          <label for="item_type">Item type</label>
+          <select class="u-full-width" id="item_type" name="item_type">
+            <option value="cpu" <%= item.type_selected?('cpu') %>>Processor</option>
+            <option value="motherboard" <%= item.type_selected?('motherboard') %>>Motherboard</option>
+            <option value="memory" <%= item.type_selected?('memory') %>>Memory (RAM)</option>
+            <option value="psu" <%= item.type_selected?('psu') %>>Power Supply</option>
+            <option value="case" <%= item.type_selected?('case') %>>Case</option>
+            <option value="storage" <%= item.type_selected?('storage') %>>Storage Device</option>
+            <option value="gpu" <%= item.type_selected?('gpu') %>>Graphics Card</option>
+          </select>
+        </div>
+      </div>
+
+      <input class="button-primary u-full-width" type="submit" value="Submit">
+    </form>
+  </div>
+</div>

views/item/list.erb

@@ -1,7 +1,21 @@
-<p><a href="/item/create">Create new item</a></p>
+<div class="row">
+  <div class="twelve columns">
+    <h1>Hardware Inventory List</h1>
+  </div>
+</div>
 
-<ul>
+<div class="row">
-  <% items.each do |item| %>
+  <div class="twelve columns">
-    <li><%= item.name %></li>
+    <p><a href="/item/create">Create new item</a></p>
-  <% end %>
+
-</ul>
+    <% if items.length > 0 %>
+      <ul>
+        <% items.each do |item| %>
+          <li><a href="/item/<%= item.id %>"><%= item.name %></a></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <p>There is nothing registered in your inventory yet.</p>
+    <% end %>
+  </div>
+</div>

views/item/view.erb

@@ -0,0 +1,65 @@
+<div id="item-header" class="row">
+  <div class="twelve columns">
+    <h1 class="item-name"><%= item.name %></h1>
+    <h4 class="item-created">Item added at: <%= date_format(item.created_at) %></h4>
+    <% if item.updated_at %>
+    <h4 class="item-updated">Last updated at: <%= date_format(item.updated_at) %></h4>
+    <% end %>
+  </div>  
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <p class="inventory-actions">
+      <a href="/item/<%= item.id %>/edit"><i class="fa-solid fa-pen-to-square"></i></a>
+      <a href="/item/<%= item.id %>/delete"><i class="fa-solid fa-trash"></i></a>
+    </p>
+    <table class="u-full-width">
+      <thead>
+        <tr>
+          <th>Item type:</th>
+          <th>Manufacturer:</th>
+          <th>Serial number:</th>
+          <th>SKU number:</th>
+          <th>Vendor:</th>
+          <th>Purchase Date:</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><%= item.type %></td>
+          <td><%= nullable(item.manufacturer) %></td>
+          <td><%= nullable(item.serial_number) %></td>
+          <td><%= nullable(item.sku_number) %></td>
+          <td><%= nullable(item.purchased_from) %></td>
+          <td><%= nullable(date_format(item.purchased_at)) %></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <% if item.item_comments.length > 0 %>
+      <ul class="u-full-width">
+        <% item.item_comments.each do |comment| %>
+          <li><%= comment.body %></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <p>There are no comments to display at this time.</p>
+    <% end %>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <form action="/item/<%= item.id %>/comment" method="POST" class="u-full-width">
+      <label for="comment_body">Add a comment:</label>
+      <textarea name="comment_body" id="comment_body" class="u-full-width" cols="30" rows="10"></textarea>
+
+      <input class="button button-primary" type="submit" value="Submit">
+    </form>
+  </div>
+</div>

views/layout.erb

@@ -5,6 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title><%= title %> | Raven</title>
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/skeleton/2.0.4/skeleton.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.1/css/all.min.css">
   <link rel="stylesheet" href="/css/kraken.css">
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
 </head>

views/license/create.erb

@@ -0,0 +1,56 @@
+<div class="row">
+  <div class="twelve columns">
+    <h1>Create new license</h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <form action="/license/create" method="POST" class="u-full-width">
+      <div class="row">
+        <div class="columns twelve">
+          <label for="license_name">Item name:</label>
+          <input class="u-full-width" type="text" placeholder="My new license" id="license_name" name="license_name" required>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="license_key">License key:</label>
+          <input class="u-full-width" type="text" placeholder="acbd1234efgh5678" id="license_key" required name="license_key">
+        </div>
+
+        <div class="six columns">
+          <label for="license_manufacturer">Manufacturer:</label>
+          <input class="u-full-width" type="text" placeholder="Manufacturer" id="license_manufacturer" name="license_manufacturer">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="license_seats_used">Seats used on license:</label>
+          <input class="u-full-width" type="number" placeholder="0" id="license_seats_used" name="license_seats_used">
+        </div>
+
+        <div class="six columns">
+          <label for="license_seats_total">Total seats on license:</label>
+          <input class="u-full-width" type="number" placeholder="1" id="license_seats_total" name="license_seats_total">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="license_purchase_from">Purchased from:</label>
+          <input class="u-full-width" type="text" placeholder="Newegg" id="license_purchase_from" name="license_purchase_from">
+        </div>
+
+        <div class="six columns">
+          <label for="license_purchase_date">Purchased at:</label>
+          <input class="u-full-width" type="datetime-local" id="license_purchase_date" name="license_purchase_date">
+        </div>
+      </div>
+
+      <input class="button-primary u-full-width" type="submit" value="Submit">
+    </form>
+  </div>
+</div>

views/license/edit.erb

@@ -0,0 +1,56 @@
+<div class="row">
+  <div class="twelve columns">
+    <h1>Editing: <%= license.name %></h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <form action="/license/<%= license.id %>/edit" method="POST" class="u-full-width">
+      <div class="row">
+        <div class="columns twelve">
+          <label for="license_name">Item name:</label>
+          <input class="u-full-width" type="text" placeholder="My new license" id="license_name" name="license_name" required value="<%= license.name %>">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="license_key">License key:</label>
+          <input class="u-full-width" type="text" placeholder="acbd1234efgh5678" id="license_key" name="license_key" required value="<%= license.key %>">
+        </div>
+
+        <div class="six columns">
+          <label for="license_manufacturer">Manufacturer:</label>
+          <input class="u-full-width" type="text" placeholder="Manufacturer" id="license_manufacturer" name="license_manufacturer" value="<%= license.manufacturer %>">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="license_seats_used">Seats used on license:</label>
+          <input class="u-full-width" type="number" placeholder="0" id="license_seats_used" name="license_seats_used" value="<%= license.seats_used %>">
+        </div>
+
+        <div class="six columns">
+          <label for="license_seats_total">Total seats on license:</label>
+          <input class="u-full-width" type="number" placeholder="1" id="license_seats_total" name="license_seats_total" value="<%= license.seats_total %>">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="six columns">
+          <label for="license_purchase_from">Purchased from:</label>
+          <input class="u-full-width" type="text" placeholder="Newegg" id="license_purchase_from" name="license_purchase_from" value="<%= license.purchased_from %>">
+        </div>
+
+        <div class="six columns">
+          <label for="license_purchase_date">Purchased at:</label>
+          <input class="u-full-width" type="datetime-local" id="license_purchase_date" name="license_purchase_date" value="<%= date_format_input(license.purchased_at) %>">
+        </div>
+      </div>
+
+      <input class="button-primary u-full-width" type="submit" value="Submit">
+    </form>
+  </div>
+</div>

views/license/list.erb

@@ -0,0 +1,21 @@
+<div class="row">
+  <div class="twelve columns">
+    <h1>Software Licenses List</h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <p><a href="/license/create">Create new license</a></p>
+
+    <% if licenses.length > 0 %>
+      <ul>
+        <% licenses.each do |license| %>
+          <li><a href="/license/<%= license.id %>"><%= license.name %></a></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <p>There is nothing registered in your inventory yet.</p>
+    <% end %>
+  </div>
+</div>

views/license/view.erb

@@ -0,0 +1,65 @@
+<div id="license-header" class="row">
+  <div class="twelve columns">
+    <h1 class="license-name"><%= license.name %></h1>
+    <h4 class="license-created">License added at: <%= date_format(license.created_at) %></h4>
+    <% if license.updated_at %>
+    <h4 class="license-updated">Last updated at: <%= date_format(license.updated_at) %></h4>
+    <% end %>
+  </div>  
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <p class="inventory-actions">
+      <a href="/license/<%= license.id %>/edit"><i class="fa-solid fa-pen-to-square"></i></a>
+      <a href="/license/<%= license.id %>/delete"><i class="fa-solid fa-trash"></i></a>
+    </p>
+    <table class="u-full-width">
+      <thead>
+        <tr>
+          <th>License key:</th>
+          <th>Manufacturer:</th>
+          <th>Seats used:</th>
+          <th>Seats total:</th>
+          <th>Vendor:</th>
+          <th>Purchase Date:</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><%= license.key %></td>
+          <td><%= nullable(license.manufacturer) %></td>
+          <td><%= nullable(license.seats_used) %></td>
+          <td><%= nullable(license.seats_total) %></td>
+          <td><%= nullable(license.purchased_from) %></td>
+          <td><%= nullable(date_format(license.purchased_at)) %></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <% if license.license_comments.length > 0 %>
+      <ul class="u-full-width">
+        <% license.license_comments.each do |comment| %>
+          <li><%= comment.body %></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <p>There are no comments to display at this time.</p>
+    <% end %>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <form action="/license/<%= license.id %>/comment" method="POST" class="u-full-width">
+      <label for="comment_body">Add a comment:</label>
+      <textarea name="comment_body" id="comment_body" class="u-full-width" cols="30" rows="10"></textarea>
+
+      <input class="button button-primary" type="submit" value="Submit">
+    </form>
+  </div>
+</div>