+
diff --git a/index.html~ b/index.html~
new file mode 100644
index 0000000..3318193
--- /dev/null
+++ b/index.html~
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
< Facebook Console
Place Recommendations
Your religion is
Would you like to generate places?
Would you like to generate places?
Place Recommendations
You are:
Would you like to generate places?
Would you like to generate places?
-
-
-
You seem to be Christian. Want to see nearby churches? Nope
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/js/.jquery.js.swp b/js/.jquery.js.swp
index 680cf7f..1eedc07 100644
Binary files a/js/.jquery.js.swp and b/js/.jquery.js.swp differ
diff --git a/js/animatemenu.js b/js/animatemenu.js
new file mode 100644
index 0000000..dff4a78
--- /dev/null
+++ b/js/animatemenu.js
@@ -0,0 +1,76 @@
+expand_already = true;
+
+function expand()
+{
+ if (expand_already) {
+ var canvas = document.getElementById("Straight-mask");
+ canvas.setAttribute ("id", "mask");
+$("#menu").animate({
+ width: '350px',
+ left:"80%"
+}, { duration: 1500, queue: false });
+$("#mask").animate({
+ width: '80%',
+}, { duration: 1500, queue: false });
+$("#map-canvas").animate({
+ width: '68%',
+}, { duration: 1500, queue: false });
+$("#fb-container").animate({
+ left: '65%',
+}, { duration: 1500, queue: false });
+$("#fb_religion").animate({
+ left: '48.75%',
+}, { duration: 1500, queue: false });
+$("#fb_relationship").animate({
+ left: '32.5%',
+}, { duration: 1500, queue: false });
+$("#fb_likes").animate({
+ left: '28%%',
+}, { duration: 1500, queue: false });
+
+expand_already = !expand_already;
+
+}
+
+else {
+
+$("#menu").animate({
+ width: '40px',
+ left:"97.4%"
+}, { duration: 1500, queue: false });
+
+$("#map-canvas").animate({
+ width: '86.3%',
+}, { duration: 1500, queue: false });
+
+
+$("#fb-container").animate({
+ left: '82%',
+}, { duration: 1500, queue: false });
+
+$("#fb_religion").animate({
+ left: '66%',
+}, { duration: 1500, queue: false });
+
+$("#fb_relationship").animate({
+ left: '50%',
+}, { duration: 1500, queue: false });
+
+$("#fb_likes").animate({
+ left: '32%',
+}, { duration: 1500, queue: false });
+
+$("#mask").animate({
+ width: '100%',
+}, { duration: 1500, queue: true });
+
+
+expand_already = !expand_already;
+var canvas = document.getElementById("mask");
+canvas.setAttribute ("id", "Straight-mask");
+
+}
+
+
+
+}
diff --git a/js/animatemenu.js~ b/js/animatemenu.js~
new file mode 100644
index 0000000..ad89ac8
--- /dev/null
+++ b/js/animatemenu.js~
@@ -0,0 +1,67 @@
+expand_already = true;
+
+function expand()
+{
+ if (expand_already) {
+ var canvas = document.getElementById("Straight-mask");
+ canvas.setAttribute ("id", "mask");
+$(".click-menu").animate({
+ width: '350px',
+ left:"80%"
+}, { duration: 1500, queue: false });
+$("#mask").animate({
+ width: '80%',
+}, { duration: 1500, queue: false });
+$("#map-canvas").animate({
+ width: '68%',
+}, { duration: 1500, queue: false });
+
+$("#fb").animate({
+ left: '58%',
+}, { duration: 1500, queue: false });
+$("#fb-container").animate({
+ left: '58%',
+}, { duration: 1500, queue: false });
+$("#fb_religion").animate({
+ left: '48%',
+}, { duration: 1500, queue: false });
+
+expand_already = !expand_already;
+
+}
+
+else {
+
+$(".click-menu").animate({
+ width: '40px',
+ left:"97.4%"
+}, { duration: 1500, queue: false });
+
+$("#map-canvas").animate({
+ width: '86.3%',
+}, { duration: 1500, queue: false });
+
+$("#fb").animate({
+ left: '78%',
+}, { duration: 1500, queue: false });
+$("#fb-container").animate({
+ left: '78%',
+}, { duration: 1500, queue: false });
+$("#fb_religion").animate({
+ left: '58%',
+}, { duration: 1500, queue: false });
+
+$("#mask").animate({
+ width: '100%',
+}, { duration: 1500, queue: true });
+
+
+expand_already = !expand_already;
+var canvas = document.getElementById("mask");
+canvas.setAttribute ("id", "Straight-mask");
+
+}
+
+
+
+}
diff --git a/js/dynamicSlides.js b/js/dynamicSlides.js
new file mode 100644
index 0000000..b0392e0
--- /dev/null
+++ b/js/dynamicSlides.js
@@ -0,0 +1,13 @@
+$(function() {
+ $("#slider" + selections).slider({
+ value: 50,
+ min: 20,
+ max: 400,
+ step: 10,
+ slide: function(event, ui) {
+ $("#amount").val("" + ui.value);
+ }
+ });
+ $("#amount").val("" + $("#slider").slider("value"));
+});
+ });
diff --git a/js/dynamicSlides.js~ b/js/dynamicSlides.js~
new file mode 100644
index 0000000..a6ad78f
--- /dev/null
+++ b/js/dynamicSlides.js~
@@ -0,0 +1,14 @@
+
+$(function() {
+ $("#slider" + selections).slider({
+ value: 50,
+ min: 20,
+ max: 400,
+ step: 10,
+ slide: function(event, ui) {
+ $("#amount").val("" + ui.value);
+ }
+ });
+ $("#amount").val("" + $("#slider").slider("value"));
+});
+ });
diff --git a/js/facebook.js b/js/facebook.js
index 8a61389..3866975 100644
--- a/js/facebook.js
+++ b/js/facebook.js
@@ -1,5 +1,7 @@
var markersArray = [];
var string_address;
+ var religion_keyword;
+ var relationship_keyword;
window.fbAsyncInit = function() {
@@ -21,7 +23,13 @@
// The response object is returned with a status field that lets the app know the current
// login status of the person. In this case, we're handling the situation where they
// have logged in to the app.
- religionAPI();
+ FBAPI_profile(function(resp) {
+ $("religion_text").text(resp.religion);
+ $("relationship_text").text(resp.relationship_status);
+ });
+ FBAPI_likes(function(resp) {
+ });
+
} else if (response.status === 'not_authorized') {
// In this case, the person is logged into Facebook, but not into the app, so we call
// FB.login() to prompt them to do so.
@@ -51,17 +59,44 @@
ref.parentNode.insertBefore(js, ref);
}(document));
- // Here we run a very simple test of the Graph API after login is successful.
- // This testAPI() function is only called in those cases.
- function religionAPI() {
+ // Called after login is successful
+ /** Mines user's religion and relationship status */
+ function FBAPI_profile(callback) {
FB.api('/me', function(response) {
- if (response.religion == "Christian" || response.religion == "Christianity") {
- console.log("Hello!");
+ // Religion
+ if (response.religion == "Christian" || response.religion == "Christianity"
+ || response.religion == "Catholic" || response.religion == "Catholicism") {
document.getElementById("fb_religion").style.visibility = "visible";
+ religion_keyword = 'church';
}
+ else if (response.religion == "Muslim" || response.religion == "Islam") {
+ document.getElementById("fb_religion").style.visibility = "visible";
+ religion_keyword = 'mosque';
+ }
+ // Relationship status
+ if (response.relationship_status == "In a relationship" || response.relationship_status == "Engaged"
+ || response.relationship_status == "Married" || response.relationship_status == "In an open relationship") {
+ document.getElementById("fb_relationship").style.visibility = "visible";
+ relationship_keyword = 'romance';
+ }
+ else if (response.relationship_status == "Single" || response.relationship_status == "Widowed"
+ || response.relationship_status == "Divorced") {
+ document.getElementById("fb_relationship").style.visibility = "visible";
+ relationship_keyword = 'dating';
+ }
+ callback(response);
+ });
+ }
+
+ // Called after login is successful
+ /** Mines and analyzes user's likes */
+ function FBAPI_likes(callback) {
+ FB.api('/me?fields=likes', function(response) {
+ callback(response);
});
}
+
// METHODS BY LEONARD TO MINE DATA
/** Add marker from FB */
function addMarker() {
@@ -72,7 +107,6 @@ var geocoder = new google.maps.Geocoder();
if (status == google.maps.GeocoderStatus.OK) {
var latitude = results[0].geometry.location.lat();
var longitude = results[0].geometry.location.lng();
- console.log("hi" + latitude);
var position = new google.maps.LatLng(latitude,longitude);
}
var marker = new google.maps.Marker({
@@ -100,15 +134,22 @@ else { document.getElementById(id).style.visibility = "visible"; }
/** RELIGION */
-function showMarkers_religion() {
-
+function showMarkers(keyword) {
+removeMarkers();
+var actual_keyword;
+ if (keyword == 'religion') {
+ actual_keyword = religion_keyword;
+ }
+ if (keyword == 'relationship') {
+ actual_keyword = relationship_keyword;
+ }
infoWindow = new google.maps.InfoWindow();
service = new google.maps.places.PlacesService(map);
// Facebook Services
var request = {
location: new google.maps.LatLng(39.9539, -75.1930),
bounds: map.getBounds(),
- keyword: 'church'
+ keyword: actual_keyword
};
service.radarSearch(request, callback);
}
@@ -139,7 +180,11 @@ markersArray.push(marker);
}
console.log(result);
string_address = "" + result.vicinity;
- infoWindow.setContent('You seem to be Christian. Want to see nearby churches? Nope
+
+
+
+
+' + result.name + '
' + 'Website' + '
' + result.name + '
' + 'Website' + '
Phone: ' + phone); infoWindow.open(map, marker); }); }); diff --git a/js/mapscript.js b/js/mapscript.js index 4285dfb..657025d 100644 --- a/js/mapscript.js +++ b/js/mapscript.js @@ -2,6 +2,7 @@ var map; var hasStarted = false; // if hasStarted is true, user can now input amenities choices var choices_latlon = []; // User's input of amenities location in lat and lon var houses_latlon = []; // Houses' lat and lon that are scraped +var selections = 0; /** START CONTROL BUTTON */ function StartControl(controlDiv, map) { @@ -103,6 +104,9 @@ for (var i = 0; i < housedata.length; i++) { }); } }); + + + function initialize() { var mapOptions = { zoom: 16, @@ -119,9 +123,26 @@ if (hasStarted) { geocoder.geocode({'latLng': e.latLng}, function(results, status) { if (status == google.maps.GeocoderStatus.OK) { if (results[1]) { - var newDiv = "
" +results[1].formatted_address + "
";
- $('#locationsdiv').append(newDiv)
+ selections++;
+
+ var newDiv = "
" +results[1].formatted_address + "
";
+
+
+ $('#locationsdiv').append(newDiv);
$('#locationsdiv').accordion("refresh");
+ $("#slidertext" + selections).css({"color": "#f6931f", "font-weight": "bold"});
+ var sliderpointer = $("slider" + selections);
+jQuery.data(sliderpointer, "pointer", { id: selections});
+ $("#slider" + selections).slider({
+ value: 0,
+ min: 0,
+ max: 100,
+ step: 5,
+ slide: function(event, ui) {
+ $("#slidertext" + (jQuery.data(sliderpointer, "pointer").id)).text("Importance: " + ui.value);
+ }
+
+ });
}
} else {
alert("Geocoder failed due to: " + status);
@@ -129,6 +150,7 @@ if (hasStarted) {
});
}
placeMarker(e.latLng, map);
+
});
// Start Control Button clicked event
diff --git a/js/mapscript.js~ b/js/mapscript.js~
index 1de323a..657025d 100644
--- a/js/mapscript.js~
+++ b/js/mapscript.js~
@@ -2,6 +2,7 @@ var map;
var hasStarted = false; // if hasStarted is true, user can now input amenities choices
var choices_latlon = []; // User's input of amenities location in lat and lon
var houses_latlon = []; // Houses' lat and lon that are scraped
+var selections = 0;
/** START CONTROL BUTTON */
function StartControl(controlDiv, map) {
@@ -11,21 +12,31 @@ function StartControl(controlDiv, map) {
// Set CSS for the Start button border
var controlUI = document.createElement('div');
+ controlUI.setAttribute ("id", "start-button");
+
+ /* unnecessary now, all in css
controlUI.style.backgroundColor = 'white';
controlUI.style.borderStyle = 'dotted';
controlUI.style.borderWidth = '2px';
controlUI.style.opacity = '0.7';
controlUI.style.cursor = 'pointer';
controlUI.style.textAlign = 'center';
+ */
+
controlUI.title = 'Click to start adding points';
controlDiv.appendChild(controlUI);
// Set CSS for the Start button text
var controlText = document.createElement('div');
+ controlText.setAttribute ("id", "start-button-smaller");
+
+ /* unnecessary now, all in css
controlText.style.fontFamily = 'Arial,sans-serif';
controlText.style.fontSize = '14px';
controlText.style.paddingLeft = '4px';
controlText.style.paddingRight = '4px';
+ */
+
controlText.innerHTML = 'Start';
controlUI.appendChild(controlText);
@@ -93,6 +104,9 @@ for (var i = 0; i < housedata.length; i++) {
});
}
});
+
+
+
function initialize() {
var mapOptions = {
zoom: 16,
@@ -109,9 +123,26 @@ if (hasStarted) {
geocoder.geocode({'latLng': e.latLng}, function(results, status) {
if (status == google.maps.GeocoderStatus.OK) {
if (results[1]) {
- var newDiv = "
" +results[1].formatted_address + "
"+e.latLng.lat()+"
" +results[1].formatted_address + "
";
+
+
+ $('#locationsdiv').append(newDiv);
$('#locationsdiv').accordion("refresh");
+ $("#slidertext" + selections).css({"color": "#f6931f", "font-weight": "bold"});
+ var sliderpointer = $("slider" + selections);
+jQuery.data(sliderpointer, "pointer", { id: selections});
+ $("#slider" + selections).slider({
+ value: 0,
+ min: 0,
+ max: 100,
+ step: 5,
+ slide: function(event, ui) {
+ $("#slidertext" + (jQuery.data(sliderpointer, "pointer").id)).text("Importance: " + ui.value);
+ }
+
+ });
}
} else {
alert("Geocoder failed due to: " + status);
@@ -119,10 +150,12 @@ if (hasStarted) {
});
}
placeMarker(e.latLng, map);
+
});
// Start Control Button clicked event
var StartControlDiv = document.createElement('div');
+ StartControlDiv.setAttribute ("id", "start-button-bigger");
var startControl = new StartControl(StartControlDiv, map);
StartControlDiv.index = 1;
map.controls[google.maps.ControlPosition.BOTTOM_CENTER].push(StartControlDiv);
diff --git a/js/menuInitScript.js b/js/menuInitScript.js
index 2aba48d..34f872b 100644
--- a/js/menuInitScript.js
+++ b/js/menuInitScript.js
@@ -28,4 +28,5 @@ $( "#amountBedrooms" ).val( ui.value );
}
});
$( "#amountBedrooms" ).val( $( "#slider-range-max" ).slider( "value" ) );
+
});
diff --git a/js/menuInitScript.js~ b/js/menuInitScript.js~
index 699e871..5844bbf 100644
--- a/js/menuInitScript.js~
+++ b/js/menuInitScript.js~
@@ -9,10 +9,11 @@ min: 0,
max: 1400,
values: [ 75, 300 ],
slide: function( event, ui ) {
-$( "#amount" ).val( "$" + ui.values[ 0 ] + " - $" + ui.values[ 1 ] );
+$( "#amountPrice" ).val( "$" + ui.values[ 0 ] + " - $" + ui.values[ 1 ] );
+console.log(ui.values[1] - ui.values[0]);
}
});
-$( "#amount" ).val( "$" + $( "#slider-range" ).slider( "values", 0 ) +
+$( "#amountPrice" ).val( "$" + $( "#slider-range" ).slider( "values", 0 ) +
" - $" + $( "#slider-range" ).slider( "values", 1 ) );
});
@@ -24,8 +25,9 @@ min: 1,
max: 10,
value: 2,
slide: function( event, ui ) {
-$( "#amount" ).val( ui.value );
+$( "#amountBedrooms" ).val( ui.value );
}
});
-$( "#amount" ).val( $( "#slider-range-max" ).slider( "value" ) );
+$( "#amountBedrooms" ).val( $( "#slider-range-max" ).slider( "value" ) );
+
});
diff --git a/js/menyInitScript.js b/js/menyInitScript.js
index addaff9..ca3dd0b 100644
--- a/js/menyInitScript.js
+++ b/js/menyInitScript.js
@@ -1,6 +1,6 @@
var meny = Meny.create({
-menuElement: document.querySelector( '#menu' ),
+menuElement: document.querySelector( '#description' ),
contentsElement: document.querySelector( '#mapcontainer' ),
position: 'left',
-width: 300
+width: 600
});
diff --git a/js/menyInitScript.js~ b/js/menyInitScript.js~
index f05be33..ca3dd0b 100644
--- a/js/menyInitScript.js~
+++ b/js/menyInitScript.js~
@@ -1,6 +1,6 @@
var meny = Meny.create({
-menuElement: document.querySelector( '#menu' ),
+menuElement: document.querySelector( '#description' ),
contentsElement: document.querySelector( '#mapcontainer' ),
position: 'left',
-width: 350
+width: 600
});