Started working on UI

This commit imports a lot of assets from veekun, as well as a font from
http://www.victoryroad.net/showthread.php?t=1507

2471 files changed, 208 insertions, 9 deletions

@@ -5,3 +5,4 @@ test/dummy/db/*.sqlite3
 test/dummy/db/*.sqlite3-journal
 test/dummy/log/*.log
 test/dummy/tmp/
+.DS_Store
@@ -4,7 +4,10 @@ PATH
     pokeviewer (0.1.0)
       activerecord-diff
       enumerize
+      haml
+      normalize-rails
       rails (~> 5.1.4)
+      sass-rails (~> 5.0)
       sequenced
 
 GEM
@@ -54,8 +57,12 @@ GEM
     enumerize (2.1.2)
       activesupport (>= 3.2)
     erubi (1.6.1)
+    ffi (1.9.18)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    haml (5.0.1)
+      temple (>= 0.8.0)
+      tilt
     i18n (0.8.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
@@ -70,6 +77,7 @@ GEM
     nio4r (2.1.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
+    normalize-rails (4.1.1)
     rack (2.0.3)
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
@@ -97,6 +105,20 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.1.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     sequenced (3.1.1)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
@@ -108,8 +130,10 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    temple (0.8.0)
     thor (0.20.0)
     thread_safe (0.3.6)
+    tilt (2.0.8)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
@@ -10,6 +10,17 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require_tree .
+ *= require normalize-rails
  *= require_self
+ *= require_tree .
  */
+
+@font-face {
+        font-family: 'Power Green';
+        src: font-url('PowerGreen.eot');
+        src: font-url('PowerGreen.eot?#iefix') format('embedded-opentype'),
+                font-url('PowerGreen.woff') format('woff'),
+                font-url('PowerGreen.ttf') format('truetype');
+        font-weight: normal;
+        font-style: normal;
+}
@@ -0,0 +1,35 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/
+
+.pokemon {
+  font-family: 'Power Green';
+  display: flex;
+  margin: 1em;
+
+  .male {
+    color: blue;
+  }
+
+  .female {
+    color: red;
+  }
+  
+  .pokemon-name {
+    font-weight: bold;
+  }
+
+  .pokemon-ivs {
+    margin: 0 1em;
+    
+    th {
+      text-align: center;
+      padding-right: .5em;
+    }
+    
+    td {
+      text-align: right;
+    }
+  }
+}
@@ -0,0 +1,13 @@
+require_dependency "pokeviewer/application_controller"
+
+module Pokeviewer
+  class PokemonController < ApplicationController
+    def index
+      @pokemon = Pokemon.all
+    end
+
+    def show
+      @pokemon = Pokemon.find_by_uuid params[:id]
+    end
+  end
+end
@@ -0,0 +1,4 @@
+module Pokeviewer
+  module PokemonHelper
+  end
+end
@@ -27,8 +27,14 @@ module Pokeviewer
           r.species_id = param["species"]
           r.ot_name = param["otName"]
           r.ot_number = param["otId"]
-          r.met_type = :normal
-          r.met_level = param["metLevel"]
+
+          if param["metLevel"] == 0
+            r.met_type = :hatched
+          else
+            r.met_type = :normal
+            r.met_level = param["metLevel"]
+          end
+
           r.shiny = param["shiny"]
           r.nature = Pokemon.nature.values[param["nature"]]
           r.gender = param["gender"]
@@ -15,7 +15,8 @@ module Pokeviewer
       numericality: { greater_than_or_equal_to: 0, only_integer: true }
 
     validates :met_level, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
+      numericality: { greater_than_or_equal_to: 1, only_integer: true },
+      if: Proc.new { |a| a.met_type == :normal }
 
     validates :met_type, presence: true
     enumerize :met_type, in: [:normal, :hatched, :npc_trade, :fateful_encounter]
@@ -31,12 +32,53 @@ module Pokeviewer
 
     enumerize :unown_letter, in: [:a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k,
       :l, :m, :n, :o, :p, :q, :r, :s, :t, :u, :v, :w, :x, :y, :z,
-      :question_mark, :exclamation_mark]
+      :question, :exclamation]
 
     def to_param
       uuid
     end
 
+    def icon_path
+      "pokeviewer/icons/#{species_id}.png"
+    end
+
+    def sprite_path
+      shininess = "normal"
+      if shiny
+        shininess = "shiny"
+      end
+
+      game = "ruby-sapphire"
+      unless trainer.nil?
+        if (trainer.firered? or trainer.leafgreen?) and (species_id <= 156 or species_id == 216 or species_id == 386)
+          game = "firered-leafgreen"
+        elsif trainer.emerald?
+          game = "emerald"
+        end
+      end
+
+      form = ""
+      if species_id == 201
+        # Handle Unown forms
+        form = "-#{unown_letter}"
+      elsif species_id == 386
+        # Handle Deoxys forms
+        if trainer.firered?
+          form = "-attack"
+        elsif trainer.leafgreen?
+          form = "-defense"
+        elsif trainer.emerald?
+          form = "-speed"
+        end
+      end
+
+      if game == "emerald"
+        "pokeviewer/sprites/emerald/#{shininess}/#{species_id}#{form}.gif"
+      else
+        "pokeviewer/sprites/#{game}/#{shininess}/#{species_id}#{form}.png"
+      end
+    end
+
     private
 
       def set_uuid
@@ -4,7 +4,7 @@ module Pokeviewer
   class Revision < ApplicationRecord
     include ActiveRecord::Diff
 
-    diff :nickname, :experience, :level, :hp, :attack, :defense,
+    diff :nickname, :level, :hp, :attack, :defense,
       :special_attack, :special_defense, :speed, :coolness, :beauty, :cuteness,
       :smartness, :toughness, :sheen, :hold_item, :move_1_id, :move_2_id,
       :move_3_id, :move_4_id, :move_1_pp_bonuses, :move_2_pp_bonuses,
@@ -12,6 +12,7 @@ module Pokeviewer
       message: "and number should be pairwise unique" }
 
     validates :game, presence: true
-    enumerize :game, in: [:ruby, :sapphire, :firered, :leafgreen, :emerald]
+    enumerize :game, in: [:ruby, :sapphire, :firered, :leafgreen, :emerald],
+      predicates: true
   end
 end
@@ -0,0 +1,5 @@
+%ul
+  - @pokemon.each do |p|
+    %li
+      = link_to p.revisions.last.nickname, p
+      = image_tag p.icon_path
@@ -0,0 +1,30 @@
+.pokemon
+  .pokemon-basics
+    .pokemon-species-id= "No. #{@pokemon.species_id}"
+    .pokemon-species-name= @pokemon.species.name
+    .pokemon-image= image_tag @pokemon.sprite_path
+    .pokemon-name= @pokemon.revisions.last.nickname
+    .pokemon-ot
+      OT/
+      %span{ class: @pokemon.gender }>= @pokemon.ot_name
+    .pokemon-id= "ID/#{@pokemon.ot_number}"
+    .pokemon-level= "Lv. #{@pokemon.revisions.last.level}"
+  %table.pokemon-ivs
+    %tr
+      %th HP
+      %td= @pokemon.revisions.last.hp
+    %tr
+      %th Attack
+      %td= @pokemon.revisions.last.attack
+    %tr
+      %th Defense
+      %td= @pokemon.revisions.last.defense
+    %tr
+      %th Sp. Atk
+      %td= @pokemon.revisions.last.special_attack
+    %tr
+      %th Sp. Def
+      %td= @pokemon.revisions.last.special_defense
+    %tr
+      %th Speed
+      %td= @pokemon.revisions.last.speed
@@ -1,4 +1,6 @@
 Pokeviewer::Engine.routes.draw do
   post '/', to: 'uploader#submit'
 
+  resources :pokemon, only: [:index, :show]
+
 end
@@ -0,0 +1,5 @@
+class MakeMetLevelNullable < ActiveRecord::Migration[5.1]
+  def change
+    change_column :pokeviewer_pokemon, :met_level, :integer, null: true
+  end
+end
@@ -1,8 +1,23 @@
 require "enumerize"
 require "sequenced"
+require "haml"
+require "sass-rails"
+require "normalize-rails"
 
 module Pokeviewer
   class Engine < ::Rails::Engine
     isolate_namespace Pokeviewer
+
+    initializer "pokeviewer.assets" do |app|
+      app.config.assets.paths << Rails.root.join("app", "assets", "fonts")
+    end
+
+    initializer "pokeviewer.assets" do |app|
+      app.config.assets.precompile +=
+        %w(pokeviewer/icons/*.png
+          pokeviewer/sprites/**/*.png
+          pokeviewer/sprites/**/*.gif
+          pokeviewer/types/**.gif)
+    end
   end
 end
@@ -20,6 +20,9 @@ Gem::Specification.new do |s|
   s.add_dependency "enumerize"
   s.add_dependency "sequenced"
   s.add_dependency "activerecord-diff"
+  s.add_dependency "haml"
+  s.add_dependency 'sass-rails', '~> 5.0'
+  s.add_dependency 'normalize-rails'
 
   s.add_development_dependency "sqlite3"
 end
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170917011258) do
+ActiveRecord::Schema.define(version: 20170924035127) do
 
   create_table "pokeviewer_moves", force: :cascade do |t|
     t.string "name", limit: 191, null: false
@@ -29,7 +29,7 @@ ActiveRecord::Schema.define(version: 20170917011258) do
     t.integer "ot_number", null: false
     t.string "met_type", null: false
     t.string "met_location"
-    t.integer "met_level", null: false
+    t.integer "met_level"
     t.boolean "shiny", default: false, null: false
     t.string "nature", null: false
     t.string "gender", null: false