changes

Author: xtina-starr

Gemfile

@@ -27,6 +27,8 @@ gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
 
+gem 'httparty'
+
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
   gem 'sdoc', require: false

Gemfile.lock

@@ -53,6 +53,9 @@ GEM
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     hike (1.2.3)
+    httparty (0.12.0)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
     i18n (0.6.9)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
@@ -73,6 +76,7 @@ GEM
     mime-types (1.25.1)
     minitest (4.7.5)
     multi_json (1.8.3)
+    multi_xml (0.5.5)
     pg (0.17.1)
     polyglot (0.3.3)
     pry (0.9.12.4)
@@ -162,6 +166,7 @@ PLATFORMS
 DEPENDENCIES
   coffee-rails (~> 4.0.0)
   guard-rspec
+  httparty
   jbuilder (~> 1.2)
   jquery-rails
   pg

app/assets/javascripts/application.js

@@ -20,4 +20,8 @@ $(document).ready(function(){
   $('#hover').click(function(){
     $('#create-message').fadeIn(5000);
   });
-});
+  $('.display_form').click(function(){
+    //$(".switch").toggle()
+  });
+});
+

app/assets/stylesheets/contact.css.scss

@@ -25,7 +25,11 @@ div.field {
   margin-bottom: 20px;
 }
 
-div#message input {
+textarea#contact_message {
   width: 400px;
   height: 200px;
+}
+
+span#label {
+  vertical-align: top;
 }

app/assets/stylesheets/welcome.css.scss

@@ -46,16 +46,13 @@ div#create-message {
   margin-left: 80px;
   margin-top: -450px;
   width: 250px;
-  display: none;
-}
+  display: none;}
 
 a {color: purple;
   font-family: 'Lobster', cursive;
-  text-transform: uppercase;
-}
+  text-transform: uppercase;}
 
 div#part2 {
   background: black;
   height: 900px;
-  width: auto;
-  display: none;}
+  width: auto;}

app/controllers/application_controller.rb

@@ -8,16 +8,33 @@ def current_visitor
     @current_visitor ||= if session[:visitor_id]
       Visitor.find(session[:visitor_id])
     else
-      visitor = Visitor.create(ip_address: request.remote_ip, mobile: mobile_device?)
+      visitor = Visitor.create(ip_address: request.remote_ip, mobile: mobile_device?, country: get_ip(request.remote_ip), browser: browser_name)
       session[:visitor_id] = visitor.id
       visitor
     end
   end
   helper_method :current_visitor
 
+  def get_ip(ip)
+    HTTParty.get("http://freegeoip.net/json/#{ip}").parsed_response["country_name"]
+  end
+
 
   def mobile_device?
     request.user_agent.downcase.include?("mobile")
   end
   helper_method :mobile_device?
+
+
+  def browser_name
+    if request.user_agent.downcase.include?("firefox")
+      "firefox"
+    elsif request.user_agent.downcase.include?("gecko")
+      "safari"
+    elsif request.user_agent.downcase.include?("msie")
+      "internet explorer"
+    else
+      "unknown"
+    end 
+  end
 end

app/controllers/welcome_controller.rb

@@ -2,6 +2,7 @@ class WelcomeController < ApplicationController
   before_action :update_visit_count
 
   def index
+    @contact = Contact.new
   end
 
   def update_visit_count

app/models/visitor.rb

@@ -21,5 +21,9 @@ def self.non_mobile_users
   def self.total_visitors
     sum(:page_visits)
   end
+
+  def self.firefox_users
+    where(browser: firefox)
+  end
 
 end

app/views/admin/index.html.erb

@@ -36,4 +36,16 @@
       <td><%= Visitor.non_mobile_users.count %></td>
     </tr>
   </table>
+
+  <table class="browser">
+    <tr>
+      <th>Mobile Visitors:</th>
+      <th>Non-Mobile Visitors:</th>
+    </tr>
+
+    <tr>
+      <td><%= Visitor.mobile_users.count %></td>
+      <td><%= Visitor.non_mobile_users.count %></td>
+    </tr>
+  </table>
 </div>

app/views/contact/new.html.erb

@@ -12,8 +12,8 @@
       <%= f.text_field :email %>
     </div>
     <div class="field" id="message">
-      <%= f.label :message %>
-      <%= f.text_field :message %>
+      <span id="label"> <%= f.label :message %></span>
+      <%= f.text_area :message %>
     </div>
     <div class="actions">
       <%= f.submit "Submit" %>