.gitignore

@@ -59,9 +59,6 @@ build-iPhoneSimulator/
 # Local database storage
 data/raven.db
 
-# Local configuration
-config/raven.yaml
-
 # Node modules for Grunt.js
 node_modules/
 

Gemfile

@@ -8,6 +8,5 @@ gem 'sequel', '~> 5.63'
 gem 'sqlite3', '~> 1.5'
 
 # Use rerun gem to auto-reload app
-gem 'guard-rack'
+gem 'rerun'
-gem 'wdm', '>= 0.1.0' if Gem.win_platform?
 

Gemfile.lock

@@ -1,39 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.3)
     ffi (1.15.5)
     ffi (1.15.5-x64-mingw-ucrt)
-    formatador (1.1.0)
+    listen (3.7.1)
-    guard (2.18.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.13.0)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-rack (2.2.1)
-      ffi
-      guard (~> 2.3)
-      spoon
-    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
-    method_source (1.0.0)
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    nenv (0.3.0)
     nio4r (2.5.8)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     puma (6.0.0)
       nio4r (~> 2.0)
     rack (2.2.4)
@@ -42,9 +18,10 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rerun (0.13.1)
+      listen (~> 3.0)
     ruby2_keywords (0.0.5)
     sequel (5.63.0)
-    shellany (0.0.1)
     sinatra (3.0.4)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
@@ -56,11 +33,8 @@ GEM
       rack-protection (= 3.0.4)
       sinatra (= 3.0.4)
       tilt (~> 2.0)
-    spoon (0.0.6)
-      ffi
     sqlite3 (1.5.4-x64-mingw-ucrt)
     sqlite3 (1.5.4-x86_64-linux)
-    thor (1.2.1)
     tilt (2.0.11)
 
 PLATFORMS
@@ -68,8 +42,8 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  guard-rack
   puma (~> 6.0)
+  rerun
   sequel (~> 5.63)
   sinatra (~> 3.0)
   sinatra-contrib (~> 3.0)

Gruntfile.js

@@ -19,21 +19,6 @@ 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'],
@@ -42,24 +27,15 @@ 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-sass');
-  grunt.loadNpmTasks('grunt-contrib-coffee');
   grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-sass');
 
-  // Default task(s).
+  // CLI tasks.
-  grunt.registerTask('default', ['sass', 'coffee']);
+  grunt.registerTask('default', ['sass']);
 
 };

Guardfile

@@ -1,6 +0,0 @@
-guard 'rack' do
-    watch('Gemfile.lock')
-    watch('config.ru')
-    watch('server.rb')
-    watch(%r{^(lib)/.*})
-end

Rakefile

@@ -10,11 +10,11 @@ namespace :db do
 end
 
 namespace :server do
-  task :start do
+  task :dev do
-    system("puma -C config/puma.rb")
+    %x{ruby raven.rb}
   end
 
-  task :dev do
+  task :reload do
-    %x{guard}
+    %x{rerun --no-notify 'ruby raven.rb'}
   end
 end

app/models/ip_address.rb

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

app/routes/index.rb

@@ -1,16 +0,0 @@
-class Raven
-  class IndexController
-
-    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
-end
-

app/routes/ip_tracker.rb

@@ -1,40 +0,0 @@
-require 'ipaddr'
-
-class Raven
-  class IpTrackerController
-
-    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
-
-    get '/delete/:ip_id' do
-      ip = IpAddress.where(id: params[:ip_id]).first()
-      ip.delete()
-
-      redirect '/ip-tracker'
-    end
-
-  end
-end

app/routes/item.rb

@@ -1,83 +0,0 @@
-class Raven
-  class ItemController
-
-    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
-end

app/routes/license.rb

@@ -1,83 +0,0 @@
-class Raven
-  class LicenseController
-
-    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
-end

app/routes/search.rb

@@ -1,19 +0,0 @@
-class Raven
-  class SearchController
-
-    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
-end

assets/coffee/gargoyle.coffee

@@ -1,43 +0,0 @@
-$(document).ready( ->
-
-  $('#nav-toggle').on('click', toggleNav)
-  if getCookie('navCollapsed') == 'true'
-    $('body').addClass('collapsed')
-  $('#mobile-nav-toggle').on('click', toggleMobileNav)
-
-)
-
-toggleNav = () ->
-  bodyElem = $('body')
-  if bodyElem.hasClass('collapsed')
-    bodyElem.removeClass('collapsed')
-    setCookie('navCollapsed', 'false')
-  else
-    bodyElem.addClass('collapsed')
-    setCookie('navCollapsed', 'true')
-
-toggleMobileNav = () ->
-  navElem = $('#mobile-nav')
-  if navElem.hasClass('expanded')
-    navElem.removeClass('expanded')
-  else
-    navElem.addClass('expanded')
-
-getCookie = (cName) ->
-  name = cName + '='
-  cDecoded = decodeURIComponent(document.cookie)
-  #to be careful
-  cArr = cDecoded.split('; ')
-  res = undefined
-  cArr.forEach (val) ->
-    if val.indexOf(name) == 0
-      res = val.substring(name.length)
-    return
-  res
-
-setCookie = (cName, cValue, expDays = 30) ->
-  date = new Date
-  date.setTime date.getTime() + expDays * 24 * 60 * 60 * 1000
-  expires = 'expires=' + date.toUTCString()
-  document.cookie = cName + '=' + cValue + '; ' + expires + '; path=/'
-  return

assets/styles/kraken.scss

@@ -6,7 +6,6 @@ $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{
@@ -16,87 +15,6 @@ body{
   box-shadow: $box-shadow-2;
 }
 
-@media screen and (max-width: 992px) {
-  body,
-  body.collapsed{
-    padding-left: 0 !important;
-  }
-  #main-nav{
-    display: none;
-  }
-  #mobile-nav{
-    display: block;
-  }
-}
-
-@media screen and (min-width: 993px) {
-  #mobile-nav{
-    display: none;
-  }
-}
-
-#mobile-nav{
-  width: calc(100% + 16px);
-  height: 55px;
-  margin-top: -8px;
-  margin-left: -8px;
-  margin-bottom: 15px;
-  background: #212121;
-  color: white;
-  font-size: 3rem;
-  box-shadow: $box-shadow-1;
-  overflow-y: hidden;
-  transition: height 230ms ease-in-out;
-
-  span{
-    display: inline-block;
-    width: 100%;
-    padding-top: 7px;
-  }
-
-  ul{
-    list-style: none;
-
-    li{
-      margin: 0;
-      border-bottom: 1px solid #999;
-
-      &:first-child{
-        border-top: 1px solid #999;
-      }
-
-      i{
-        display: none;
-        position: absolute;
-        right: 18px;
-        margin-top: 5px;
-        font-size: 3rem;
-      }
-    }
-
-    a{
-      display: block;
-      box-sizing: border-box;
-      width: 100%;
-      padding: 10px 15px;
-      color: limegreen;
-      font-size: 2.5rem;
-      text-decoration: none;
-      transition: all 230ms ease-in-out;
-
-      &:hover{
-        background: rgba(255, 255, 255, 0.1);
-      }
-    }
-  }
-}
-#mobile-nav.expanded{
-  height: 300px;
-  i{
-    display: inline;
-  }
-}
-
 #main-nav{
   position: fixed;
   top: 0;
@@ -108,21 +26,9 @@ body{
   color: white;
   box-shadow: $box-shadow-1;
   box-sizing: border-box;
-  transition: left 230ms ease-in-out;
 
   h3{
-    padding-left: 15px;
+    text-align: center;
-    text-align: left;
-
-    i{
-      position: absolute;
-      right: 22px;
-      margin-top: 5px;
-      font-size: 3rem;
-      &:hover{
-        cursor: pointer;
-      }
-    }
   }
 
   ul{
@@ -135,13 +41,6 @@ body{
       &:first-child{
         border-top: 1px solid #999;
       }
-
-      i{
-        position: absolute;
-        right: 18px;
-        margin-top: 5px;
-        font-size: 3rem;
-      }
     }
 
     a{
@@ -161,13 +60,6 @@ body{
   }
 }
 
-body.collapsed{
-  padding-left: 64px;
-}
-body.collapsed #main-nav{
-  left: calc($nav-width * -1 + 64px);
-}
-
 #main-actions{
   width: 100%;
   max-width: 100%;
@@ -211,7 +103,3 @@ body.collapsed #main-nav{
     font-style: italic;
   }
 }
-
-.u-text-centered{
-  text-align: center;
-}

config.ru

@@ -1,9 +0,0 @@
-# Load application config
-require_relative 'app/config.rb'
-$conf = Config.new(File.join(__dir__, 'data/defaults.yaml'))
-
-# Load Sinatra server
-require_relative './server.rb'
-
-# Run application
-run Raven

config/puma.rb

@@ -1,6 +0,0 @@
-# Load application config
-require './app/config.rb'
-$conf = Config.new(File.join(__dir__, 'config/raven.yaml'))
-
-bind_address = "tcp://#{$conf.get('server.address')}:#{$conf.get('server.port')}"
-bind bind_address

data/defaults.yaml

@@ -1,7 +1,3 @@
-server:
-  address: '127.0.0.1'
-  port: 6200
-
 database:
   adapter: 'sqlite'
   database: 'data/raven.db'

db/migrations/0005_add_ip_table.rb

@@ -1,18 +0,0 @@
-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/config.rb

@@ -2,14 +2,8 @@ require 'yaml'
 
 class Config
 
-  DEFAULT_CONFIG = 'config/defaults.yaml'
-
   def initialize(config_path)
-    @data = YAML::load_file(DEFAULT_CONFIG)
+    @data = YAML::load_file(config_path)
-
-    if File.exists?(config_path)
-      @data.merge!(YAML::load_file(config_path))
-    end
   end
 
   def get(key, depth = 0)

lib/helpers.rb

@@ -1,4 +1,4 @@
-module Helpers
+helpers do
 
   def nullable(value)
     if (value) and (value != '')

lib/models/item.rb

@@ -2,10 +2,6 @@ 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'

lib/models/license.rb

@@ -2,8 +2,4 @@ class License < Sequel::Model
 
   one_to_many :license_comments
 
-  def getLink()
-    return "/license/#{self.id}"
-  end
-
 end

lib/routes.rb

@@ -5,5 +5,3 @@ require_relative 'routes/item.rb'
 require_relative 'routes/license.rb'
 
 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/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,14 @@
+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

package-lock.json

@@ -11,7 +11,6 @@
       "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"
@@ -193,19 +192,6 @@
         "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",
@@ -654,24 +640,6 @@
         "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",
@@ -1711,15 +1679,6 @@
       "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",
@@ -1922,12 +1881,6 @@
         "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",
@@ -2276,18 +2229,6 @@
         }
       }
     },
-    "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",
@@ -3072,12 +3013,6 @@
         }
       }
     },
-    "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,7 +26,6 @@
   "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

@@ -0,0 +1,34 @@
+require 'logger'
+require 'sequel'
+require 'sqlite3'
+require 'sinatra'
+require 'sinatra/namespace'
+
+require_relative 'lib/config.rb'
+
+set :public_folder, __dir__ + '/public'
+
+set :views, settings.root + '/views'
+
+# Load configuration file
+conf = Config.new(File.join(__dir__, 'data/defaults.yaml'))
+
+# Initialize logging
+logger = Logger.new(STDOUT)
+logger.level = Logger::INFO
+
+# Load the Sequel timestamps plugin
+Sequel::Model.plugin :timestamps
+# Initialize Sequel gem for database actions
+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'

server.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-require 'logger'
-require 'sequel'
-require 'sqlite3'
-require 'sinatra/base'
-require 'rack/protection'
-
-# Load the Sequel timestamps plugin
-Sequel::Model.plugin(:timestamps)
-# Initialize Sequel gem for database actions
-DB = Sequel.connect(adapter: $conf.get('database.adapter'), database: $conf.get('database.database'))
-# Load models
-Dir.glob('./app/models/*.rb').sort().each { |f| require f }
-
-# Base Sinatra app
-class Raven < Sinatra::Base
-  @@my_app = {}
-  def self.new(*) self < Raven ? super : Rack::URLMap.new(@@my_app) end
-  def self.map(url) @@my_app[url] = self end
-
-  # Enable and configure sessions
-  enable :sessions
-
-  # Enable rack protection middleware
-  use Rack::Protection
-
-  # Set up static file serving
-  enable :static
-  set :public_folder, File.join(__dir__, '/public')
-
-  # Set up our view engine
-  set :views, File.join(settings.root, '/views')
-
-  # Initialize logging
-  logger = Logger.new($stdout)
-  logger.level = Logger::INFO
-
-  # Load helper functions
-  require_relative 'app/helpers'
-  helpers Helpers
-
-  ## Map controllers
-  # Top-level routes controller
-  class IndexController < Raven
-    map '/'
-  end
-
-  # Item routes controller
-  class ItemController < Raven
-    map '/item'
-  end
-
-  # License routes controller
-  class LicenseController < Raven
-    map '/license'
-  end
-
-  # Search routes controller
-  class SearchController < Raven
-    map '/search'
-  end
-
-  # IP tracker routes controller
-  class IpTrackerController < Raven
-    map '/ip-tracker'
-  end
-end
-
-# Load controllers
-Dir.glob('./app/routes.rb').sort().each { |f| require f }

views/ip/add.erb

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

@@ -1,31 +0,0 @@
-<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>
-            <th>Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-          <% ip_addresses.each do |ip| %>
-            <tr>
-              <td><%= ip.address %></td>
-              <td><%= ip.dns_name %></td>
-              <td><%= ip.comment %></td>
-              <td>
-                <a href="/ip-tracker/delete/<%= ip.id %>"><i class="fa-solid fa-trash"></i></a>
-              </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/layout.erb

@@ -8,13 +8,10 @@
   <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 -->
   <%= erb :'layout/navbar', :locals => locals %>
-  <!-- Mobile navigatin -->
-  <%= erb :'layout/mobile_navbar', :locals => locals %>
 
   <!-- Inventory search/actions bar -->
   <%= erb :'layout/actions', :locals => locals %>

views/layout/mobile_navbar.erb

@@ -1,9 +0,0 @@
-<nav id="mobile-nav">
-  <span class="u-text-centered"><i id="mobile-nav-toggle" class="fa-solid fa-bars"></i></span>
-  <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/layout/navbar.erb

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

views/search/list.erb

@@ -1,14 +1,25 @@
 <div class="row">
   <div class="twelve columns">
-    <h4>Matching inventory:</h4>
+    <h4>Matching hardware:</h4>
-    <% if results.length > 0 %>
+    <% if items.length > 0 %>
       <ul class="u-full-width">
-        <% results.each do |r| %>
+        <% items.each do |r| %>
-          <li><a href="<%= r.getLink() %>"><%= r.name %></a></li>
+          <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>