Don't merge -review

Gemfile

@@ -11,7 +11,7 @@ gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
-
+gem 'coffee-rails'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -24,8 +24,15 @@ gem 'pry-nav'
 gem 'pry-rails'
 # Use ActiveModel has_secure_password
 gem 'bcrypt', '~> 3.1.7'
-
+gem "paperclip", "~> 4.3"
+gem 'aws-sdk', '< 2.0'
 gem 'normalize-rails'
+gem 'private_pub'
+gem 'thin'
+gem 'gmaps4rails'
+gem 'geocoder'
+gem 'omniauth-facebook'
+gem 'omniauth-github'
 
 # Use Unicorn as the app server
 # gem 'unicorn'
@@ -42,6 +49,7 @@ group :development, :test do
   gem "rspec-rails"
   gem "factory_girl_rails"
   gem "faker"
+  gem 'awesome_print'
 end
 
 group :development do
@@ -56,7 +64,3 @@ group :test do
   gem 'shoulda-matchers'
   gem 'database_cleaner'
 end
-
-gem 'omniauth-facebook'
-gem 'omniauth-twitter'
-gem 'omniauth-github'

Gemfile.lock

@@ -38,6 +38,12 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (6.0.3)
+    awesome_print (1.6.1)
+    aws-sdk (1.66.0)
+      aws-sdk-v1 (= 1.66.0)
+    aws-sdk-v1 (1.66.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
     bcrypt (3.1.10)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
@@ -52,12 +58,34 @@ GEM
       xpath (~> 2.0)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.8)
+      climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
+    coffee-rails (4.1.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.1.x)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.10.0)
     concurrent-ruby (1.0.0)
+    cookiejar (0.3.0)
+    daemons (1.2.3)
     database_cleaner (1.5.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    em-http-request (1.1.3)
+      addressable (>= 2.3.4)
+      cookiejar (<= 0.3.0)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.1)
+      eventmachine (>= 1.0.0.beta.4)
     erubis (2.7.0)
+    eventmachine (1.0.9.1)
     execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
@@ -68,10 +96,24 @@ GEM
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    faye (1.1.2)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 0.3.0)
+      eventmachine (>= 0.12.0)
+      faye-websocket (>= 0.9.1)
+      multi_json (>= 1.0.0)
+      rack (>= 1.0.0)
+      websocket-driver (>= 0.5.1)
+    faye-websocket (0.10.2)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
     ffi (1.9.10)
+    geocoder (1.3.1)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    gmaps4rails (2.1.2)
     hashie (3.4.3)
+    http_parser.rb (0.6.0)
     i18n (0.7.0)
     jbuilder (2.4.1)
       activesupport (>= 3.0.0, < 5.1)
@@ -90,6 +132,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.99)
+    mimemagic (0.3.0)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     multi_json (1.11.2)
@@ -98,7 +141,6 @@ GEM
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     normalize-rails (3.0.3)
-    oauth (0.4.7)
     oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0, < 1.5.2)
@@ -113,16 +155,18 @@ GEM
     omniauth-github (1.1.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-oauth (1.1.0)
-      oauth
-      omniauth (~> 1.0)
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-twitter (1.2.1)
-      json (~> 1.3)
-      omniauth-oauth (~> 1.1)
+    paperclip (4.3.5)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      cocaine (~> 0.5.5)
+      mime-types
+      mimemagic (= 0.3.0)
     pg (0.18.4)
+    private_pub (1.0.3)
+      faye
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -205,6 +249,10 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    thin (1.6.4)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
@@ -219,27 +267,36 @@ GEM
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
     websocket (1.2.2)
+    websocket-driver (0.6.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
+  aws-sdk (< 2.0)
   bcrypt (~> 3.1.7)
   byebug
   capybara
+  coffee-rails
   database_cleaner
   factory_girl_rails
   faker
+  geocoder
+  gmaps4rails
   jbuilder (~> 2.0)
   jquery-rails
   launchy
   normalize-rails
   omniauth-facebook
   omniauth-github
-  omniauth-twitter
+  paperclip (~> 4.3)
   pg (~> 0.15)
+  private_pub
   pry
   pry-nav
   pry-rails
@@ -250,6 +307,7 @@ DEPENDENCIES
   selenium-webdriver
   shoulda-matchers
   spring
+  thin
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
 

app/assets/javascripts/application.js

@@ -12,4 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require private_pub
+//= require underscore
+//= require gmaps/google
 //= require_tree .

app/assets/javascripts/conversations.js

@@ -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.

app/assets/stylesheets/application.css

@@ -1,15 +1,10 @@
 /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
+ *= require normalize-rails
+ *= require main
+ *= require users
+ *= require businesses
+ *= require developers
+ *= require conversations
  *= require_tree .
  *= require_self
  */

app/assets/stylesheets/businesses.css.scss

@@ -0,0 +1,11 @@
+#map-container {
+   height: 400px;
+   border-color: #fff;
+   border-style: solid;
+   margin-top: 25px;
+ }
+
+ #map-canvas {
+   height: 384px;
+   width: 100%;
+ }

app/assets/stylesheets/businesses.scss

@@ -0,0 +1,11 @@
+#map-container {
+   height: 400px;
+   border-color: #fff;
+   border-style: solid;
+   margin-top: 25px;
+ }
+
+ #map-canvas {
+   height: 384px;
+   width: 100%;
+ }

app/assets/stylesheets/conversations.css.scss

@@ -0,0 +1,6 @@
+.convo-row {
+  border: 1px solid;
+  width: 25%;
+  text-align: center;
+  margin: 10px;
+}

app/assets/stylesheets/developers.css.scss

@@ -0,0 +1,38 @@
+.star-ratings-css {
+  display: inline-block;
+  left: 5%;
+  unicode-bidi: bidi-override;
+  color: #c5c5c5;
+  font-size: 25px;
+  height: 25px;
+  width: 100px;
+  margin: 0 auto;
+  position: relative;
+  padding: 0;
+  text-shadow: 0px 1px 0 #a2a2a2;
+}
+  .star-ratings-css-top {
+    color: #e7711b;
+    padding: 0;
+    text-shadow: 0px 1px 0 #ab5414;
+    position: absolute;
+    z-index: 1;
+    display:block;
+    left: 0px;
+    overflow: hidden;
+  }
+  .star-ratings-css-bottom { z-index: 0; }
+
+#review-box {
+  margin: 10px;
+  border: solid;
+  width: 40%;
+}
+
+h5 {
+  margin: 5px;
+}
+
+p {
+  margin: 5px;
+}