Skip to content

Commit c712bfc

Browse files
author
Mahder Neway
committed
Done with the logout and user profile dropdown functionalities. I will need to continue tomorrow with fresh mind and body. Good night mahder...
1 parent d03e3a5 commit c712bfc

11 files changed

+95
-34
lines changed

‎angular_js/adminDashboardApp.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
'use strict';
22

3-
var adminDashboardApp = angular.module('adminDashboardApp',[]);
3+
var adminDashboardApp = angular.module('adminDashboardApp',['ngRoute']);

‎angular_js/angular-route.min.js‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎angular_js/controllers/AdminLoginController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ adminLoginApp.controller('AdminLoginController', function AdminLoginController($
3030
} else {
3131
// if successful, bind success message to message
3232
//redirect the page to adminhome.php
33-
window.location.href = "admindashboard.php";
33+
window.location.href = "admin_dash_board.php";
3434
}
3535
});
3636
}

‎angular_js/controllers/AdminLogoutController.js‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
'use strict';
22

3-
var AdminLogoutController = adminDashboardApp.controller('AdminLogoutController', function AdminLogoutController($scope, $http){
3+
adminDashboardApp.controller('AdminLogoutController', function AdminLogoutController($scope, $http){
4+
$scope.logout = function(){
45
$http({
56
method : 'POST',
67
url : 'logout.php',
78
//data : serializeData($scope.formData),
89
headers : { 'Content-Type': 'application/x-www-form-urlencoded' } // set the headers so angular passing info as form data (not request payload)
9-
})
10-
.success(function(data) {
11-
/*if (!data.success) {
12-
$scope.message = "Invalid user credential! Try again.";
13-
} else {
14-
// if successful, bind success message to message
15-
//redirect the page to adminhome.php
16-
window.location.href = "admindashboard.php";
17-
}*/
18-
});
10+
})
11+
.success(function(data) {
12+
window.location.href = "index.php";
13+
});
14+
};
1915
});

‎angular_js/controllers/AdminUserProfileController.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
'use strict';
2+
3+
adminDashboardApp.controller('AdminUserProfileController', function AdminUserProfileController($scope, $routeParams){
4+
//alert($routeParams.uId);
5+
$scope.userId = [$routeParams.uId];
6+
});

‎angular_js/route/routeConfig.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
'use strict';
2+
//This file is responsible to configuring the link navigation system of my application.
3+
//this is very similar to the DispatcherServlet of SpringMVC...
4+
adminDashboardApp.config(['$routeProvider',
5+
function($routeProvider) {
6+
$routeProvider.
7+
when('/view/adminProfile/:uId', {
8+
templateUrl: 'admin_user_profile.php',
9+
controller: 'AdminUserProfileController'
10+
}).
11+
when('/view/mahder/:id', {//this is how you pass parameters....you can add more routeParams e.g/:id/:name/:city ...etc
12+
templateUrl: 'detail.html',
13+
controller: 'DetailController'
14+
}).
15+
otherwise({
16+
redirectTo: '/'
17+
});
18+
}]);

page_sections/admindashboard.php renamed to page_sections/admin_dash_board.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?php
22
require_once '../core/init.php';
3+
//check if the user has successfully logged in...otherwise redirect him/her
4+
//back to the index page.
5+
if(! isset($_SESSION['user'])){
6+
header("Location: index.php");
7+
}
38
?>
49
<!DOCTYPE html>
510
<html lang="en" ng-app="adminDashboardApp">
@@ -53,7 +58,9 @@
5358
<i class="fa fa-bar-chart-o fa-fw"></i> Area Chart Example
5459
</div>
5560
<div class="panel-body">
56-
<div id="morris-area-chart">this is the text...</div>
61+
<div id="morris-area-chart" ng-view>
62+
this is the text...
63+
</div>
5764
</div>
5865
</div>
5966
</div>

‎page_sections/admin_dashboard_js_imports.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
<script src="../admin_js/bootstrap.min.js"></script>
55
<!-- Metis Menu Plugin JavaScript -->
66
<script src="../admin_js/plugins/metisMenu/metisMenu.min.js"></script>
7-
<!-- Morris Charts JavaScript
8-
<script src="../admin_js/plugins/morris/raphael.min.js"></script>
9-
<script src="../admin_js/plugins/morris/morris.min.js"></script>
10-
<script src="../admin_js/plugins/morris/morris-data.js"></script>
11-
-->
127
<!-- Custom Theme JavaScript -->
138
<script src="../admin_js/sb-admin-2.js"></script>
149
<script type="text/javascript" src="../local_js_frameworks/angular.js"></script>
10+
<script type="text/javascript" src="../angular_js/angular-route.min.js"></script>
1511
<script type="text/javascript" src="../angular_js/adminDashboardApp.js"></script>
16-
<script type="text/javascript" src="../angualr_js/controllers/AdminLoginController.js"></script>
12+
<script type="text/javascript" src="../angular_js/controllers/AdminLogoutController.js"></script>
13+
14+
<script type="text/javascript" src="../angular_js/route/routeConfig.js"></script>
15+
<script type="text/javascript" src="../angular_js/controllers/AdminUserProfileController.js"></script>

‎page_sections/admin_header_navigation.php‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
$userFullName = (isset($userFullName) ? $userFullName->user_full_name : 'Administrator');
1414
?>
15-
<a class="navbar-brand" href="#.php">Satellite Admin | <?php echo $userFullName;?> loged in</a>
15+
<a class="navbar-brand" href="#.php">Satellite Admin | <span style="color: black;"><?php echo $userFullName;?> logged in</span></a>
1616

1717
</div>
1818
<!-- /.navbar-header -->
@@ -132,17 +132,27 @@
132132
<i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
133133
</a>
134134
<ul class="dropdown-menu dropdown-user">
135-
<li><a href="#"><i class="fa fa-user fa-fw"></i> User Profile</a>
136-
</li>
137-
<li><a href="#"><i class="fa fa-gear fa-fw"></i> Settings</a>
138-
</li>
139-
<li class="divider"></li>
140-
<li ng-controller="AdminLogoutController">
141-
<a ng-click="logout();"><i class="fa fa-sign-out fa-fw"></i> Logout</a>
142-
</li>
143-
</ul>
135+
<li ng-controller="AdminUserProfileController">
136+
<a ng-href="#/view/adminProfile/<?php echo $userId;?>" >
137+
<i class="fa fa-user fa-fw"></i>
138+
User Profile
139+
</a>
140+
</li>
141+
<li>
142+
<a href="#">
143+
<i class="fa fa-gear fa-fw"></i> Settings
144+
</a>
145+
</li>
146+
<li class="divider"></li>
147+
<li ng-controller="AdminLogoutController">
148+
<a ng-click="logout();">
149+
<i class="fa fa-sign-out fa-fw"></i>
150+
Logout
151+
</a>
152+
</li>
153+
</ul>
144154
<!-- /.dropdown-user -->
145-
</li>
155+
</li>
146156
<!-- /.dropdown -->
147157
</ul>
148158
<!-- /.navbar-top-links -->

‎page_sections/admin_index_home_content.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<div id="home-content1" ng-app="adminLoginApp" class="left mobile-collapse" style="text-align: center;width: 100%">
2-
<h2 class="replace">Sign in to continue to Satellite</h2>
3-
<div ng-controller="AdminLoginController">
2+
<h5 class="replace"><span style="color:black;font-weight: normal">Sign in to continue to Satellite</span></h5>
3+
<div ng-controller="AdminLoginController">
44
<form name="formData" id="contact_form" method="post" novalidate="" role="form">
55
<div style="width: 50%;margin: 0 auto;" class="google-login-form">
6-
<br/><br/><br/><br/><br/>
6+
<br/><br/>
77
<div class="form_field">
88
<img src="../images/admin_avatar.png" width="20%" alt="Admin avatar"/>
99
</div>

0 commit comments

Comments
 (0)