Skip to content
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

Jump to bottom

Youmna #11

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

Youmna #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f8b70a8
methods fixed
habibahshm Apr 16, 2017
490c4ae
added index.html
YoumnaElghandoor Apr 17, 2017
7ee11ce
integrated html files with fixed functions
habibahshm Apr 17, 2017
a7a243e
Merge pull request #6 from SEGUC17/youmna
habibahshm Apr 17, 2017
409f6f0
Done with angular structure with all team
YoumnaElghandoor Apr 17, 2017
50b70ec
Merge pull request #7 from SEGUC17/youmna
YoumnaElghandoor Apr 17, 2017
f2e39a1
added catalog that redirects to the catalog page not yet 100% functio…
YoumnaElghandoor Apr 18, 2017
a485ba0
service provider register, service provider login and part of the log…
hebaelshawarby Apr 18, 2017
eeec883
service provider register, service provider login and part of the log…
hebaelshawarby Apr 18, 2017
2e59b62
merged home page with fuctionality
habibahshm Apr 18, 2017
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
1 change: 0 additions & 1 deletion app/app.js
View file
Open in desktop

This file was deleted.

67 changes: 67 additions & 0 deletions app/controllers/MainController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
angular.module('MainController', ['indexSrv'])
.controller('MainController',function($scope,indexSrv,$location) {
//console.log('main')

indexSrv.getVerifiedServiceProvider().then(function(res){
$scope.title=res.data
})




if(indexSrv.IsLoggedIn()){
console.log("user logged in")
indexSrv.GetCurrentUser().then(function(response){
console.log(response);
});
}else
{
console.log("user not logged in")

}


this.login=function(data){
indexSrv.ServiceProviderLogin(this.data).then(function(response){
// console.log(response.data)
//console.log("the token is: "+response.data.token)

if(response.data.success==true)
$location.path('/welcome')

})
};

this.logout=function(){
indexSrv.LogOut();
console.log("log")
// $location.path('/')


}



// indexSrv.spRegister($scope.sp).then(function)(res){
// $location.url('/register');


$scope.catalog = function() {

$location.url('/catalog');

};
$scope.login = function() {

$location.url('/login');

};
$scope.Signup = function() {

$location.url('/Popup');

};


});

15 changes: 15 additions & 0 deletions app/controllers/PopupDemoCont.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@


myApp.controller('PopupDemoCont', ['$scope','$modal',function ($scope, $modal) {
$scope.open = function () {
var modalInstance = $modal.open({
controller: 'PopupCont',
templateUrl: 'views/Popup.html',
});
}
}]);
myApp.controller('PopupCont', ['$scope','$modalInstance',function ($scope, $modalInstance) {
$scope.close = function () {
$modalInstance.dismiss('cancel');
};
}]);
36 changes: 36 additions & 0 deletions app/controllers/serviceProviderController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
angular.module('spctr',['businessServ'])

// data dy el object eli b5do mn el user w 3shn a access 7aga mo3yna mmkn a3ml data.field msln
.controller('spCon',function($http,$location,businessServ){

this.newReg = function(data){
console.log(this.data);
businessServ.ServiceProviderRegister(this.data).then(function(response){
console.log(response)
//$location.path('/register')
})
}

// if(businessServ.IsLoggedIn()){
// console.log("user logged in")
// }else
// {
// console.log("user not logged in")

// }

// this.login=function(data){
// businessServ.ServiceProviderLogin(this.data).then(function(response){
// // console.log(response.data)
// // console.log("the token is: "+response.data.token)

// if(response.data.success==true)
// $location.path('/')

// })
// }



})

6 changes: 6 additions & 0 deletions app/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions app/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*----------------------------------------------
css settings for HTML div exactCenter
------------------------------------------------*/
@import url(http://fonts.googleapis.com/css?family=Raleway);
h2{
margin-top:20px;
margin-bottom:20px;
text-align: center;
}
115 changes: 115 additions & 0 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@

<!DOCTYPE html>
<html >
<head>
<meta charset="utf-8">
<title>EduDEV</title>


<style>
.navbarnavbar-defaultnavbar-static-top{
color: white;
background-color:#330000
},
#gina{
position : absolute
margin-top:25px;

}
</style>

<!-- <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.4/angular.js">
</script> -->
<!-- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.5/angular-route.min.js"></script> -->
<!-- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.5/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.5/angular-route.min.js"></script> -->

<!-- <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.4/angular-route.js"></script> -->
<script src="/lib/jquery-2.2.0.min.js"></script>
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
<script src="/lib/angular.min.js"></script>
<script src="/lib/angular-route.min.js"></script>
<script src="/lib/bootstrap.min.js"></script>
<!-- <script src="/lib/ui-bootstrap-tpls-1.2.5.min.js"></script> -->
<script src="/lib/ui-bootstrap-tpls-0.14.3.min.js"></script>
<!-- Modules -->
<script src="starter.js"></script>
<!-- Controllers -->
<script src="/controllers/MainController.js"></script>
<script src="/controllers/PopupDemoCont.js"></script>
<script src="/controllers/serviceProviderController.js"></script>


<!-- services -->
<script src="/services/indexSrv.js"></script>
<script src="/services/forBusinessServ.js"></script>
<script src="/services/spAuthServ.js"></script>


<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">

</head>

<body ng-app="myApp" ng-controller="MainController" >



<div class="navbarnavbar-defaultnavbar-static-top" role="navigation">
<div class="container">
<div class="navbar-header" ng-controller="MainController">
<a class="navbar-brand" href="/"><span class="glyphicon glyphicon-briefcase"></span>EduDEV
</a>
</div>
<ul class="nav navbar-nav navbar-right" ng-controller="PopupDemoCont">

<!-- <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="/forbusiness">For Business
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href= "#/login">login</a></li>
<li><a href="#/register">Register</a></li>

</ul>

</li> -->
<!-- <div ng-controller="PopupDemoCont"> -->
<!-- <center><p>Signup</p></center> -->

<li><button ng-click="open()" class="btn btn-warning">Signup</button></li>
<li><button ng-click="open()" class="btn btn-warning">login</button></li>
<!-- </div> -->
<!-- <li><a class=" ng-scope">Log in</a></li> -->
<!-- <li><a ng-click="Signup()">Sign up</a></li> -->
</li>
<li><a href= "#/logout" ng-click="MainController.logout()">logout</a></li>
<li><a href= "#/test">test</a></li>

<li><a href= "#/registeredSP">VIEW REGISTERED SP</a></li>

<li><a "/signup">Sign up</a></li>

</ul>
<ul class="nav navbar-nav navbar-left">

<li><a ng-click="catalog()">Catalog</a></li>
</ul>
<form class="navbar-form navbar-left" role="search">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
<button type="submit" class="btn btn-default" ng-click="search()">Search</button>

<!-- class="btn btn-warning" -->
</form>
</div>

</div>

<div ng-view>

</div>


</body>
</html>

122 changes: 122 additions & 0 deletions app/lib/angular-moment.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading