Merge branch 'master' into add-ember-user

suraj142 · Jan 30, 2018 · e3076bc · e3076bc
2 parents c853d01 + 30ffe7c
commit e3076bc
Show file tree

Hide file tree

Showing 31 changed files with 603 additions and 224 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,9 @@
+FROM emberjs/website-dev:latest
+
+# Customizations for this project here.
+# e.g.: if you have dependencies in addition to what the base image provides:
+ADD Gemfile /src/Gemfile
+ADD Gemfile.lock /src/Gemfile.lock
+RUN bundle install
+
+ADD . /src
diff --git a/Gemfile b/Gemfile
@@ -16,8 +16,12 @@ gem "underscore-rails"
 gem "gmaps4rails"
 gem "geocoder"
 gem "faraday"
-gem "bourbon"
-gem "neat"
+gem "bourbon", "~> 4.2.7"
+gem "neat", "~> 1.8.0"
+gem 'bootstrap-sass', '~> 3.3.7'
+gem 'sass-rails', '>= 3.2'
+gem 'middleman-bootstrap-navbar'
+gem 'eventmachine', '1.0.9.1'
 
 group :development, :test do
   gem 'pry'
@@ -31,5 +35,5 @@ group :test do
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin]
-gem 'wdm', '>= 0.1.0', platforms: [:mingw, :mswin]
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
+gem 'wdm', '>= 0.1.0', platforms: [:mingw, :mswin, :x64_mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,13 +16,33 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    bourbon (5.0.0)
+    autoprefixer-rails (7.2.5)
+      execjs
+    bootstrap-navbar (3.0.0)
+      gem_config (~> 0.3)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    bourbon (4.2.7)
       sass (~> 3.4)
       thor (~> 0.19)
     builder (3.2.3)
@@ -35,12 +55,12 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.8)
+    chunky_png (1.3.5)
     cliver (0.3.2)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.12.2)
+    coffee-script-source (1.10.0)
     columnize (0.9.0)
     compass (1.0.3)
       chunky_png (~> 1.2)
@@ -54,47 +74,57 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    daemons (1.2.6)
+    crass (1.0.3)
+    daemons (1.2.4)
     debugger-linecache (1.2.0)
-    diff-lcs (1.3)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.2.5)
-    execjs (2.7.0)
-    faraday (0.13.1)
+    eventmachine (1.0.9.1)
+    execjs (2.6.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
-    geocoder (1.4.5)
+    ffi (1.9.10)
+    ffi (1.9.10-x64-mingw32)
+    ffi (1.9.10-x86-mingw32)
+    gem_config (0.3.1)
+    geocoder (1.2.12)
     gmaps4rails (2.1.2)
-    haml (5.0.4)
+    haml (5.0.1)
       temple (>= 0.8.0)
       tilt
-    highline (1.7.10)
+    highline (1.7.8)
     hike (1.2.3)
     hooks (0.4.1)
       uber (~> 0.0.14)
     i18n (0.7.0)
     json (2.1.0)
-    kramdown (1.16.2)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    method_source (0.9.0)
-    middleman (3.4.1)
+    kramdown (1.9.0)
+    listen (3.0.4)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.8.2)
+    middleman (3.4.0)
       coffee-script (~> 2.2)
       compass (>= 1.0.0, < 2.0.0)
       compass-import-once (= 1.0.5)
       execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.4.1)
+      middleman-core (= 3.4.0)
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
     middleman-blog (3.5.3)
       addressable (~> 2.3.5)
       middleman-core (~> 3.2)
       tzinfo (>= 0.3.0)
-    middleman-core (3.4.1)
+    middleman-bootstrap-navbar (4.0.0)
+      bootstrap-navbar (~> 3.0)
+      middleman (>= 3.1)
+    middleman-core (3.4.0)
       activesupport (~> 4.1)
       bundler (~> 1.1)
       capybara (~> 2.4.4)
@@ -106,62 +136,104 @@ GEM
       rack (>= 1.4.5, < 2.0)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
-    middleman-sprockets (3.5.0)
+    middleman-sprockets (3.4.2)
       middleman-core (>= 3.3)
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.3.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types (2.6.2)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
-    multi_json (1.13.0)
+    minitest (5.10.2)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
-    neat (2.1.0)
-      sass (~> 3.4)
+    neat (1.8.0)
+      sass (>= 3.3)
       thor (~> 0.19)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
-    padrino-helpers (0.12.8.1)
+    nokogiri (1.8.1-x64-mingw32)
+      mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.1-x86-mingw32)
+      mini_portile2 (~> 2.3.0)
+    padrino-helpers (0.12.5)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.8.1)
+      padrino-support (= 0.12.5)
       tilt (~> 1.4.1)
-    padrino-support (0.12.8.1)
+    padrino-support (0.12.5)
       activesupport (>= 3.1)
-    poltergeist (1.17.0)
+    poltergeist (1.8.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
+      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry (0.9.12.6-i386-mingw32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    pry (0.9.12.6-i386-mswin32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    pry (0.9.12.6-x86-mingw32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    pry (0.9.12.6-x86-mswin32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
     pry-byebug (1.3.2)
       byebug (~> 2.7)
       pry (~> 0.9.12)
     rack (1.6.8)
-    rack-test (0.8.2)
-      rack (>= 1.0, < 3)
-    rake (12.3.0)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    redcarpet (3.4.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rb-fsevent (0.9.6)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    redcarpet (3.3.3)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    sass (3.4.25)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.0)
+    sass (3.4.19)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     slop (3.6.0)
     sprockets (2.12.4)
       hike (~> 1.2)
@@ -170,39 +242,53 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     temple (0.8.0)
-    thin (1.7.2)
+    thin (1.7.1)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.20.0)
+    thor (0.19.1)
     thread_safe (0.3.6)
     tilt (1.4.1)
-    tzinfo (1.2.4)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2017.3)
+      tzinfo (>= 1.0.0)
     uber (0.0.15)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.8.3)
-    websocket-driver (0.7.0)
+    wdm (0.1.1)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    xpath (2.1.0)
+    websocket-extensions (0.1.2)
+    win32console (1.3.2-x86-mingw32)
+    win32console (1.3.2-x86-mswin32-60)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
+  x64-mingw32
+  x86-mingw32
+  x86-mswin32
 
 DEPENDENCIES
   activesupport
-  bourbon
+  bootstrap-sass (~> 3.3.7)
+  bourbon (~> 4.2.7)
   builder
   capybara
   coderay!
+  eventmachine (= 1.0.9.1)
   faraday
   geocoder
   gmaps4rails
@@ -211,18 +297,20 @@ DEPENDENCIES
   middleman (~> 3.0)
   middleman-alias!
   middleman-blog (~> 3.0)
-  neat
+  middleman-bootstrap-navbar
+  neat (~> 1.8.0)
   poltergeist
   pry
   pry-byebug
   rack
   rake
   redcarpet
   rspec
+  sass-rails (>= 3.2)
   thin
   tzinfo-data
   underscore-rails
   wdm (>= 0.1.0)
 
 BUNDLED WITH
-   1.15.3
+   1.16.1