Skip to content

Social #3

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
MjJuneja wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Social #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e5974e
removed facebook and google clientside added added oauth
himanshuchandra Jun 5, 2017
c1331b4
login with mobile ready
himanshuchandra Jun 5, 2017
0e13960
socail sign in integeration
himanshuchandra Jan 5, 2018
9e97f93
redirections fixed
himanshuchandra Jan 6, 2018
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
5 changes: 2 additions & 3 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"dependencies": {
"angular-md5": "^0.1.10",
"ng-country-select": "^0.1.4",
"ng-facebook": "^0.1.6",
"angular-google-plus": "^0.1.3",
"ngstorage": "^0.3.11"
"ngstorage": "^0.3.11",
"ng-cordova-oauth": "^0.3.0"
}
}
7 changes: 4 additions & 3 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<description>
An Ionic Framework and Cordova project.
</description>
<author email="you@example.com" href="http://example.com/">
Your Name Here
<author email="himanshu.chandra@outlook.com" href="http://example.com/">
Himanshu Chandra
</author>
<content src="index.html"/>
<access origin="*"/>
Expand All @@ -17,6 +17,7 @@
<preference name="android-minSdkVersion" value="16"/>
<preference name="BackupWebStorage" value="none"/>
<preference name="SplashScreen" value="screen"/>
<preference name="OverrideUserAgent" value="Mozilla/5.0 Google" />
<feature name="StatusBar">
<param name="ios-package" value="CDVStatusBar" onload="true"/>
</feature>
Expand All @@ -41,4 +42,4 @@
<splash src="resources\android\splash\drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
</platform>
<icon src="resources\android\icon\drawable-xhdpi-icon.png"/>
</widget>
</widget>
10 changes: 5 additions & 5 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
<script src="cordova.js"></script>

<!-- your app's js -->
<script src="lib/ng-facebook/ngFacebook.js"></script>
<script src="lib/ng-cordova-oauth/dist/ng-cordova-oauth.min.js"></script>
<script src="lib/angular-md5/angular-md5.min.js"></script>
<script src="lib/angular-google-plus/dist/angular-google-plus.min.js"></script>
<script src="lib/ng-country-select/dist/ng-country-select.min.js"></script>
<script src="lib/ngstorage/ngStorage.min.js"></script>

Expand All @@ -45,9 +44,10 @@
<script src="js/services/login.js"></script>
<script src="js/controllers/signup.js"></script>
<script src="js/services/signup.js"></script>
<script src="js/controllers/google.js"></script>
<script src="js/controllers/facebook.js"></script>
<script src="js/services/socialsignin.js"></script>
<script src="js/controllers/social.js"></script>
<!-- <script src="js/controllers/google.js"></script>
<script src="js/controllers/facebook.js"></script> -->
<!-- <script src="js/services/socialsignin.js"></script> -->
<script src="js/controllers/profile.js"></script>
<script src="js/services/profile.js"></script>
<script src="js/controllers/forgotpassword.js"></script>
Expand Down
21 changes: 6 additions & 15 deletions www/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
// 'starter.controllers' is found in controllers.js
angular.module('appskeleton', [
'ionic',
'ngCordovaOauth',
'angular-md5',
'countrySelect',
'googleplus',
'ngFacebook',
'ngStorage'
])

Expand All @@ -30,23 +29,15 @@ angular.module('appskeleton', [
});
})

.constant("requrl","http://192.168.0.102:1234")
.constant("requrl","http://ec2-54-202-236-174.us-west-2.compute.amazonaws.com:8080")
.constant("GOOGLE_CLIENT_ID","11067462844-4s6bjl47j6m7v2g4it1ndnfbgirk7m3g.apps.googleusercontent.com")
.constant("GOOGLE_API_KEY","AIzaSyA7-XiSE26yWofo9OO0Za34DrgU5q775o4")
.constant("FACEBOOK_APP_ID","1853899954884964")

.config(function($ionicConfigProvider) {
$ionicConfigProvider.navBar.alignTitle('center');
})

.config(function(GooglePlusProvider) {
GooglePlusProvider.init({
clientId:'clientId',
apiKey: 'apiKey'
});
})

.config( function( $facebookProvider ) {
$facebookProvider.setAppId('appid');
})

.config(function($stateProvider, $urlRouterProvider) {
$stateProvider

Expand Down Expand Up @@ -106,7 +97,7 @@ angular.module('appskeleton', [
}
}
})

.state('app.forgotpassword', {
url: '/forgotpassword',
views: {
Expand Down
27 changes: 22 additions & 5 deletions www/js/controllers/appindex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,26 @@
* Controller of the appskeleton
*/
angular.module('appskeleton')
.controller('AppindexCtrl', function ($scope,appindex,$window,$state,$ionicPopup,$timeout) {
.controller('AppindexCtrl', function ($scope,appindex,$window,$state,$ionicPopup,$timeout,$rootScope) {

$scope.loginStatus="Login/SignUp";
$scope.loginStatus="Checking...";

$scope.ActivationMessage=undefined;


$scope.autoRedirect = function () {
var currUrl = $state.current.url;
if (appindex.loaded === true && appindex.loggedIn === true) {
if (currUrl === '/login' || currUrl === '/signup') {
$state.go("app.profile");
}
}
else if (appindex.loaded === true && appindex.loggedIn != true) {
if (currUrl === '/profile' || currUrl === '/appointments' || currUrl === '/opsdashboard' || currUrl === '/storedashboard') {
$state.go("app.login");
}
}
};

$scope.loadData=function(){
var promise = appindex.checkStatus();
promise.then(function(data){
Expand All @@ -29,17 +43,20 @@ angular.module('appskeleton')
}
$scope.loggedOut=true;
$scope.loggedIn=false;
appindex.loggedIn = true;
}
else{
$scope.loginStatus="Login/SignUp";
}
appindex.needReload=false;
appindex.loaded = true;
$scope.autoRedirect();
});
};

$scope.$watch(function(){return appindex.needReload},function(newValue,oldValue){
if(appindex.needReload===true){
$scope.loadData();
$scope.loadData();
}
},true);

Expand Down Expand Up @@ -109,7 +126,7 @@ angular.module('appskeleton')
confirmPopup.then(function(res) {
if(res) {
$scope.doLogout();
}
}
});
};

Expand Down
96 changes: 53 additions & 43 deletions www/js/controllers/facebook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,59 +8,69 @@
* Controller of the appskeleton
*/
angular.module('appskeleton')
.run( function( $rootScope ) {
// Load the facebook SDK asynchronously
(function(){
// If we've already installed the SDK, we're done
if (document.getElementById('facebook-jssdk')) {return;}
// .run( function( $rootScope ) {
// // Load the facebook SDK asynchronously
// (function(){
// // If we've already installed the SDK, we're done
// if (document.getElementById('facebook-jssdk')) {return;}

// Get the first script element, which we'll use to find the parent node
var firstScriptElement = document.getElementsByTagName('script')[0];
// // Get the first script element, which we'll use to find the parent node
// var firstScriptElement = document.getElementsByTagName('script')[0];

// Create a new script element and set its id
var facebookJS = document.createElement('script');
facebookJS.id = 'facebook-jssdk';
// // Create a new script element and set its id
// var facebookJS = document.createElement('script');
// facebookJS.id = 'facebook-jssdk';

// Set the new script's source to the source of the Facebook JS SDK
facebookJS.src = '//connect.facebook.net/en_US/all.js';
// // Set the new script's source to the source of the Facebook JS SDK
// facebookJS.src = '//connect.facebook.net/en_US/all.js';

// Insert the Facebook JS SDK into the DOM
firstScriptElement.parentNode.insertBefore(facebookJS, firstScriptElement);
}());
})
// // Insert the Facebook JS SDK into the DOM
// firstScriptElement.parentNode.insertBefore(facebookJS, firstScriptElement);
// }());
// })

.controller('FacebookCtrl', function ($scope,$window,$state,$facebook,socialsignin) {
.controller('FacebookCtrl', function ($scope,$window,$state,socialsignin,FACEBOOK_APP_ID,$cordovaOauth) {

var FEmail=null;
var FullName=null;

$scope.SignInFacebook = function() {
try{
$facebook.login().then(function() {
$scope.Refresh();
});
}
catch(exception){
$scope.FacebookMessage="Error connecting to Facebook! Try again later or use the login form."
}
};
$cordovaOauth.facebook(FACEBOOK_APP_ID, ["email","name"]).then(function(result) {
console.log(JSON.stringify(result));
var x=JSON.stringify(result);
$scope.FacebookMessage =x;
}, function(error) {
console.log(error);
$scope.FacebookMessage=error;
});
};
// $scope.SignInFacebook = function() {
// try{
// $facebook.login().then(function() {
// $scope.Refresh();
// });
// }
// catch(exception){
// $scope.FacebookMessage="Error connecting to Facebook! Try again later or use the login form."
// }
// };

$scope.Refresh = function() {
$facebook.api("/me?fields=id,name,email").then(
function(response) {
FEmail=response.email;
FullName=response.name;
if(FEmail!=undefined){
$scope.DoSignInFacebook();
}
else{
$scope.FacebookMessage="No Email recieved from facebook! Try again later or use the login form."
}
},
function(err) {
$scope.FacebookMessage = "Error connecting to facebook! Try again later or use the login form.";
});
};
// $scope.Refresh = function() {
// $facebook.api("/me?fields=id,name,email").then(
// function(response) {
// FEmail=response.email;
// FullName=response.name;
// if(FEmail!=undefined){
// $scope.DoSignInFacebook();
// }
// else{
// $scope.FacebookMessage="No Email recieved from facebook! Try again later or use the login form."
// }
// },
// function(err) {
// $scope.FacebookMessage = "Error connecting to facebook! Try again later or use the login form.";
// });
// };

$scope.DoSignInFacebook=function(){
var FacebookObject={
Expand Down
54 changes: 32 additions & 22 deletions www/js/controllers/google.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,44 @@
* Controller of the appskeleton
*/
angular.module('appskeleton')
.controller('GoogleCtrl', function ($scope,$state,$window,socialsignin,GooglePlus) {
.controller('GoogleCtrl', function ($scope,$state,$window,socialsignin,GOOGLE_CLIENT_ID) {


var AuthToken=null;
var GEmail=null;
var FullName=null;

$scope.SignInGoogle = function () {
GooglePlus.login().then(function (authResult) {
AuthToken=authResult.access_token;
GooglePlus.getUser().then(function (user) {
GEmail=user.email;
FullName=user.name;
if(GEmail!=undefined){
$scope.DoSignInGoogle();
}
else{
$scope.GoogleMessage="Error! Try again later or use the login form."
}
},
function(err){
$scope.GoogleMessage="Error! Try again later or use the login form."
});
},
function (err) {
$scope.GoogleMessage="Error connecting to Google! Try again later or use the login form."
});
};
$scope.googleLogin = function() {
var client_id=GOOGLE_CLIENT_ID;
var scope="email";
var redirect_uri="http://localhost/callback";
var response_type="token";
var Url="https://accounts.google.com/o/oauth2/auth?scope="+scope+"&client_id="+client_id+"&redirect_uri="+redirect_uri+
"&response_type="+response_type;
var ref = window.open(Url);
};

// $scope.SignInGoogle = function () {
// GooglePlus.login().then(function (authResult) {
// AuthToken=authResult.access_token;
// GooglePlus.getUser().then(function (user) {
// GEmail=user.email;
// FullName=user.name;
// if(GEmail!=undefined){
// $scope.DoSignInGoogle();
// }
// else{
// $scope.GoogleMessage="Error! Try again later or use the login form."
// }
// },
// function(err){
// $scope.GoogleMessage="Error! Try again later or use the login form."
// });
// },
// function (err) {
// $scope.GoogleMessage="Error connecting to Google! Try again later or use the login form."
// });
// };
//OPTIONAL
//Verified fields from google that can be accessed
//Full name
Expand Down
Loading