Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
This commit is contained in:
commit
191bbdc634
7 changed files with 57 additions and 2 deletions
|
@ -70,7 +70,7 @@ def getUserByToken(token):
|
|||
return bad_request("No User Found")
|
||||
|
||||
|
||||
@user_routes.route('/api/users/updateUser/<string:token>', methods=["GET"])
|
||||
@user_routes.route('/api/users/updateUser/<string:token>', methods=["POST"])
|
||||
@auto.doc()
|
||||
def updateUser(token):
|
||||
"""
|
||||
|
|
|
@ -1,3 +1,13 @@
|
|||
@import url(http://fonts.googleapis.com/earlyaccess/alefhebrew.css);
|
||||
|
||||
body{
|
||||
font-family: "Alef Hebrew",
|
||||
“Helvetica Neue”,
|
||||
Helvetica,
|
||||
Arial,
|
||||
sans-serif;
|
||||
}
|
||||
|
||||
.menuBtn {
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
|
@ -155,3 +165,9 @@ body.noscroll
|
|||
border-right: 2px black solid;
|
||||
border-radius: 1px black solid;
|
||||
}*/
|
||||
|
||||
.gray-font{
|
||||
color: #7f7f7f;
|
||||
font-size: 300%;
|
||||
text-shadow:#e0e0e0 1px 1px 0;
|
||||
}
|
|
@ -33,6 +33,10 @@ app.config(['$routeProvider', '$locationProvider',
|
|||
.when('/register', {
|
||||
templateUrl: 'templates/views/register.html',
|
||||
controller: 'registerController'
|
||||
})
|
||||
.when('/home', {
|
||||
templateUrl: 'templates/views/home.html',
|
||||
controller: 'homeController'
|
||||
});
|
||||
|
||||
}
|
||||
|
|
10
templates/js/controllers/homeController.js
Normal file
10
templates/js/controllers/homeController.js
Normal file
|
@ -0,0 +1,10 @@
|
|||
/**
|
||||
* Created by sagi on 6/16/15.
|
||||
*/
|
||||
angular.module('SeHub')
|
||||
.controller('homeController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
|
||||
{
|
||||
|
||||
|
||||
|
||||
}]);
|
|
@ -17,7 +17,10 @@ angular.module('SeHub')
|
|||
$scope.isInRegisterMode = true;
|
||||
$scope.loadingData = false;
|
||||
$location.path('/register')
|
||||
}else{
|
||||
$location.path('/home')
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
$scope.loadingData = false;
|
||||
|
|
|
@ -2,4 +2,25 @@
|
|||
<div class="loader" ng-if="loadingData">
|
||||
<md-progress-circular md-mode="indeterminate"></md-progress-circular>
|
||||
</div>
|
||||
<md-content layout-padding>
|
||||
<md-card class="gray-font">
|
||||
<div layout="row">
|
||||
<div class="spacer"></div>
|
||||
<div>
|
||||
<h1><i class="fa fa-graduation-cap"></i></h1>
|
||||
</div>
|
||||
<div class="spacer"></div>
|
||||
</div>
|
||||
<div layout="row">
|
||||
<div class="spacer"></div>
|
||||
<div>
|
||||
<h1>Welcome To SE-Hub</h1>
|
||||
<p>
|
||||
This Is your Home Page
|
||||
</p>
|
||||
</div>
|
||||
<div class="spacer"></div>
|
||||
</div>
|
||||
</md-card>
|
||||
</md-content>
|
||||
</div>
|
|
@ -68,6 +68,7 @@
|
|||
|
||||
<!-- Controllers -->
|
||||
<script src="templates/js/controllers/mainController.js"></script>
|
||||
<script src="templates/js/controllers/homeController.js"></script>
|
||||
<script src="templates/js/controllers/registerController.js"></script>
|
||||
|
||||
</body>
|
||||
|
|
Loading…
Reference in a new issue