Skip to content

refactoring the files #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TawfikKahwaje wants to merge 5 commits into
base: master
Choose a base branch
from
Open

refactoring the files #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00914ca
(refactor) Refactor auth file
TawfikKahwaje Aug 27, 2016
66c3ddb
(refactor) Refactor category file
TawfikKahwaje Aug 27, 2016
78162c6
(refactor) Refactor find file
TawfikKahwaje Aug 27, 2016
a73006f
(refactor) Refactor games file
TawfikKahwaje Aug 27, 2016
71bc31c
(style) Add new style
TawfikKahwaje Aug 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
284 changes: 140 additions & 144 deletions client/app/auth/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,107 +4,106 @@ angular.module('TeamUp.auth', [])
/* facrbook Auth */
//===============================================================================================
$scope.facebookUser = {};
$scope.wrong=true;
$scope.wrong = true;

$scope.fbLogin = function () {
FB.login(function (response) {
if (response.authResponse) {
if(response.status === "connected"){
getUserInfo();
$scope.facebookUser.fb_ID = response.authResponse.userID
}
} else {
console.log('User cancelled login or did not fully authorize.');
}
}, {scope: 'email,user_photos,user_birthday,user_location,user_hometown'});

function getUserInfo() {
// get basic info
FB.api('/me',{ locale: 'en_US', fields: 'name, location, email' }, function (response) {
$scope.facebookUser.username = response.email;
$scope.facebookUser.firstName = response.name.split(" ")[0]
$scope.facebookUser.lastName = response.name.split(" ")[1]
$scope.facebookUser.password = response.email;
$scope.facebookUser.email = response.email;

// get profile picture
FB.api('/me/picture?type=normal', function (picResponse) {
$scope.facebookUser.picture = picResponse.data.url;
});
$scope.fbLogin = function() {
FB.login( function(response) {
if (response.authResponse) {
if (response.status === 'connected' ) {
getUserInfo();
$scope.facebookUser.fb_ID = response.authResponse.userID;
}
} else {
console.log('User cancelled login or did not fully authorize.');
}
},
{scope: 'email,user_photos,user_birthday,user_location,user_hometown'});

// to get friends
FB.api("/me/friends", function (response) {
if (response && !response.error) {
$scope.facebookUser.friends = response.data
}
}
);
UserAuth.fbSignin({fb_ID:$scope.facebookUser.fb_ID})
.then(function(user){
if(!user){
$scope.signup($scope.facebookUser);
}else{
$scope.wrong=false;
$window.localStorage['userInfo'] = JSON.stringify(user);
$window.localStorage['token'] = user.token;
$window.localStorage['userId'] = user['user']._id;
$window.localStorage['isLogin'] = true;
$location.path('/home');
$window.location.reload();
}
})
.then(function () {
$scope.islogin();
$location.path('/');
})
.catch(function (error) {
console.error(error)
})
getUserInfo = function () {
// get basic info
FB.api('/me', { locale: 'en_US', fields: 'name, location, email' }, function (response) {
$scope.facebookUser.username = response.email;
$scope.facebookUser.firstName = response.name.split(' ')[0];
$scope.facebookUser.lastName = response.name.split(' ')[1];
$scope.facebookUser.password = response.email;
$scope.facebookUser.email = response.email;

// get profile picture
FB.api('/me/picture?type=normal', function (picResponse) {
$scope.facebookUser.picture = picResponse.data.url;
});

});
}
// to get friends
FB.api('/me/friends', function (response) {
if (response && !response.error) {
$scope.facebookUser.friends = response.data;
}
});
UserAuth.fbSignin( {fb_ID: $scope.facebookUser.fb_ID})
.then(function(user) {
if (!user) {
$scope.signup($scope.facebookUser);
} else {
$scope.wrong = false;
$window.localStorage['userInfo'] = JSON.stringify(user);
$window.localStorage['token'] = user.token;
$window.localStorage['userId'] = user['user']._id;
$window.localStorage['isLogin'] = true;
$location.path('/home');
$window.location.reload();
}
})
.then(function () {
$scope.islogin();
$location.path('/');
})
.catch(function (error) {
console.error(error);
});
});
};
};

// Google Plus Login
$scope.gplusLogin = function () {
var myParams = {
// Replace client id with yours
'clientid': '18301237550-3vlqoed2en4lvq6uuhh88o2h1l9m70tr.apps.googleusercontent.com',
'cookiepolicy': 'single_host_origin',
'callback': loginCallback,
'approvalprompt': 'force',
'scope': 'https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/plus.profile.emails.read'
};
gapi.auth.signIn(myParams);
//console.log(myParams)
function loginCallback(result) {
if (result['status']['signed_in']) {
var request = gapi.client.plus.people.get({'userId': 'me'});
request.execute(function (resp) {
console.log('Google+ Login RESPONSE: ' + angular.toJson(resp));
var userEmail;
if (resp['emails']) {
for (var i = 0; i < resp['emails'].length; i++) {
if (resp['emails'][i]['type'] == 'account') {
userEmail = resp['emails'][i]['value'];
}
}
}
// store data to DB
var user = {};
user.name = resp.displayName;
user.email = userEmail;
if(resp.gender) {
resp.gender.toString().toLowerCase() === 'male' ? user.gender = 'M' : user.gender = 'F';
} else {
user.gender = '';
}
user.profilePic = resp.image.url;
$cookieStore.put('userInfo', user);
$state.go('dashboard');
});
var myParams = {
// Replace client id with yours
'clientid': '18301237550-3vlqoed2en4lvq6uuhh88o2h1l9m70tr.apps.googleusercontent.com',
'cookiepolicy': 'single_host_origin',
'callback': loginCallback,
'approvalprompt': 'force',
'scope': 'https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/plus.profile.emails.read'
};
gapi.auth.signIn(myParams);
//console.log(myParams)
loginCallback = function(result) {
if (result['status']['signed_in']) {
var request = gapi.client.plus.people.get({'userId': 'me'});
request.execute( function (resp) {
console.log('Google+ Login RESPONSE: ' + angular.toJson(resp));
var userEmail;
if (resp['emails']) {
for (var i = 0; i < resp['emails'].length; i++) {
if (resp['emails'][i]['type'] === 'account') {
userEmail = resp['emails'][i]['value'];
}
}
}
// store data to DB
var user = {};
user.name = resp.displayName;
user.email = userEmail;
if (resp.gender) {
resp.gender.toString().toLowerCase() === 'male' ? user.gender = 'M' : user.gender = 'F';
} else {
user.gender = '';
}
user.profilePic = resp.image.url;
$cookieStore.put('userInfo', user);
$state.go('dashboard');
});
}
};
};

//===============================================================================================
Expand All @@ -113,73 +112,70 @@ angular.module('TeamUp.auth', [])
$scope.signin = function (user) {
UserAuth.signUser(user)
.then(function (data) {
$scope.wrong=false;
$scope.wrong = false;
$window.localStorage['token'] = data.token;
$window.localStorage['userId'] = data.userId;
$window.localStorage['isLogin'] = true;
$location.path('/home');
$window.location.reload();
})
.then(function () {
.then( function () {
$scope.islogin();
$location.path('/');
})
})
.catch(function (err) {
console.log(err);
$scope.wrong=false;
$scope.username="";
$scope.password="";
})
$scope.wrong = false;
$scope.username = '';
$scope.password = '';
});
};

$scope.picture = "https://thebenclark.files.wordpress.com/2014/03/facebook-default-no-profile-pic.jpg";
$scope.picture = 'https://thebenclark.files.wordpress.com/2014/03/facebook-default-no-profile-pic.jpg';
$scope.signup = function (newUser) {
$scope.msgB = false;
newUser.picture = $scope.picture;
console.log(newUser)
UserAuth.addNewUser(newUser)
.then(function (user) {
$scope.signin({
username:newUser.username,
password:newUser.password
});
})
.catch(function (err) {
$scope.msgB = true;
$scope.msg = "User already exists"
})
}

$scope.msgB = false;
newUser.picture = $scope.picture;
console.log(newUser);
UserAuth.addNewUser(newUser)
.then(function (user) {
$scope.signin({
username: newUser.username,
password: newUser.password
});
})
.catch(function (err) {
$scope.msgB = true;
$scope.msg = 'User already exists';
});
};
$scope.islogin = function () {
if($window.localStorage['token'] || $window.localStorage['facebookState'] === "connected"){
if ( $window.localStorage['token'] || $window.localStorage['facebookState'] === 'connected') {
$window.islogin = true;
}else{
} else {
$window.islogin = false;
}
console.log($window.islogin)
}
$scope.submit = function(){ //function to call on upload
if ($scope.file) { //check if file is loaded
$scope.upload($scope.file); //call upload function
console.log($window.islogin);
};
$scope.submit = function () { //function to call on upload
if ($scope.file) { //check if file is loaded
$scope.upload($scope.file); //call upload function
}
};
$scope.upload = function (file) { //upload an image to the game
Upload.upload({
url: '/api/upload', //webAPI exposed to upload the file
data: {file: file} //pass file as data, should be user ng-model
})
.then(function (resp) { //upload function returns a promise
if (resp.data.error_code === 0) { //validate success
$scope.picture = 'http://localhost:3000/uploads/' + resp.data.file.filename;
} else {
$window.alert('an error occured');
}
}
$scope.upload = function (file) {//upload an image to the game
Upload.upload({
url: '/api/upload', //webAPI exposed to upload the file
data:{file:file} //pass file as data, should be user ng-model
}).then(function (resp) { //upload function returns a promise
if(resp.data.error_code === 0){ //validate success
$scope.picture='http://localhost:3000/uploads/'+resp.data.file.filename;
} else {
$window.alert('an error occured');
}
}, function (resp) { //catch error
$window.alert('Error status: ' + resp.status);
}, function (evt) {
var progressPercentage = parseInt(100.0 * evt.loaded / evt.total);
$scope.progress = 'progress: ' + progressPercentage + '% '; // capture upload progress
});
}, function (resp) { //catch error
$window.alert('Error status: ' + resp.status);
}, function (evt) {
var progressPercentage = parseInt(100.0 * evt.loaded / evt.total);
$scope.progress = 'progress: ' + progressPercentage + '% '; // capture upload progress
});
};
})


});
Loading