Skip to content

Commit

Permalink
Recover Navigation. Add angular-google-maps support instead of ngMap
Browse files Browse the repository at this point in the history
  • Loading branch information
@strikeroff
strikeroff committed Jan 4, 2015
1 parent 5f36ead commit 41ac173
Show file tree
Hide file tree
Showing 27 changed files with 635 additions and 293 deletions.
3 changes: 1 addition & 2 deletions Bowerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
#asset 'bootstrap'
asset 'bootstrap-sass-official'
asset 'angular'
asset 'ngmap'
#asset 'angular-google-maps'
asset 'angular-google-maps'
17 changes: 7 additions & 10 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.1.7'
gem 'rails', '4.2.0'
# Use sqlite3 as the database for Active Record
gem 'pg'
# Use SCSS for stylesheets
Expand All @@ -12,9 +12,10 @@ gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

gem 'devise'

gem "carmen-rails"
############ Navigation ############
gem "simple-navigation"
gem 'simple-navigation-bootstrap'
############ Navigation ############


############ FRONTEND ############
Expand All @@ -31,21 +32,17 @@ gem "less-rails"
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
# gem 'turbolinks'
gem "bower-rails", "~> 0.9.1"
gem 'angular-rails-templates'
gem 'devise'
# Use CoffeeScript for .js.coffee assets and views
# gem 'coffee-rails', '~> 4.0.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

gem 'angular-rails-templates'

############ END FRONTEND ############



#navigation
gem "simple-navigation"
gem "simple-navigation-bootstrap"


group :development, :test do
# gem 'spring-commands-rspec'
Expand Down
211 changes: 123 additions & 88 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,51 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
actionmailer (4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.7)
actionview (= 4.1.7)
activesupport (= 4.1.7)
rack (~> 1.5.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0)
actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2)
actionview (4.1.7)
activesupport (= 4.1.7)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.7)
activesupport (= 4.1.7)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0)
activesupport (= 4.2.0)
globalid (>= 0.3.0)
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
activerecord (4.1.7)
activemodel (= 4.1.7)
activesupport (= 4.1.7)
arel (~> 5.0.0)
activesupport (4.1.7)
i18n (~> 0.6, >= 0.6.9)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
angular-rails-templates (0.1.3)
railties (>= 3.1)
sprockets
tilt
arel (5.0.1.20140414130214)
arel (6.0.0)
bcrypt (3.1.9)
bower-rails (0.9.1)
bower-rails (0.9.2)
builder (3.2.2)
capistrano (3.2.1)
capistrano (3.3.5)
capistrano-stats (~> 1.1.0)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
Expand All @@ -45,20 +55,26 @@ GEM
capistrano-rails (1.1.2)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
carmen (1.0.1)
unicode_utils (~> 1.4.0)
carmen-rails (1.0.1)
carmen (~> 1.0.0)
rails
chunky_png (1.3.1)
colorize (0.7.3)
capistrano-stats (1.1.1)
chunky_png (1.3.3)
colorize (0.7.5)
commonjs (0.2.7)
compass (0.12.7)
compass (1.0.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-rails (1.1.1)
compass (>= 0.12.2)
compass-core (~> 1.0.1)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.1)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
compass-rails (2.0.2)
compass (~> 1.0.0)
sass-rails (<= 5.0.1)
sprockets (< 2.13)
daemons (1.1.9)
devise (3.4.1)
bcrypt (~> 3.0)
Expand All @@ -69,65 +85,84 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.2.5)
erubis (2.7.0)
eventmachine (1.0.3)
eventmachine (1.0.4)
execjs (2.2.2)
fabrication (2.11.3)
fssm (0.2.10)
ffi (1.9.6)
globalid (0.3.0)
activesupport (>= 4.1.0)
hike (1.2.3)
hpricot (0.8.6)
html2slim (0.1.0)
hpricot
i18n (0.6.11)
jbuilder (2.2.4)
i18n (0.7.0)
jbuilder (2.2.6)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
json (1.8.1)
less (2.5.1)
less (2.6.0)
commonjs (~> 0.2.7)
less-rails (2.5.0)
less-rails (2.6.0)
actionpack (>= 3.1)
less (~> 2.5.0)
less (~> 2.6.0)
libv8 (3.16.14.7)
loofah (2.0.1)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.4.3)
minitest (5.4.2)
mini_portile (0.6.2)
minitest (5.5.0)
multi_json (1.10.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
orm_adapter (0.5.0)
pg (0.17.1)
rack (1.5.2)
pg (0.18.0)
rack (1.6.0)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.7)
actionmailer (= 4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
activemodel (= 4.1.7)
activerecord (= 4.1.7)
activesupport (= 4.1.7)
rails (4.2.0)
actionmailer (= 4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
activemodel (= 4.2.0)
activerecord (= 4.2.0)
activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.7)
sprockets-rails (~> 2.0)
railties (4.1.7)
actionpack (= 4.1.7)
activesupport (= 4.1.7)
railties (= 4.2.0)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.5)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rdoc (4.1.2)
rake (10.4.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (4.2.0)
json (~> 1.4)
ref (1.0.5)
responders (1.1.2)
railties (>= 3.2, < 4.2)
rspec-core (3.1.2)
responders (2.0.2)
railties (>= 4.2.0.alpha, < 5)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
Expand All @@ -137,13 +172,14 @@ GEM
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.0)
sass (3.2.19)
sass-rails (4.0.4)
rspec-support (3.1.2)
sass (3.4.9)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 2.12)
sprockets-rails (~> 2.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
Expand All @@ -152,44 +188,44 @@ GEM
simple-navigation-bootstrap (1.0.0)
railties (>= 3.1)
simple-navigation (>= 3.7.0)
slim (2.0.3)
temple (~> 0.6.6)
slim (3.0.1)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slim-rails (2.1.5)
actionpack (>= 3.0, < 4.2)
activesupport (>= 3.0, < 4.2)
railties (>= 3.0, < 4.2)
slim (~> 2.0)
sprockets (2.11.3)
slim-rails (3.0.1)
actionmailer (>= 3.1, < 5.0)
actionpack (>= 3.1, < 5.0)
activesupport (>= 3.1, < 5.0)
railties (>= 3.1, < 5.0)
slim (~> 3.0)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.0)
sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sshkit (1.5.1)
colorize
sshkit (1.6.1)
colorize (>= 0.7.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.6.8)
temple (0.7.4)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thin (1.6.2)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thin (1.6.3)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0)
rack (~> 1.0)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
uglifier (2.6.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicode_utils (1.4.0)
warden (1.2.3)
rack (>= 1.0)

Expand All @@ -200,15 +236,14 @@ DEPENDENCIES
angular-rails-templates
bower-rails (~> 0.9.1)
capistrano-rails
carmen-rails
compass-rails
devise
fabrication
html2slim
jbuilder (~> 2.0)
less-rails
pg
rails (= 4.1.7)
rails (= 4.2.0)
rspec-rails
sass-rails
sdoc (~> 0.4.0)
Expand Down
4 changes: 4 additions & 0 deletions app/assets/javascripts/application.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
//= require jquery
//= require jquery_ujs
//= require angular/angular
//= require lodash/dist/lodash
//= require angular-google-maps/dist/angular-google-maps_dev_mapped
//= require bootstrap-sass-official/assets/javascripts/bootstrap-sprockets
//= require bootstrap-sass-official/assets/javascripts/bootstrap



Loading

0 comments on commit 41ac173

Please sign in to comment.