Added basic IP tracker functionality

Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'sinatra', '~> 3.0'
+gem 'sinatra-contrib', '~> 3.0'
 gem 'puma', '~> 6.0'
 
 gem 'sequel', '~> 5.63'

Gemfile.lock

@@ -6,6 +6,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)
@@ -26,6 +27,12 @@ GEM
       rack (~> 2.2, >= 2.2.4)
       rack-protection (= 3.0.4)
       tilt (~> 2.0)
+    sinatra-contrib (3.0.4)
+      multi_json
+      mustermann (~> 3.0)
+      rack-protection (= 3.0.4)
+      sinatra (= 3.0.4)
+      tilt (~> 2.0)
     sqlite3 (1.5.4-x64-mingw-ucrt)
     sqlite3 (1.5.4-x86_64-linux)
     tilt (2.0.11)
@@ -39,6 +46,7 @@ DEPENDENCIES
   rerun
   sequel (~> 5.63)
   sinatra (~> 3.0)
+  sinatra-contrib (~> 3.0)
   sqlite3 (~> 1.5)
 
 BUNDLED WITH

Gruntfile.js

@@ -19,6 +19,21 @@ module.exports = function(grunt) {
       }
     },
 
+    coffee: {
+      options: {
+        sourceMap: true,
+        style: 'compressed'
+      },
+      files: {
+        expand: true,
+        flatten: true,
+        cwd: 'assets/coffee',
+        src: ['*.coffee'],
+        dest: 'public/js',
+        ext: '.js'
+      }
+    },
+
     watch: {
       css: {
         files: ['assets/styles/**/*.scss'],
@@ -27,15 +42,24 @@ module.exports = function(grunt) {
           atBegin: true,
           spawn: false
         }
+      },
+      js: {
+        files: ['assets/coffee/*.coffee'],
+        tasks: ['coffee'],
+        options: {
+          atBegin: true,
+          spawn: false
+        }
       }
     }
   });
 
   // Load plugins.
-  grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-sass');
+  grunt.loadNpmTasks('grunt-contrib-coffee');
+  grunt.loadNpmTasks('grunt-contrib-watch');
 
-  // CLI tasks.
-  grunt.registerTask('default', ['sass']);
+  // Default task(s).
+  grunt.registerTask('default', ['sass', 'coffee']);
 
 };

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/coffee/gargoyle.coffee

@@ -0,0 +1,12 @@
+$(document).ready( ->
+
+  $('#nav-toggle').on('click', toggleNav)
+
+)
+
+toggleNav = () ->
+  bodyElem = $('body')
+  if bodyElem.hasClass('collapsed')
+    bodyElem.removeClass('collapsed')
+  else
+    bodyElem.addClass('collapsed')

assets/styles/kraken.scss

@@ -5,6 +5,15 @@ $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;
+  transition: padding-left 230ms ease-in-out;
+}
+
+.card{
+  padding: 20px 30px;
+  background: white;
+  border-radius: 5px;
+  box-shadow: $box-shadow-2;
 }
 
 #main-nav{
@@ -18,9 +27,21 @@ body{
   color: white;
   box-shadow: $box-shadow-1;
   box-sizing: border-box;
+  transition: left 230ms ease-in-out;
 
   h3{
-    text-align: center;
+    padding-left: 15px;
+    text-align: left;
+
+    i{
+      position: absolute;
+      right: 22px;
+      margin-top: 5px;
+      font-size: 3rem;
+      &:hover{
+        cursor: pointer;
+      }
+    }
   }
 
   ul{
@@ -33,6 +54,13 @@ body{
       &:first-child{
         border-top: 1px solid #999;
       }
+
+      i{
+        position: absolute;
+        right: 18px;
+        margin-top: 5px;
+        font-size: 3rem;
+      }
     }
 
     a{
@@ -52,11 +80,53 @@ body{
   }
 }
 
+body.collapsed{
+  padding-left: 64px;
+}
+body.collapsed #main-nav{
+  left: calc($nav-width * -1 + 64px);
+}
+
+#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;
-  padding: 20px 30px;
-  background: white;
-  border-radius: 5px;
-  box-shadow: $box-shadow-2;
+}
+
+#main-wrapper.container.fluid{
+  width: 100%;
+  max-width: 100%;
+  margin: 0;
+}
+
+#site-header{
+  margin-bottom: 0;
+}
+
+#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 :updated_at
+      DateTime :created_at, default: Sequel::CURRENT_TIMESTAMP
+      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

db/migrations/0005_add_ip_table.rb

@@ -0,0 +1,18 @@
+Sequel.migration do
+
+  up do
+    create_table(:ip_addresses) do
+      primary_key :id
+      String :address, null: false
+      String :dns_name
+      String :comment
+      DateTime :created_at, default: Sequel::CURRENT_TIMESTAMP
+      DateTime :updated_at, default: Sequel::CURRENT_TIMESTAMP
+    end
+  end
+
+  down do
+    drop_table(:ip_addresses)
+  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/ip_address.rb

@@ -0,0 +1,5 @@
+class IpAddress < Sequel::Model
+
+
+
+end

lib/models/item.rb

@@ -1,5 +1,17 @@
 class Item < Sequel::Model
 
+  one_to_many :item_comments
 
+  def getLink()
+    return "/item/#{self.id}"
+  end
+
+  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,9 @@
+class License < Sequel::Model
+
+  one_to_many :license_comments
+
+  def getLink()
+    return "/license/#{self.id}"
+  end
+
+end

lib/models/license_comment.rb

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

lib/routes.rb

@@ -1,37 +1,9 @@
-get '/' do
-  items = Item.all
-  erb :index, :locals => {
-    :title => 'Dashboard',
-    :items => items
-  }
-end
+require_relative 'routes/index.rb'
 
-get '/item' do
-  redirect '/item/list'
-end
-get '/item/list' do
-  items = Item.all
-  erb :'item/list', :locals => {
-    :title => 'List of Items',
-    :items => items
-  }
-end
+require_relative 'routes/item.rb'
 
-get '/item/create' do
-  erb :'item/create', :locals => {
-    :title => 'Create New Item'
-  }
-end
-post '/item/create' do
-  item = Item.create(
-    name: params[:item_name],
-    serial_number: params[:item_serial],
-    sku_number: params[:item_sku],
-    purchased_from: params[:item_purchase_from],
-    purchased_at: params[:item_purchase_date],
-    manufacturer: params[:item_manufacturer],
-    type: params[:item_type]
-  )
+require_relative 'routes/license.rb'
 
-  redirect "/item/#{item.id}"
-end
+require_relative 'routes/search.rb'
+
+require_relative 'routes/ip_tracker.rb'

lib/routes/index.rb

@@ -0,0 +1,14 @@
+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
+    }
+  end
+
+end
+

lib/routes/ip_tracker.rb

@@ -0,0 +1,31 @@
+require 'ipaddr'
+
+namespace '/ip-tracker' do
+
+  get '' do
+    ip_addresses = IpAddress.all()
+    ip_addresses.sort! { |a,b| IPAddr.new( a.address ) <=> IPAddr.new( b.address ) } 
+
+    erb :'ip/ip-tracker', :locals => {
+      :title => 'IP Tracker',
+      :ip_addresses => ip_addresses
+    }
+  end
+
+  get '/add' do
+    erb :'ip/add', :locals => {
+      :title => 'Add IP Address'
+    }
+  end
+
+  post '/add' do
+    ip = IpAddress.create(
+      address: params[:ip_address],
+      dns_name: params[:ip_dns],
+      comment: params[:ip_comment]
+    )
+
+    redirect '/ip-tracker'
+  end
+
+end

lib/routes/item.rb

@@ -0,0 +1,81 @@
+namespace '/item' do
+
+  get '' do
+    redirect '/item/list'
+  end
+  get '/list' do
+    items = Item.reverse(:updated_at).all()
+    erb :'item/list', :locals => {
+      :title => 'List of Items',
+      :items => items
+    }
+  end
+  
+  get '/create' do
+    erb :'item/create', :locals => {
+      :title => 'Create New Item'
+    }
+  end
+  post '/create' do
+    item = Item.create(
+      name: params[:item_name],
+      serial_number: params[:item_serial],
+      sku_number: params[:item_sku],
+      purchased_from: params[:item_purchase_from],
+      purchased_at: params[:item_purchase_date],
+      manufacturer: params[:item_manufacturer],
+      type: params[:item_type]
+    )
+  
+    redirect "/item/#{item.id}"
+  end
+  
+  get '/: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_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_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_id/delete' do
+    item = Item.where(id: params[:item_id]).first()
+    item.delete()
+  
+    redirect '/item/list'
+  end
+  
+  post '/: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
+
+end

lib/routes/license.rb

@@ -0,0 +1,81 @@
+namespace '/license' do
+
+  get '' do
+    redirect '/license/list'
+  end
+  get '/list' do
+    licenses = License.reverse(:updated_at).all()
+    erb :'license/list', :locals => {
+      :title => 'List of Licenses',
+      :licenses => licenses
+    }
+  end
+  
+  get '/create' do
+    erb :'license/create', :locals => {
+      :title => 'Create New License'
+    }
+  end
+  post '/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_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_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_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_id/delete' do
+    license = License.where(id: params[:license_id]).first()
+    license.delete()
+  
+    redirect '/license/list'
+  end
+  
+  post '/: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
+
+end

lib/routes/search.rb

@@ -0,0 +1,15 @@
+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()
+
+    results = items.concat(licenses)
+
+    erb :'search/list', :locals => {
+      :title => 'Search Results',
+      :results => results,
+      :query => search_parameter
+    }
+  end
+end

package-lock.json

@@ -11,6 +11,7 @@
       "devDependencies": {
         "grunt": "^1.5.3",
         "grunt-cli": "^1.4.3",
+        "grunt-contrib-coffee": "^2.1.0",
         "grunt-contrib-sass": "^2.0.0",
         "grunt-contrib-watch": "^1.1.0",
         "sass": "^1.55.0"
@@ -192,6 +193,19 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/coffeescript": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz",
+      "integrity": "sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==",
+      "dev": true,
+      "bin": {
+        "cake": "bin/cake",
+        "coffee": "bin/coffee"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -640,6 +654,24 @@
         "nopt": "bin/nopt.js"
       }
     },
+    "node_modules/grunt-contrib-coffee": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-2.1.0.tgz",
+      "integrity": "sha512-lgP+pPY3mHl+gqAU0T+7BcocBWu0FyeeJnAG/iIp2I0GPa5LvZJ7Wqga6QwKQtQCTs+1gPEa12nuap9Lj08lhw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "coffeescript": "^2.3.2",
+        "lodash": "^4.17.11",
+        "uri-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "grunt": ">=0.4.5"
+      }
+    },
     "node_modules/grunt-contrib-sass": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/grunt-contrib-sass/-/grunt-contrib-sass-2.0.0.tgz",
@@ -1679,6 +1711,15 @@
       "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
       "dev": true
     },
+    "node_modules/uri-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz",
+      "integrity": "sha512-8pMuAn4KacYdGMkFaoQARicp4HSw24/DHOVKWqVRJ8LhhAwPPFpdGvdL9184JVmUwe7vz7Z9n6IqI6t5n2ELdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -1881,6 +1922,12 @@
         "readdirp": "~3.6.0"
       }
     },
+    "coffeescript": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz",
+      "integrity": "sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==",
+      "dev": true
+    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -2229,6 +2276,18 @@
         }
       }
     },
+    "grunt-contrib-coffee": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-2.1.0.tgz",
+      "integrity": "sha512-lgP+pPY3mHl+gqAU0T+7BcocBWu0FyeeJnAG/iIp2I0GPa5LvZJ7Wqga6QwKQtQCTs+1gPEa12nuap9Lj08lhw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "coffeescript": "^2.3.2",
+        "lodash": "^4.17.11",
+        "uri-path": "^1.0.0"
+      }
+    },
     "grunt-contrib-sass": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/grunt-contrib-sass/-/grunt-contrib-sass-2.0.0.tgz",
@@ -3013,6 +3072,12 @@
         }
       }
     },
+    "uri-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz",
+      "integrity": "sha512-8pMuAn4KacYdGMkFaoQARicp4HSw24/DHOVKWqVRJ8LhhAwPPFpdGvdL9184JVmUwe7vz7Z9n6IqI6t5n2ELdg==",
+      "dev": true
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",

package.json

@@ -26,6 +26,7 @@
   "devDependencies": {
     "grunt": "^1.5.3",
     "grunt-cli": "^1.4.3",
+    "grunt-contrib-coffee": "^2.1.0",
     "grunt-contrib-sass": "^2.0.0",
     "grunt-contrib-watch": "^1.1.0",
     "sass": "^1.55.0"

raven.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'sequel'
 require 'sqlite3'
 require 'sinatra'
+require 'sinatra/namespace'
 
 require_relative 'lib/config.rb'
 
@@ -22,6 +23,13 @@ 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'
+require_relative 'lib/models/ip_address.rb'
+
+# Load helper functions
+require_relative 'lib/helpers.rb'
 
 # Register route handlers
 require_relative 'lib/routes.rb'

views/index.erb

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

views/ip/add.erb

@@ -0,0 +1,32 @@
+<div class="row">
+  <div class="twelve columns">
+    <h1>Add new IP address</h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="twelve columns">
+    <form action="/ip-tracker/add" method="POST" class="u-full-width">
+      <div class="row">
+        <div class="six columns">
+          <label for="ip_address">IP address:</label>
+          <input class="u-full-width" type="text" placeholder="192.168.1.20" id="ip_address" name="ip_address">
+        </div>
+
+        <div class="six columns">
+          <label for="ip_dns">DNS name:</label>
+          <input class="u-full-width" type="text" placeholder="test.example.com" id="ip_dns" name="ip_dns">
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="twelve columns">
+          <label for="ip_comment">Comments:</label>
+          <input class="u-full-width" type="text" placeholder="My thoughts on this address..." id="ip_comment" name="ip_comment">
+        </div>
+      </div>
+
+      <input class="button-primary u-full-width" type="submit" value="Submit">
+    </form>
+  </div>
+</div>

views/ip/ip-tracker.erb

@@ -0,0 +1,27 @@
+<div class="row">
+  <div class="twelve columns">
+    <% if ip_addresses.length > 0 %>
+      <p><a href="/ip-tracker/add">Add new address</a></p>
+      <table class="u-full-width">
+        <thead>
+          <tr>
+            <th>Address</th>
+            <th>DNS Name</th>
+            <th>Comments</th>
+          </tr>
+        </thead>
+        <tbody>
+          <% ip_addresses.each do |ip| %>
+            <tr>
+              <td><%= ip.address %></td>
+              <td><%= ip.dns_name %></td>
+              <td><%= ip.comment %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    <% else %>
+      <p>There are no IP addresses to show at this time. Trying <a href="/ip-tracker/add">adding some</a>.</p>
+    <% end %>
+  </div>
+</div>

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>
-  <% items.each do |item| %>
-    <li><%= item.name %></li>
-  <% end %>
-</ul>
+<div class="row">
+  <div class="twelve columns">
+    <p><a href="/item/create">Create new item</a></p>
+
+    <% 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,21 +5,19 @@
   <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>
+  <script src="/js/gargoyle.js"></script>
 </head>
 <body>
   <!-- Main navigation -->
-  <nav id="main-nav">
-    <h3>Raven</h3>
-    <ul>
-      <li><a href="/">Dashboard</a></li>
-      <li><a href="/item/list">Items</a></li>
-      <li><a href="/license/list">Licenses</a></li>
-    </ul>
-  </nav>
+  <%= erb :'layout/navbar', :locals => locals %>
 
-  <div id="main-wrapper" class="container">
+  <!-- Inventory search/actions bar -->
+  <%= erb :'layout/actions', :locals => locals %>
+
+  <div id="main-wrapper" class="container fluid card">
     <%= yield %>
   </div>
 </body>

views/layout/actions.erb

@@ -0,0 +1,9 @@
+<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>

views/layout/navbar.erb

@@ -0,0 +1,9 @@
+<nav id="main-nav">
+  <h3>Raven <i id="nav-toggle" class="fa-solid fa-bars"></i></h3>
+  <ul>
+    <li><a href="/">Dashboard <i class="fa-solid fa-gauge"></i></a></li>
+    <li><a href="/item/list">Items <i class="fa-solid fa-desktop"></i></a></li>
+    <li><a href="/license/list">Licenses <i class="fa-solid fa-floppy-disk"></i></a></li>
+    <li><a href="/ip-tracker">IP Tracker <i class="fa-solid fa-network-wired"></i></a></li>
+  </ul>
+</nav>

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>

views/search/list.erb

@@ -0,0 +1,14 @@
+<div class="row">
+  <div class="twelve columns">
+    <h4>Matching inventory:</h4>
+    <% if results.length > 0 %>
+      <ul class="u-full-width">
+        <% results.each do |r| %>
+          <li><a href="<%= r.getLink() %>"><%= r.name %></a></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <p>Sorry, nothing in your hardware inventory matches that search term.</p>
+    <% end %>
+  </div>
+</div>