diff --git a/.byebug_history b/.byebug_history index 8f55da9..274bf67 100644 --- a/.byebug_history +++ b/.byebug_history @@ -1,6 +1,32 @@ c +<<<<<<< HEAD +@longitude +@latitude +c +@latitude +c +@latitude +c +@latitude +c +Userdetail.where(user_id: current_user.id)[0].save +Userdetail.where(user_id: current_user.id)[0].address = "adarsh nagar" +Userdetail.where(user_id: current_user.id)[0] +Userdetail.where(user_id: current_user.id)[0].address = "adarsh nagar" +Userdetail.where(user_id: current_user.id)[0].address = adarsh nagar +Userdetail.where(user_id: current_user.id)[0] +current_user +@latitude +latitude +@user.latitude +c +@user.latitude +@user +c +======= current_user params +>>>>>>> 3fc7728df5e94d7bcf331a95fdb30e66460ecd1b @user[0].name @user[0] user[1] @@ -17,8 +43,6 @@ Userdetail.all @user.name @user.profile_picture @user.coverpic -@user - @user @user.coverpic @user diff --git a/Gemfile b/Gemfile index d1c0537..3a2fd54 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ gem 'rails', '4.2.8' gem 'devise' # Use sqlite3 as the database for Active Record gem 'sqlite3' +gem 'geocoder' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index 5c5c6f3..beaefcd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,6 +60,7 @@ GEM erubis (2.7.0) execjs (2.7.0) ffi (1.9.18) + geocoder (1.4.4) globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.6) @@ -176,6 +177,7 @@ DEPENDENCIES byebug coffee-rails (~> 4.1.0) devise + geocoder jbuilder (~> 2.0) jquery-rails jquery-ui-rails diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 7b23dd4..80e5134 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -17,6 +17,11 @@ def homepage def profile @user = Userdetail.where(user_id: current_user.id)[0] + + # @latitude = Geocoder.coordinates(Userdetail.where(user_id: current_user.id)[0].address) + @latitude = Geocoder.coordinates( :"bvp,paschim vihar,delhi")[0] + @longitude = Geocoder.coordinates(:"bvp,paschim vihar,delhi")[1] + byebug end def upload_image diff --git a/app/models/userdetail.rb b/app/models/userdetail.rb index 5942670..b39f2b7 100644 --- a/app/models/userdetail.rb +++ b/app/models/userdetail.rb @@ -6,4 +6,22 @@ class Userdetail < ActiveRecord::Base validates :numslots, presence: true validates :numvacant, presence: true validates :mobilenum, presence: true + + # geocoded_by :address, :latitude => :lat, :longitude => :lon + # geocoded_by :address + # after_validation :geocode + # + # # def address userid + # # Userdetail.where(user_id: userid)[0].address + # # end + # + # def getlatitude userid + # Userdetail.where(user_id: userid)[0].latitude + # end + # + # def getlongitude userid + # Userdetail.where(user_id: userid)[0].longitude + # end + + end diff --git a/app/views/home/profile.html.erb b/app/views/home/profile.html.erb index 46d60ab..53a03ff 100644 --- a/app/views/home/profile.html.erb +++ b/app/views/home/profile.html.erb @@ -115,6 +115,12 @@