Email Working

master
Goncalo Bras 2017-08-19 11:30:14 +01:00
parent dac08d4fbc
commit 7a16b5220d
5 changed files with 42 additions and 15 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
laravel/CRON_JOB_LOG.txt
laravel/NUL
laravel/CRON_JOB_LOG.txt

View File

@ -14,6 +14,7 @@ use App\Station;
use App\Fuel;
use App\Fuels;
use Redirect;
use Validator;
use Hash;
use Illuminate\Support\Facades\Response;
@ -315,8 +316,8 @@ class UserPageController extends Controller
public function sendEmailRoute(Request $request){
/*
Mail::raw('Endereço $this->address', function ($message){
Mail::raw('Endereço: <a href="'.$request->link.'" style="background-color:#428bca;border:1px solid #EB7035;border-radius:5px;color:white;display:inline-block;font-family:sans-serif;font-size:16px;line-height:44px;text-align:center;text-decoration:none;width:150px;-webkit-text-size-adjust:none;mso-hide:all;">Aceder</a> ', function ($message){
$message->from('geo.comb.ipl@gmail.com')
->to(Auth::user()->email)
->subject("A minha rota Geocomb");
@ -332,9 +333,10 @@ class UserPageController extends Controller
$vehicleData = null;
$vehicleData = Vehicle::where('id', $request->upSelectVehicle)
->first();
return view('planRoute', ['name'=>$user->name, 'vehicles' => $vehicles, 'vehicleData' => $vehicleData]);*/
return Redirect::back()->withSuccess('Message sent!');
}
public function feelingLucky(Request $request){
//echo "$request->upOrigin\n$request->upDestination\n$request->"
}
}

View File

@ -358,9 +358,32 @@ var array2;
var start = routePoints["legs"][0]["start_address"];
var station = routePoints["legs"][0]["end_address"];
var end = routePoints["legs"][1]["end_address"];
var link = "https://www.google.com/maps/dir/"+start+"/"+station+"/"+end;
$('#routeLink').val("asdf");
console.log(link);
var link;
link = "https://www.google.com/maps/dir/"+start+"/"+station+"/"+end;
link = link.replace(/ /g , "+");
$('#routeLink').val(link);
$('#formEmailLink').submit();
});
$('#btnFeelingLucky').click(function(){
var coordinates = {origin: {latitude:null, longitude:null},destination: {latitude:null, longitude:null} };
var points = [];
var key = "AIzaSyDsZDCiU1k6mSuywRRL88xxXY-81RMEU7s";
coordinates = getCoordinates();
alert("origem: "+$("#upOrigin").val() +" "+coordinates.origin.latitude+" destino: "+$("#upDestination").val()+" "+coordinates.destination.latitude);
$.ajax({
//async: false,
crossDomain: true,
dataType: "json",
type: "GET",
url: "https://maps.googleapis.com/maps/api/elevation/json?path="+coordinates.origin.latitude+","+coordinates.origin.longitude+"|"+coordinates.destination.latitude+","+coordinates.destination.longitude+"&samples=15&key="+key,
success: function(data){
data.forEach(function(element){
console.log(element);
});
}
});
});
@ -392,6 +415,7 @@ var array2;
var coordinates = {origin: {latitude:null, longitude:null},destination: {latitude:null, longitude:null} };
$.ajax({
async: false,
dataType: "json",
url: "https://maps.googleapis.com/maps/api/geocode/json?address="+origin+"&key="+key,
success: function(data){
@ -400,6 +424,7 @@ var array2;
}
});
$.ajax({
async: false,
dataType: "json",
url: "https://maps.googleapis.com/maps/api/geocode/json?address="+destination+"&key="+key,
success: function(data){

View File

@ -84,19 +84,17 @@
<button id="upSearch" class="btn btn-primary btn-lg">Pesquisar</button>
<button id="cleanSearch" class="btn btn-danger btn-lg">Limpar Pesquisa</button>
<a id="btnFeelingLucky" type="button" class="btn btn-info btn-lg" <!--href="{{route('feelingLucky')}}"-->>"Estou com sorte"</a>
</div>
<form method="post" action="{{route('sendRouteEmail')}}">
<form id="formEmailLink" method="post" action="{{route('sendRouteEmail')}}">
{{csrf_field()}}
<input type="text" name="routeLink">
<input type="hidden" id="routeLink" name="link">
</form>
<a id="sendRouteEmail" type="button" class="btn btn-info btn-lg" >Enviar rota para o meu Email</a>
<button id="sendRouteEmail" type="button" class="btn btn-info btn-lg" >Enviar rota para o meu Email</button>
</div>
</div>

View File

@ -67,6 +67,7 @@ Route::group(['middleware' => 'auth'], function () {
Route::post('/userpage', 'UserPageController@index')->name('selectVehicle');
Route::get('/sendRouteEmail', 'UserPageController@sendEmailRoute')->name('sendRouteEmail');
Route::post('/sendRouteEmail', 'UserPageController@sendEmailRoute')->name('sendRouteEmail');
Route::get('/userpage/feelingLucky', 'UserPageController@feelingLucky')->name('feelingLucky');
});
Route::post('/showGpsCoordinates', 'LandingController@index');